From 26d8e88407be0fd611fb9c2c9e3e8a7de43f1a47 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@libreserver.org>
Date: Wed, 13 Jul 2022 12:11:57 +0100
Subject: [PATCH 01/10] Don't show left and right timeline columns in text-mode
 browser

---
 daemon.py            |  78 +++++++++++++++++---------------
 webapp_moderation.py |   4 +-
 webapp_timeline.py   | 104 +++++++++++++++++++++++++------------------
 3 files changed, 104 insertions(+), 82 deletions(-)

diff --git a/daemon.py b/daemon.py
index c9f96d84d..438d32eb4 100644
--- a/daemon.py
+++ b/daemon.py
@@ -11751,7 +11751,8 @@ class PubServer(BaseHTTPRequestHandler):
                     allow_deletion: bool,
                     project_version: str,
                     yt_replace_domain: str,
-                    twitter_replacement_domain: str) -> bool:
+                    twitter_replacement_domain: str,
+                    ua_str: str) -> bool:
         """Shows the inbox timeline
         """
         if '/users/' in path:
@@ -11865,7 +11866,8 @@ class PubServer(BaseHTTPRequestHandler):
                                          self.server.cw_lists,
                                          self.server.lists_enabled,
                                          timezone, bold_reading,
-                                         self.server.dogwhistles)
+                                         self.server.dogwhistles,
+                                         ua_str)
                         if getreq_start_time:
                             fitness_performance(getreq_start_time,
                                                 self.server.fitness,
@@ -11928,7 +11930,7 @@ class PubServer(BaseHTTPRequestHandler):
                   getreq_start_time,
                   proxy_type: str, cookie: str,
                   debug: str,
-                  curr_session) -> bool:
+                  curr_session, ua_str: str) -> bool:
         """Shows the DMs timeline
         """
         if '/users/' in path:
@@ -12036,7 +12038,7 @@ class PubServer(BaseHTTPRequestHandler):
                                            self.server.cw_lists,
                                            self.server.lists_enabled,
                                            timezone, bold_reading,
-                                           self.server.dogwhistles)
+                                           self.server.dogwhistles, ua_str)
                         msg = msg.encode('utf-8')
                         msglen = len(msg)
                         self._set_headers('text/html', msglen,
@@ -12088,7 +12090,7 @@ class PubServer(BaseHTTPRequestHandler):
                       onion_domain: str, i2p_domain: str,
                       getreq_start_time,
                       proxy_type: str, cookie: str, debug: str,
-                      curr_session) -> bool:
+                      curr_session, ua_str: str) -> bool:
         """Shows the replies timeline
         """
         if '/users/' in path:
@@ -12196,7 +12198,8 @@ class PubServer(BaseHTTPRequestHandler):
                                            self.server.cw_lists,
                                            self.server.lists_enabled,
                                            timezone, bold_reading,
-                                           self.server.dogwhistles)
+                                           self.server.dogwhistles,
+                                           ua_str)
                     msg = msg.encode('utf-8')
                     msglen = len(msg)
                     self._set_headers('text/html', msglen,
@@ -12248,7 +12251,7 @@ class PubServer(BaseHTTPRequestHandler):
                              getreq_start_time,
                              proxy_type: str, cookie: str,
                              debug: str,
-                             curr_session) -> bool:
+                             curr_session, ua_str: str) -> bool:
         """Shows the media timeline
         """
         if '/users/' in path:
@@ -12354,7 +12357,7 @@ class PubServer(BaseHTTPRequestHandler):
                                          self.server.cw_lists,
                                          self.server.lists_enabled,
                                          timezone, bold_reading,
-                                         self.server.dogwhistles)
+                                         self.server.dogwhistles, ua_str)
                     msg = msg.encode('utf-8')
                     msglen = len(msg)
                     self._set_headers('text/html', msglen,
@@ -12406,7 +12409,7 @@ class PubServer(BaseHTTPRequestHandler):
                              getreq_start_time,
                              proxy_type: str, cookie: str,
                              debug: str,
-                             curr_session) -> bool:
+                             curr_session, ua_str: str) -> bool:
         """Shows the blogs timeline
         """
         if '/users/' in path:
@@ -12512,7 +12515,7 @@ class PubServer(BaseHTTPRequestHandler):
                                          self.server.cw_lists,
                                          self.server.lists_enabled,
                                          timezone, bold_reading,
-                                         self.server.dogwhistles)
+                                         self.server.dogwhistles, ua_str)
                     msg = msg.encode('utf-8')
                     msglen = len(msg)
                     self._set_headers('text/html', msglen,
@@ -12565,7 +12568,7 @@ class PubServer(BaseHTTPRequestHandler):
                             getreq_start_time,
                             proxy_type: str, cookie: str,
                             debug: str,
-                            curr_session) -> bool:
+                            curr_session, ua_str: str) -> bool:
         """Shows the news timeline
         """
         if '/users/' in path:
@@ -12679,7 +12682,7 @@ class PubServer(BaseHTTPRequestHandler):
                                         self.server.cw_lists,
                                         self.server.lists_enabled,
                                         timezone, bold_reading,
-                                        self.server.dogwhistles)
+                                        self.server.dogwhistles, ua_str)
                     msg = msg.encode('utf-8')
                     msglen = len(msg)
                     self._set_headers('text/html', msglen,
@@ -12731,7 +12734,7 @@ class PubServer(BaseHTTPRequestHandler):
                                 getreq_start_time,
                                 proxy_type: str, cookie: str,
                                 debug: str,
-                                curr_session) -> bool:
+                                curr_session, ua_str: str) -> bool:
         """Shows the features timeline (all local blogs)
         """
         if '/users/' in path:
@@ -12849,7 +12852,7 @@ class PubServer(BaseHTTPRequestHandler):
                                             self.server.cw_lists,
                                             self.server.lists_enabled,
                                             timezone, bold_reading,
-                                            self.server.dogwhistles)
+                                            self.server.dogwhistles, ua_str)
                     msg = msg.encode('utf-8')
                     msglen = len(msg)
                     self._set_headers('text/html', msglen,
@@ -12900,7 +12903,7 @@ class PubServer(BaseHTTPRequestHandler):
                               getreq_start_time,
                               proxy_type: str, cookie: str,
                               debug: str,
-                              curr_session) -> bool:
+                              curr_session, ua_str: str) -> bool:
         """Shows the shares timeline
         """
         if '/users/' in path:
@@ -12968,7 +12971,8 @@ class PubServer(BaseHTTPRequestHandler):
                                     self.server.signing_priv_key_pem,
                                     self.server.cw_lists,
                                     self.server.lists_enabled, timezone,
-                                    bold_reading, self.server.dogwhistles)
+                                    bold_reading, self.server.dogwhistles,
+                                    ua_str)
                     msg = msg.encode('utf-8')
                     msglen = len(msg)
                     self._set_headers('text/html', msglen,
@@ -12994,7 +12998,7 @@ class PubServer(BaseHTTPRequestHandler):
                               getreq_start_time,
                               proxy_type: str, cookie: str,
                               debug: str,
-                              curr_session) -> bool:
+                              curr_session, ua_str: str) -> bool:
         """Shows the wanted timeline
         """
         if '/users/' in path:
@@ -13062,7 +13066,7 @@ class PubServer(BaseHTTPRequestHandler):
                                     self.server.cw_lists,
                                     self.server.lists_enabled,
                                     timezone, bold_reading,
-                                    self.server.dogwhistles)
+                                    self.server.dogwhistles, ua_str)
                     msg = msg.encode('utf-8')
                     msglen = len(msg)
                     self._set_headers('text/html', msglen,
@@ -13089,7 +13093,7 @@ class PubServer(BaseHTTPRequestHandler):
                                  getreq_start_time,
                                  proxy_type: str, cookie: str,
                                  debug: str,
-                                 curr_session) -> bool:
+                                 curr_session, ua_str: str) -> bool:
         """Shows the bookmarks timeline
         """
         if '/users/' in path:
@@ -13199,7 +13203,7 @@ class PubServer(BaseHTTPRequestHandler):
                                            self.server.cw_lists,
                                            self.server.lists_enabled,
                                            timezone, bold_reading,
-                                           self.server.dogwhistles)
+                                           self.server.dogwhistles, ua_str)
                         msg = msg.encode('utf-8')
                         msglen = len(msg)
                         self._set_headers('text/html', msglen,
@@ -13250,7 +13254,7 @@ class PubServer(BaseHTTPRequestHandler):
                               getreq_start_time,
                               proxy_type: str, cookie: str,
                               debug: str,
-                              curr_session) -> bool:
+                              curr_session, ua_str: str) -> bool:
         """Shows the outbox timeline
         """
         # get outbox feed for a person
@@ -13350,7 +13354,7 @@ class PubServer(BaseHTTPRequestHandler):
                                 self.server.cw_lists,
                                 self.server.lists_enabled,
                                 timezone, bold_reading,
-                                self.server.dogwhistles)
+                                self.server.dogwhistles, ua_str)
                 msg = msg.encode('utf-8')
                 msglen = len(msg)
                 self._set_headers('text/html', msglen,
@@ -13390,7 +13394,7 @@ class PubServer(BaseHTTPRequestHandler):
                            getreq_start_time,
                            proxy_type: str, cookie: str,
                            debug: str,
-                           curr_session) -> bool:
+                           curr_session, ua_str: str) -> bool:
         """Shows the moderation timeline
         """
         if '/users/' in path:
@@ -13498,7 +13502,8 @@ class PubServer(BaseHTTPRequestHandler):
                                             self.server.cw_lists,
                                             self.server.lists_enabled,
                                             timezone, bold_reading,
-                                            self.server.dogwhistles)
+                                            self.server.dogwhistles,
+                                            ua_str)
                         msg = msg.encode('utf-8')
                         msglen = len(msg)
                         self._set_headers('text/html', msglen,
@@ -18091,7 +18096,8 @@ class PubServer(BaseHTTPRequestHandler):
                                 self.server.allow_deletion,
                                 self.server.project_version,
                                 self.server.yt_replace_domain,
-                                self.server.twitter_replacement_domain):
+                                self.server.twitter_replacement_domain,
+                                ua_str):
                 self.server.getreq_busy = False
                 return
 
@@ -18114,7 +18120,7 @@ class PubServer(BaseHTTPRequestHandler):
                               getreq_start_time,
                               proxy_type,
                               cookie, self.server.debug,
-                              curr_session):
+                              curr_session, ua_str):
                 self.server.getreq_busy = False
                 return
 
@@ -18137,7 +18143,7 @@ class PubServer(BaseHTTPRequestHandler):
                                   getreq_start_time,
                                   proxy_type,
                                   cookie, self.server.debug,
-                                  curr_session):
+                                  curr_session, ua_str):
                 self.server.getreq_busy = False
                 return
 
@@ -18160,7 +18166,7 @@ class PubServer(BaseHTTPRequestHandler):
                                          getreq_start_time,
                                          proxy_type,
                                          cookie, self.server.debug,
-                                         curr_session):
+                                         curr_session, ua_str):
                 self.server.getreq_busy = False
                 return
 
@@ -18183,7 +18189,7 @@ class PubServer(BaseHTTPRequestHandler):
                                          getreq_start_time,
                                          proxy_type,
                                          cookie, self.server.debug,
-                                         curr_session):
+                                         curr_session, ua_str):
                 self.server.getreq_busy = False
                 return
 
@@ -18206,7 +18212,7 @@ class PubServer(BaseHTTPRequestHandler):
                                         getreq_start_time,
                                         proxy_type,
                                         cookie, self.server.debug,
-                                        curr_session):
+                                        curr_session, ua_str):
                 self.server.getreq_busy = False
                 return
 
@@ -18226,7 +18232,7 @@ class PubServer(BaseHTTPRequestHandler):
                                             getreq_start_time,
                                             proxy_type,
                                             cookie, self.server.debug,
-                                            curr_session):
+                                            curr_session, ua_str):
                 self.server.getreq_busy = False
                 return
 
@@ -18248,7 +18254,7 @@ class PubServer(BaseHTTPRequestHandler):
                                           getreq_start_time,
                                           proxy_type,
                                           cookie, self.server.debug,
-                                          curr_session):
+                                          curr_session, ua_str):
                 self.server.getreq_busy = False
                 return
 
@@ -18266,7 +18272,7 @@ class PubServer(BaseHTTPRequestHandler):
                                           getreq_start_time,
                                           proxy_type,
                                           cookie, self.server.debug,
-                                          curr_session):
+                                          curr_session, ua_str):
                 self.server.getreq_busy = False
                 return
 
@@ -18368,7 +18374,7 @@ class PubServer(BaseHTTPRequestHandler):
                                              getreq_start_time,
                                              proxy_type,
                                              cookie, self.server.debug,
-                                             curr_session):
+                                             curr_session, ua_str):
                 self.server.getreq_busy = False
                 return
 
@@ -18392,7 +18398,7 @@ class PubServer(BaseHTTPRequestHandler):
                                           getreq_start_time,
                                           proxy_type,
                                           cookie, self.server.debug,
-                                          curr_session):
+                                          curr_session, ua_str):
                 self.server.getreq_busy = False
                 return
 
@@ -18416,7 +18422,7 @@ class PubServer(BaseHTTPRequestHandler):
                                        getreq_start_time,
                                        proxy_type,
                                        cookie, self.server.debug,
-                                       curr_session):
+                                       curr_session, ua_str):
                 self.server.getreq_busy = False
                 return
 
diff --git a/webapp_moderation.py b/webapp_moderation.py
index f0f358e19..ed41862ad 100644
--- a/webapp_moderation.py
+++ b/webapp_moderation.py
@@ -58,7 +58,7 @@ def html_moderation(default_timeline: str,
                     signing_priv_key_pem: str,
                     cw_lists: {}, lists_enabled: str,
                     timezone: str, bold_reading: bool,
-                    dogwhistles: {}) -> str:
+                    dogwhistles: {}, ua_str: str) -> str:
     """Show the moderation feed as html
     This is what you see when selecting the "mod" timeline
     """
@@ -84,7 +84,7 @@ def html_moderation(default_timeline: str,
                          text_mode_banner, access_keys, system_language,
                          max_like_count, shared_items_federated_domains,
                          signing_priv_key_pem, cw_lists, lists_enabled,
-                         timezone, bold_reading, dogwhistles)
+                         timezone, bold_reading, dogwhistles, ua_str)
 
 
 def html_account_info(translate: {},
diff --git a/webapp_timeline.py b/webapp_timeline.py
index 09ca34c07..25263ec08 100644
--- a/webapp_timeline.py
+++ b/webapp_timeline.py
@@ -382,6 +382,14 @@ def _html_timeline_keyboard(moderator: bool, text_mode_banner: str,
                                     follow_approvals)
 
 
+def _text_mode_browser(ua_str: str) -> bool:
+    """Does the user agent indicate a text mode browser?
+    """
+    if 'Lynx/' in ua_str:
+        return True
+    return False
+
+
 def _html_timeline_end(base_dir: str, nickname: str, domain_full: str,
                        http_prefix: str, translate: {},
                        moderator: bool, editor: bool,
@@ -391,7 +399,8 @@ def _html_timeline_end(base_dir: str, nickname: str, domain_full: str,
                        authorized: bool, theme: str,
                        default_timeline: str, access_keys: {},
                        box_name: str,
-                       enable_timing_log: bool, timeline_start_time) -> str:
+                       enable_timing_log: bool, timeline_start_time,
+                       ua_str: str) -> str:
     """Ending of the timeline, containing the right column
     """
     # end of timeline-posts
@@ -401,17 +410,19 @@ def _html_timeline_end(base_dir: str, nickname: str, domain_full: str,
     tl_str += '  </td>\n'
 
     # right column
-    right_column_str = \
-        get_right_column_content(base_dir, nickname, domain_full,
-                                 http_prefix, translate,
-                                 moderator, editor,
-                                 newswire, positive_voting,
-                                 False, None, True,
-                                 show_publish_as_icon,
-                                 rss_icon_at_top,
-                                 publish_button_at_top,
-                                 authorized, True, theme,
-                                 default_timeline, access_keys)
+    right_column_str = ''
+    if not _text_mode_browser(ua_str):
+        right_column_str = \
+            get_right_column_content(base_dir, nickname, domain_full,
+                                     http_prefix, translate,
+                                     moderator, editor,
+                                     newswire, positive_voting,
+                                     False, None, True,
+                                     show_publish_as_icon,
+                                     rss_icon_at_top,
+                                     publish_button_at_top,
+                                     authorized, True, theme,
+                                     default_timeline, access_keys)
     tl_str += '  <td valign="top" class="col-right" ' + \
         'id="newswire" tabindex="-1">\n' + \
         '  <aside>\n' + \
@@ -494,7 +505,7 @@ def html_timeline(default_timeline: str,
                   signing_priv_key_pem: str,
                   cw_lists: {}, lists_enabled: str,
                   timezone: str, bold_reading: bool,
-                  dogwhistles: {}) -> str:
+                  dogwhistles: {}, ua_str: str) -> str:
     """Show the timeline as html
     """
     enable_timing_log = False
@@ -811,12 +822,15 @@ def html_timeline(default_timeline: str,
     domain_full = get_full_domain(domain, port)
 
     # left column
-    left_column_str = \
-        get_left_column_content(base_dir, nickname, domain_full,
-                                http_prefix, translate,
-                                editor, artist, False, None, rss_icon_at_top,
-                                True, False, theme, access_keys,
-                                shared_items_federated_domains)
+    left_column_str = ''
+    if not _text_mode_browser(ua_str):
+        left_column_str = \
+            get_left_column_content(base_dir, nickname, domain_full,
+                                    http_prefix, translate,
+                                    editor, artist, False, None,
+                                    rss_icon_at_top,
+                                    True, False, theme, access_keys,
+                                    shared_items_federated_domains)
     tl_str += '  <td valign="top" class="col-left" ' + \
         'id="links" tabindex="-1">\n' + \
         '  <aside>\n' + \
@@ -872,7 +886,8 @@ def html_timeline(default_timeline: str,
                                    authorized, theme,
                                    default_timeline, access_keys,
                                    box_name,
-                                   enable_timing_log, timeline_start_time) +
+                                   enable_timing_log, timeline_start_time,
+                                   ua_str) +
                 html_footer())
     elif box_name == 'tlwanted':
         max_shares_per_account = items_per_page
@@ -891,7 +906,8 @@ def html_timeline(default_timeline: str,
                                    authorized, theme,
                                    default_timeline, access_keys,
                                    box_name,
-                                   enable_timing_log, timeline_start_time) +
+                                   enable_timing_log, timeline_start_time,
+                                   ua_str) +
                 html_footer())
 
     _log_timeline_timing(enable_timing_log, timeline_start_time, box_name, '7')
@@ -1051,7 +1067,7 @@ def html_timeline(default_timeline: str,
                            authorized, theme,
                            default_timeline, access_keys,
                            box_name,
-                           enable_timing_log, timeline_start_time)
+                           enable_timing_log, timeline_start_time, ua_str)
     tl_str += html_footer()
     return tl_str
 
@@ -1244,7 +1260,7 @@ def html_shares(default_timeline: str,
                 signing_priv_key_pem: str,
                 cw_lists: {}, lists_enabled: str,
                 timezone: str, bold_reading: bool,
-                dogwhistles: {}) -> str:
+                dogwhistles: {}, ua_str: str) -> str:
     """Show the shares timeline as html
     """
     manually_approve_followers = \
@@ -1275,7 +1291,7 @@ def html_shares(default_timeline: str,
                          shared_items_federated_domains,
                          signing_priv_key_pem,
                          cw_lists, lists_enabled, timezone,
-                         bold_reading, dogwhistles)
+                         bold_reading, dogwhistles, ua_str)
 
 
 def html_wanted(default_timeline: str,
@@ -1305,7 +1321,7 @@ def html_wanted(default_timeline: str,
                 signing_priv_key_pem: str,
                 cw_lists: {}, lists_enabled: str,
                 timezone: str, bold_reading: bool,
-                dogwhistles: {}) -> str:
+                dogwhistles: {}, ua_str: str) -> str:
     """Show the wanted timeline as html
     """
     manually_approve_followers = \
@@ -1336,7 +1352,7 @@ def html_wanted(default_timeline: str,
                          shared_items_federated_domains,
                          signing_priv_key_pem,
                          cw_lists, lists_enabled, timezone,
-                         bold_reading, dogwhistles)
+                         bold_reading, dogwhistles, ua_str)
 
 
 def html_inbox(default_timeline: str,
@@ -1367,7 +1383,7 @@ def html_inbox(default_timeline: str,
                signing_priv_key_pem: str,
                cw_lists: {}, lists_enabled: str,
                timezone: str, bold_reading: bool,
-               dogwhistles: {}) -> str:
+               dogwhistles: {}, ua_str: str) -> str:
     """Show the inbox as html
     """
     manually_approve_followers = \
@@ -1398,7 +1414,7 @@ def html_inbox(default_timeline: str,
                          shared_items_federated_domains,
                          signing_priv_key_pem,
                          cw_lists, lists_enabled, timezone,
-                         bold_reading, dogwhistles)
+                         bold_reading, dogwhistles, ua_str)
 
 
 def html_bookmarks(default_timeline: str,
@@ -1429,7 +1445,7 @@ def html_bookmarks(default_timeline: str,
                    signing_priv_key_pem: str,
                    cw_lists: {}, lists_enabled: str,
                    timezone: str, bold_reading: bool,
-                   dogwhistles: {}) -> str:
+                   dogwhistles: {}, ua_str: str) -> str:
     """Show the bookmarks as html
     """
     manually_approve_followers = \
@@ -1459,7 +1475,7 @@ def html_bookmarks(default_timeline: str,
                          access_keys, system_language, max_like_count,
                          shared_items_federated_domains, signing_priv_key_pem,
                          cw_lists, lists_enabled, timezone,
-                         bold_reading, dogwhistles)
+                         bold_reading, dogwhistles, ua_str)
 
 
 def html_inbox_dms(default_timeline: str,
@@ -1490,7 +1506,7 @@ def html_inbox_dms(default_timeline: str,
                    signing_priv_key_pem: str,
                    cw_lists: {}, lists_enabled: str,
                    timezone: str, bold_reading: bool,
-                   dogwhistles: {}) -> str:
+                   dogwhistles: {}, ua_str: str) -> str:
     """Show the DM timeline as html
     """
     artist = is_artist(base_dir, nickname)
@@ -1516,7 +1532,7 @@ def html_inbox_dms(default_timeline: str,
                          shared_items_federated_domains,
                          signing_priv_key_pem,
                          cw_lists, lists_enabled, timezone,
-                         bold_reading, dogwhistles)
+                         bold_reading, dogwhistles, ua_str)
 
 
 def html_inbox_replies(default_timeline: str,
@@ -1547,7 +1563,7 @@ def html_inbox_replies(default_timeline: str,
                        signing_priv_key_pem: str,
                        cw_lists: {}, lists_enabled: str,
                        timezone: str, bold_reading: bool,
-                       dogwhistles: {}) -> str:
+                       dogwhistles: {}, ua_str: str) -> str:
     """Show the replies timeline as html
     """
     artist = is_artist(base_dir, nickname)
@@ -1572,7 +1588,7 @@ def html_inbox_replies(default_timeline: str,
                          access_keys, system_language, max_like_count,
                          shared_items_federated_domains, signing_priv_key_pem,
                          cw_lists, lists_enabled, timezone, bold_reading,
-                         dogwhistles)
+                         dogwhistles, ua_str)
 
 
 def html_inbox_media(default_timeline: str,
@@ -1603,7 +1619,7 @@ def html_inbox_media(default_timeline: str,
                      signing_priv_key_pem: str,
                      cw_lists: {}, lists_enabled: str,
                      timezone: str, bold_reading: bool,
-                     dogwhistles: {}) -> str:
+                     dogwhistles: {}, ua_str: str) -> str:
     """Show the media timeline as html
     """
     artist = is_artist(base_dir, nickname)
@@ -1628,7 +1644,7 @@ def html_inbox_media(default_timeline: str,
                          access_keys, system_language, max_like_count,
                          shared_items_federated_domains, signing_priv_key_pem,
                          cw_lists, lists_enabled, timezone, bold_reading,
-                         dogwhistles)
+                         dogwhistles, ua_str)
 
 
 def html_inbox_blogs(default_timeline: str,
@@ -1659,7 +1675,7 @@ def html_inbox_blogs(default_timeline: str,
                      signing_priv_key_pem: str,
                      cw_lists: {}, lists_enabled: str,
                      timezone: str, bold_reading: bool,
-                     dogwhistles: {}) -> str:
+                     dogwhistles: {}, ua_str: str) -> str:
     """Show the blogs timeline as html
     """
     artist = is_artist(base_dir, nickname)
@@ -1684,7 +1700,7 @@ def html_inbox_blogs(default_timeline: str,
                          access_keys, system_language, max_like_count,
                          shared_items_federated_domains, signing_priv_key_pem,
                          cw_lists, lists_enabled, timezone, bold_reading,
-                         dogwhistles)
+                         dogwhistles, ua_str)
 
 
 def html_inbox_features(default_timeline: str,
@@ -1716,7 +1732,7 @@ def html_inbox_features(default_timeline: str,
                         signing_priv_key_pem: str,
                         cw_lists: {}, lists_enabled: str,
                         timezone: str, bold_reading: bool,
-                        dogwhistles: {}) -> str:
+                        dogwhistles: {}, ua_str: str) -> str:
     """Show the features timeline as html
     """
     return html_timeline(default_timeline,
@@ -1740,7 +1756,7 @@ def html_inbox_features(default_timeline: str,
                          access_keys, system_language, max_like_count,
                          shared_items_federated_domains, signing_priv_key_pem,
                          cw_lists, lists_enabled, timezone, bold_reading,
-                         dogwhistles)
+                         dogwhistles, ua_str)
 
 
 def html_inbox_news(default_timeline: str,
@@ -1771,7 +1787,7 @@ def html_inbox_news(default_timeline: str,
                     signing_priv_key_pem: str,
                     cw_lists: {}, lists_enabled: str,
                     timezone: str, bold_reading: bool,
-                    dogwhistles: {}) -> str:
+                    dogwhistles: {}, ua_str: str) -> str:
     """Show the news timeline as html
     """
     return html_timeline(default_timeline,
@@ -1795,7 +1811,7 @@ def html_inbox_news(default_timeline: str,
                          access_keys, system_language, max_like_count,
                          shared_items_federated_domains, signing_priv_key_pem,
                          cw_lists, lists_enabled, timezone, bold_reading,
-                         dogwhistles)
+                         dogwhistles, ua_str)
 
 
 def html_outbox(default_timeline: str,
@@ -1826,7 +1842,7 @@ def html_outbox(default_timeline: str,
                 signing_priv_key_pem: str,
                 cw_lists: {}, lists_enabled: str,
                 timezone: str, bold_reading: bool,
-                dogwhistles: {}) -> str:
+                dogwhistles: {}, ua_str: str) -> str:
     """Show the Outbox as html
     """
     manually_approve_followers = \
@@ -1853,4 +1869,4 @@ def html_outbox(default_timeline: str,
                          access_keys, system_language, max_like_count,
                          shared_items_federated_domains, signing_priv_key_pem,
                          cw_lists, lists_enabled, timezone, bold_reading,
-                         dogwhistles)
+                         dogwhistles, ua_str)

From 6bf46d15ad48795a1c69a330c72c0def01c0ce02 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@libreserver.org>
Date: Wed, 13 Jul 2022 12:28:06 +0100
Subject: [PATCH 02/10] Support other text mode browsers

---
 webapp_timeline.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webapp_timeline.py b/webapp_timeline.py
index 25263ec08..365b22ecc 100644
--- a/webapp_timeline.py
+++ b/webapp_timeline.py
@@ -385,7 +385,7 @@ def _html_timeline_keyboard(moderator: bool, text_mode_banner: str,
 def _text_mode_browser(ua_str: str) -> bool:
     """Does the user agent indicate a text mode browser?
     """
-    if 'Lynx/' in ua_str:
+    if ('Lynx/', 'w3m/', 'Links (', 'eww/') in ua_str:
         return True
     return False
 

From e280c92d8f03410173df6afcb4cd14b413fb021d Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@libreserver.org>
Date: Wed, 13 Jul 2022 12:39:04 +0100
Subject: [PATCH 03/10] Text mode agents

---
 webapp_timeline.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/webapp_timeline.py b/webapp_timeline.py
index 365b22ecc..4a3979044 100644
--- a/webapp_timeline.py
+++ b/webapp_timeline.py
@@ -385,8 +385,10 @@ def _html_timeline_keyboard(moderator: bool, text_mode_banner: str,
 def _text_mode_browser(ua_str: str) -> bool:
     """Does the user agent indicate a text mode browser?
     """
-    if ('Lynx/', 'w3m/', 'Links (', 'eww/') in ua_str:
-        return True
+    text_mode_agents = ('Lynx/', 'w3m/', 'Links (', 'Emacs/')
+    for agent in text_mode_agents:
+        if agent in ua_str:
+            return True
     return False
 
 

From ffbde038bc555d04201ef0e88abe5d189f6e51e0 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@libreserver.org>
Date: Wed, 13 Jul 2022 12:48:21 +0100
Subject: [PATCH 04/10] Detecting text mode browser requests

---
 daemon.py          | 4 ++--
 webapp_timeline.py | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/daemon.py b/daemon.py
index 438d32eb4..e8bd09bb6 100644
--- a/daemon.py
+++ b/daemon.py
@@ -183,6 +183,7 @@ from webapp_confirm import html_confirm_unblock
 from webapp_person_options import person_minimize_images
 from webapp_person_options import person_undo_minimize_images
 from webapp_person_options import html_person_options
+from webapp_timeline import text_mode_browser
 from webapp_timeline import html_shares
 from webapp_timeline import html_wanted
 from webapp_timeline import html_inbox
@@ -657,8 +658,7 @@ class PubServer(BaseHTTPRequestHandler):
                 return False
         if accept_str.startswith('*'):
             if self.headers.get('User-Agent'):
-                if 'ELinks' in self.headers['User-Agent'] or \
-                   'Lynx' in self.headers['User-Agent']:
+                if text_mode_browser(self.headers['User-Agent']):
                     return True
             return False
         if 'json' in accept_str:
diff --git a/webapp_timeline.py b/webapp_timeline.py
index 4a3979044..fdf2f7df9 100644
--- a/webapp_timeline.py
+++ b/webapp_timeline.py
@@ -382,10 +382,10 @@ def _html_timeline_keyboard(moderator: bool, text_mode_banner: str,
                                     follow_approvals)
 
 
-def _text_mode_browser(ua_str: str) -> bool:
+def text_mode_browser(ua_str: str) -> bool:
     """Does the user agent indicate a text mode browser?
     """
-    text_mode_agents = ('Lynx/', 'w3m/', 'Links (', 'Emacs/')
+    text_mode_agents = ('Lynx/', 'w3m/', 'Links (', 'Emacs/', 'ELinks')
     for agent in text_mode_agents:
         if agent in ua_str:
             return True
@@ -413,7 +413,7 @@ def _html_timeline_end(base_dir: str, nickname: str, domain_full: str,
 
     # right column
     right_column_str = ''
-    if not _text_mode_browser(ua_str):
+    if not text_mode_browser(ua_str):
         right_column_str = \
             get_right_column_content(base_dir, nickname, domain_full,
                                      http_prefix, translate,
@@ -825,7 +825,7 @@ def html_timeline(default_timeline: str,
 
     # left column
     left_column_str = ''
-    if not _text_mode_browser(ua_str):
+    if not text_mode_browser(ua_str):
         left_column_str = \
             get_left_column_content(base_dir, nickname, domain_full,
                                     http_prefix, translate,

From 0c73c639e95e302e9d595a7522f4d0e05551cf8e Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@libreserver.org>
Date: Wed, 13 Jul 2022 12:54:43 +0100
Subject: [PATCH 05/10] Detecting text mode browsers

---
 daemon.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/daemon.py b/daemon.py
index e8bd09bb6..c3be13444 100644
--- a/daemon.py
+++ b/daemon.py
@@ -656,7 +656,7 @@ class PubServer(BaseHTTPRequestHandler):
         if 'audio/' in accept_str:
             if 'text/html' not in accept_str:
                 return False
-        if accept_str.startswith('*'):
+        if accept_str.startswith('*') or 'text/html' in accept_str:
             if self.headers.get('User-Agent'):
                 if text_mode_browser(self.headers['User-Agent']):
                     return True

From 34e0d69ab98fdd7ca02eeb74953db05a259a5031 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@libreserver.org>
Date: Wed, 13 Jul 2022 12:57:09 +0100
Subject: [PATCH 06/10] Detecting text mode browsers

---
 daemon.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/daemon.py b/daemon.py
index c3be13444..8c8325026 100644
--- a/daemon.py
+++ b/daemon.py
@@ -660,7 +660,8 @@ class PubServer(BaseHTTPRequestHandler):
             if self.headers.get('User-Agent'):
                 if text_mode_browser(self.headers['User-Agent']):
                     return True
-            return False
+            if 'text/html' not in accept_str:
+                return False
         if 'json' in accept_str:
             return False
         return True

From 82144b79375d5c2fcb62bbfd65afee596f0218a8 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@libreserver.org>
Date: Wed, 13 Jul 2022 14:13:44 +0100
Subject: [PATCH 07/10] Reduce button headers for text-mode browsers

---
 webapp_headerbuttons.py | 394 ++++++++++++++++++++--------------------
 webapp_timeline.py      |   8 +-
 2 files changed, 208 insertions(+), 194 deletions(-)

diff --git a/webapp_headerbuttons.py b/webapp_headerbuttons.py
index 14670319f..fea7aa53a 100644
--- a/webapp_headerbuttons.py
+++ b/webapp_headerbuttons.py
@@ -47,86 +47,23 @@ def header_buttons_timeline(default_timeline: str,
                             calendar_image: str,
                             follow_approvals: str,
                             icons_as_buttons: bool,
-                            access_keys: {}) -> str:
+                            access_keys: {},
+                            is_text_browser: str) -> str:
     """Returns the header at the top of the timeline, containing
     buttons for inbox, outbox, search, calendar, etc
     """
     # start of the button header with inbox, outbox, etc
     tl_str = '<div id="containerHeader" class="containerHeader"><nav>\n'
-    # first button
-    if default_timeline == 'tlmedia':
-        tl_str += \
-            '<a href="' + users_path + '/tlmedia" tabindex="2" ' + \
-            'accesskey="' + access_keys['menuMedia'] + '"'
-        if box_name == 'tlmedia':
-            tl_str += ' aria-current="location"'
-        tl_str += \
-            '><button class="' + \
-            media_button + '"><span>' + translate['Media'] + \
-            '</span></button></a>'
-    elif default_timeline == 'tlblogs':
-        tl_str += \
-            '<a href="' + users_path + \
-            '/tlblogs" tabindex="2"'
-        if box_name == 'tlblogs':
-            tl_str += ' aria-current="location"'
-        tl_str += \
-            '><button class="' + \
-            blogs_button + '" accesskey="' + access_keys['menuBlogs'] + \
-            '"><span>' + translate['Blogs'] + '</span></button></a>'
-    elif default_timeline == 'tlfeatures':
-        tl_str += \
-            '<a href="' + users_path + \
-            '/tlfeatures" tabindex="2"'
-        if box_name == 'tlfeatures':
-            tl_str += ' aria-current="location"'
-        tl_str += \
-            '><button class="' + \
-            features_button + '"><span>' + translate['Features'] + \
-            '</span></button></a>'
-    else:
-        tl_str += \
-            '<a href="' + users_path + \
-            '/inbox" tabindex="2"><button class="' + \
-            inbox_button + '"'
-        if box_name == 'inbox':
-            tl_str += ' aria-current="location"'
-        tl_str += \
-            ' accesskey="' + access_keys['menuInbox'] + '">' + \
-            '<span>' + translate['Inbox'] + '</span></button></a>'
 
     # if this is a news instance and we are viewing the news timeline
     features_header = False
     if default_timeline == 'tlfeatures' and box_name == 'tlfeatures':
         features_header = True
 
-    if not features_header:
-        tl_str += \
-            '<a href="' + users_path + '/dm" tabindex="2"'
-        if box_name == 'dm':
-            tl_str += ' aria-current="location"'
-        tl_str += \
-            '><button class="' + dm_button + \
-            '" accesskey="' + access_keys['menuDM'] + '">' + \
-            '<span>' + html_highlight_label(translate['DM'], new_dm) + \
-            '</span></button></a>'
+    if not is_text_browser:
 
-        replies_index_filename = \
-            acct_dir(base_dir, nickname, domain) + '/tlreplies.index'
-        if os.path.isfile(replies_index_filename):
-            tl_str += \
-                '<a href="' + users_path + '/tlreplies" tabindex="2"'
-            if box_name == 'tlreplies':
-                tl_str += ' aria-current="location"'
-            tl_str += \
-                '><button class="' + replies_button + '" ' + \
-                'accesskey="' + access_keys['menuReplies'] + '"><span>' + \
-                html_highlight_label(translate['Replies'], new_reply) + \
-                '</span></button></a>'
-
-    # typically the media button
-    if default_timeline != 'tlmedia':
-        if not minimal and not features_header:
+        # first button
+        if default_timeline == 'tlmedia':
             tl_str += \
                 '<a href="' + users_path + '/tlmedia" tabindex="2" ' + \
                 'accesskey="' + access_keys['menuMedia'] + '"'
@@ -136,34 +73,72 @@ def header_buttons_timeline(default_timeline: str,
                 '><button class="' + \
                 media_button + '"><span>' + translate['Media'] + \
                 '</span></button></a>'
-    else:
-        if not minimal:
+        elif default_timeline == 'tlblogs':
             tl_str += \
                 '<a href="' + users_path + \
-                '/inbox" tabindex="2"'
-            if box_name == 'inbox':
+                '/tlblogs" tabindex="2"'
+            if box_name == 'tlblogs':
                 tl_str += ' aria-current="location"'
             tl_str += \
                 '><button class="' + \
-                inbox_button + '"><span>' + translate['Inbox'] + \
+                blogs_button + '" accesskey="' + access_keys['menuBlogs'] + \
+                '"><span>' + translate['Blogs'] + '</span></button></a>'
+        elif default_timeline == 'tlfeatures':
+            tl_str += \
+                '<a href="' + users_path + \
+                '/tlfeatures" tabindex="2"'
+            if box_name == 'tlfeatures':
+                tl_str += ' aria-current="location"'
+            tl_str += \
+                '><button class="' + \
+                features_button + '"><span>' + translate['Features'] + \
+                '</span></button></a>'
+        else:
+            tl_str += \
+                '<a href="' + users_path + \
+                '/inbox" tabindex="2"><button class="' + \
+                inbox_button + '"'
+            if box_name == 'inbox':
+                tl_str += ' aria-current="location"'
+            tl_str += \
+                ' accesskey="' + access_keys['menuInbox'] + '">' + \
+                '<span>' + translate['Inbox'] + '</span></button></a>'
+
+        if not features_header:
+            tl_str += \
+                '<a href="' + users_path + '/dm" tabindex="2"'
+            if box_name == 'dm':
+                tl_str += ' aria-current="location"'
+            tl_str += \
+                '><button class="' + dm_button + \
+                '" accesskey="' + access_keys['menuDM'] + '">' + \
+                '<span>' + html_highlight_label(translate['DM'], new_dm) + \
                 '</span></button></a>'
 
-    if not features_header:
-        # typically the blogs button
-        # but may change if this is a blogging oriented instance
-        if default_timeline != 'tlblogs':
-            if not minimal:
-                title_str = translate['Blogs']
-                if default_timeline == 'tlfeatures':
-                    title_str = translate['Article']
+            replies_index_filename = \
+                acct_dir(base_dir, nickname, domain) + '/tlreplies.index'
+            if os.path.isfile(replies_index_filename):
                 tl_str += \
-                    '<a href="' + users_path + \
-                    '/tlblogs" tabindex="2"'
-                if box_name == 'tlblogs':
+                    '<a href="' + users_path + '/tlreplies" tabindex="2"'
+                if box_name == 'tlreplies':
                     tl_str += ' aria-current="location"'
                 tl_str += \
-                    '><button class="' + blogs_button + '" accesskey="' + \
-                    access_keys['menuBlogs'] + '"><span>' + title_str + \
+                    '><button class="' + replies_button + '" ' + \
+                    'accesskey="' + access_keys['menuReplies'] + '"><span>' + \
+                    html_highlight_label(translate['Replies'], new_reply) + \
+                    '</span></button></a>'
+
+        # typically the media button
+        if default_timeline != 'tlmedia':
+            if not minimal and not features_header:
+                tl_str += \
+                    '<a href="' + users_path + '/tlmedia" tabindex="2" ' + \
+                    'accesskey="' + access_keys['menuMedia'] + '"'
+                if box_name == 'tlmedia':
+                    tl_str += ' aria-current="location"'
+                tl_str += \
+                    '><button class="' + \
+                    media_button + '"><span>' + translate['Media'] + \
                     '</span></button></a>'
         else:
             if not minimal:
@@ -177,20 +152,49 @@ def header_buttons_timeline(default_timeline: str,
                     inbox_button + '"><span>' + translate['Inbox'] + \
                     '</span></button></a>'
 
-    # typically the news button
-    # but may change if this is a news oriented instance
-    if default_timeline == 'tlfeatures':
         if not features_header:
-            tl_str += \
-                '<a href="' + users_path + \
-                '/inbox" tabindex="2"'
-            if box_name == 'inbox':
-                tl_str += ' aria-current="location"'
-            tl_str += \
-                '><button class="' + \
-                inbox_button + '" accesskey="' + \
-                access_keys['menuInbox'] + '"><span>' + translate['Inbox'] + \
-                '</span></button></a>'
+            # typically the blogs button
+            # but may change if this is a blogging oriented instance
+            if default_timeline != 'tlblogs':
+                if not minimal:
+                    title_str = translate['Blogs']
+                    if default_timeline == 'tlfeatures':
+                        title_str = translate['Article']
+                    tl_str += \
+                        '<a href="' + users_path + \
+                        '/tlblogs" tabindex="2"'
+                    if box_name == 'tlblogs':
+                        tl_str += ' aria-current="location"'
+                    tl_str += \
+                        '><button class="' + blogs_button + '" accesskey="' + \
+                        access_keys['menuBlogs'] + '"><span>' + title_str + \
+                        '</span></button></a>'
+            else:
+                if not minimal:
+                    tl_str += \
+                        '<a href="' + users_path + \
+                        '/inbox" tabindex="2"'
+                    if box_name == 'inbox':
+                        tl_str += ' aria-current="location"'
+                    tl_str += \
+                        '><button class="' + \
+                        inbox_button + '"><span>' + translate['Inbox'] + \
+                        '</span></button></a>'
+
+        # typically the news button
+        # but may change if this is a news oriented instance
+        if default_timeline == 'tlfeatures':
+            if not features_header:
+                tl_str += \
+                    '<a href="' + users_path + \
+                    '/inbox" tabindex="2"'
+                if box_name == 'inbox':
+                    tl_str += ' aria-current="location"'
+                tl_str += \
+                    '><button class="' + \
+                    inbox_button + '" accesskey="' + \
+                    access_keys['menuInbox'] + '"><span>' + \
+                    translate['Inbox'] + '</span></button></a>'
 
     # show todays events buttons on the first inbox page
     happening_str = ''
@@ -245,45 +249,49 @@ def header_buttons_timeline(default_timeline: str,
                     '<button class="button">' + \
                     translate['Happening This Week'] + '</button></a>'
 
-    if not features_header:
-        # button for the outbox
-        tl_str += \
-            '<a href="' + users_path + '/outbox"'
-        if box_name == 'outbox':
-            tl_str += ' aria-current="location"'
-        tl_str += \
-            '><button class="' + \
-            sent_button + '" tabindex="2" accesskey="' + \
-            access_keys['menuOutbox'] + '">' + \
-            '<span>' + translate['Sent'] + '</span></button></a>'
-
-        # add other buttons
-        tl_str += \
-            shares_button_str + wanted_button_str + bookmarks_button_str + \
-            events_button_str + \
-            moderation_button_str + happening_str + new_post_button_str
-
-    if not features_header:
-        if not icons_as_buttons:
-            # the search icon
+    if not is_text_browser:
+        if not features_header:
+            # button for the outbox
             tl_str += \
-                '<a class="imageAnchor" href="' + users_path + \
-                '/search" accesskey="' + access_keys['menuSearch'] + \
-                '" tabindex="3">' + \
-                '<img loading="lazy" decoding="async" src="/' + \
-                'icons/search.png" title="' + \
-                translate['Search and follow'] + '" alt="| ' + \
-                translate['Search and follow'] + \
-                '" class="timelineicon"/></a>'
-        else:
-            # the search button
+                '<a href="' + users_path + '/outbox"'
+            if box_name == 'outbox':
+                tl_str += ' aria-current="location"'
             tl_str += \
-                '<a href="' + users_path + \
-                '/search" tabindex="3">' + \
-                '<button class="button" ' + \
-                'accesskey="' + access_keys['menuSearch'] + '>' + \
-                '<span>' + translate['Search'] + \
-                '</span></button></a>'
+                '><button class="' + \
+                sent_button + '" tabindex="2" accesskey="' + \
+                access_keys['menuOutbox'] + '">' + \
+                '<span>' + translate['Sent'] + '</span></button></a>'
+
+            # add other buttons
+            tl_str += \
+                shares_button_str + wanted_button_str + \
+                bookmarks_button_str + events_button_str + \
+                moderation_button_str + happening_str + new_post_button_str
+    else:
+        tl_str += happening_str
+
+    if not is_text_browser:
+        if not features_header:
+            if not icons_as_buttons:
+                # the search icon
+                tl_str += \
+                    '<a class="imageAnchor" href="' + users_path + \
+                    '/search" accesskey="' + access_keys['menuSearch'] + \
+                    '" tabindex="3">' + \
+                    '<img loading="lazy" decoding="async" src="/' + \
+                    'icons/search.png" title="' + \
+                    translate['Search and follow'] + '" alt="| ' + \
+                    translate['Search and follow'] + \
+                    '" class="timelineicon"/></a>'
+            else:
+                # the search button
+                tl_str += \
+                    '<a href="' + users_path + \
+                    '/search" tabindex="3">' + \
+                    '<button class="button" ' + \
+                    'accesskey="' + access_keys['menuSearch'] + '>' + \
+                    '<span>' + translate['Search'] + \
+                    '</span></button></a>'
 
     # benchmark 5
     time_diff = int((time.time() - timeline_start_time) * 1000)
@@ -291,28 +299,29 @@ def header_buttons_timeline(default_timeline: str,
         print('TIMELINE TIMING ' + box_name + ' 5 = ' + str(time_diff))
 
     # the calendar button
-    if not features_header:
-        calendar_alt_text = translate['Calendar']
-        if new_calendar_event:
-            # indicate that the calendar icon is highlighted
-            calendar_alt_text = '*' + calendar_alt_text + '*'
-        if not icons_as_buttons:
-            tl_str += \
-                '      <a class="imageAnchor" href="' + \
-                users_path + calendar_path + \
-                '" accesskey="' + access_keys['menuCalendar'] + \
-                '" tabindex="3">' + \
-                '<img loading="lazy" decoding="async" src="/icons/' + \
-                calendar_image + '" title="' + translate['Calendar'] + \
-                '" alt="| ' + calendar_alt_text + \
-                '" class="timelineicon"/></a>\n'
-        else:
-            tl_str += \
-                '<a href="' + users_path + calendar_path + \
-                '" tabindex="3"><button class="button" accesskey="' + \
-                access_keys['menuCalendar'] + '">' + \
-                '<span>' + translate['Calendar'] + \
-                '</span></button></a>'
+    if not is_text_browser:
+        if not features_header:
+            calendar_alt_text = translate['Calendar']
+            if new_calendar_event:
+                # indicate that the calendar icon is highlighted
+                calendar_alt_text = '*' + calendar_alt_text + '*'
+            if not icons_as_buttons:
+                tl_str += \
+                    '      <a class="imageAnchor" href="' + \
+                    users_path + calendar_path + \
+                    '" accesskey="' + access_keys['menuCalendar'] + \
+                    '" tabindex="3">' + \
+                    '<img loading="lazy" decoding="async" src="/icons/' + \
+                    calendar_image + '" title="' + translate['Calendar'] + \
+                    '" alt="| ' + calendar_alt_text + \
+                    '" class="timelineicon"/></a>\n'
+            else:
+                tl_str += \
+                    '<a href="' + users_path + calendar_path + \
+                    '" tabindex="3"><button class="button" accesskey="' + \
+                    access_keys['menuCalendar'] + '">' + \
+                    '<span>' + translate['Calendar'] + \
+                    '</span></button></a>'
 
     if not features_header:
         # the show/hide button, for a simpler header appearance
@@ -340,41 +349,42 @@ def header_buttons_timeline(default_timeline: str,
             '><button class="button">' + \
             '<span>' + translate['User'] + '</span></button></a>'
 
-    # the newswire button to show right column links
-    if not icons_as_buttons:
-        tl_str += \
-            '<a class="imageAnchorMobile" href="' + \
-            users_path + '/newswiremobile">' + \
-            '<img loading="lazy" decoding="async" src="/icons' + \
-            '/newswire.png" title="' + translate['News'] + \
-            '" alt="| ' + translate['News'] + \
-            '" class="timelineicon"/></a>'
-    else:
-        # NOTE: deliberately no \n at end of line
-        tl_str += \
-            '<a href="' + \
-            users_path + '/newswiremobile' + \
-            '" tabindex="2"><button class="buttonMobile">' + \
-            '<span>' + translate['Newswire'] + \
-            '</span></button></a>'
+    if not is_text_browser:
+        # the newswire button to show right column links
+        if not icons_as_buttons:
+            tl_str += \
+                '<a class="imageAnchorMobile" href="' + \
+                users_path + '/newswiremobile">' + \
+                '<img loading="lazy" decoding="async" src="/icons' + \
+                '/newswire.png" title="' + translate['News'] + \
+                '" alt="| ' + translate['News'] + \
+                '" class="timelineicon"/></a>'
+        else:
+            # NOTE: deliberately no \n at end of line
+            tl_str += \
+                '<a href="' + \
+                users_path + '/newswiremobile' + \
+                '" tabindex="2"><button class="buttonMobile">' + \
+                '<span>' + translate['Newswire'] + \
+                '</span></button></a>'
 
-    # the links button to show left column links
-    if not icons_as_buttons:
-        tl_str += \
-            '<a class="imageAnchorMobile" href="' + \
-            users_path + '/linksmobile">' + \
-            '<img loading="lazy" decoding="async" src="/icons' + \
-            '/links.png" title="' + translate['Edit Links'] + \
-            '" alt="| ' + translate['Edit Links'] + \
-            '" class="timelineicon"/></a>'
-    else:
-        # NOTE: deliberately no \n at end of line
-        tl_str += \
-            '<a href="' + \
-            users_path + '/linksmobile' + \
-            '" tabindex="2"><button class="buttonMobile">' + \
-            '<span>' + translate['Links'] + \
-            '</span></button></a>'
+        # the links button to show left column links
+        if not icons_as_buttons:
+            tl_str += \
+                '<a class="imageAnchorMobile" href="' + \
+                users_path + '/linksmobile">' + \
+                '<img loading="lazy" decoding="async" src="/icons' + \
+                '/links.png" title="' + translate['Edit Links'] + \
+                '" alt="| ' + translate['Edit Links'] + \
+                '" class="timelineicon"/></a>'
+        else:
+            # NOTE: deliberately no \n at end of line
+            tl_str += \
+                '<a href="' + \
+                users_path + '/linksmobile' + \
+                '" tabindex="2"><button class="buttonMobile">' + \
+                '<span>' + translate['Links'] + \
+                '</span></button></a>'
 
     if features_header:
         tl_str += \
diff --git a/webapp_timeline.py b/webapp_timeline.py
index fdf2f7df9..3426bb0d3 100644
--- a/webapp_timeline.py
+++ b/webapp_timeline.py
@@ -793,6 +793,7 @@ def html_timeline(default_timeline: str,
         '</header>\n'
 
     if full_width_tl_button_header:
+        is_text_browser = text_mode_browser(ua_str)
         tl_str += \
             header_buttons_timeline(default_timeline, box_name, page_number,
                                     translate, users_path, media_button,
@@ -807,7 +808,8 @@ def html_timeline(default_timeline: str,
                                     domain, timeline_start_time,
                                     new_calendar_event, calendar_path,
                                     calendar_image, follow_approvals,
-                                    icons_as_buttons, access_keys)
+                                    icons_as_buttons, access_keys,
+                                    is_text_browser)
 
     # start the timeline
     tl_str += \
@@ -844,6 +846,7 @@ def html_timeline(default_timeline: str,
     tl_str += '  <td valign="top" class="col-center" tabindex="-1">\n'
 
     if not full_width_tl_button_header:
+        is_text_browser = text_mode_browser(ua_str)
         tl_str += \
             header_buttons_timeline(default_timeline, box_name, page_number,
                                     translate, users_path, media_button,
@@ -858,7 +861,8 @@ def html_timeline(default_timeline: str,
                                     domain, timeline_start_time,
                                     new_calendar_event, calendar_path,
                                     calendar_image, follow_approvals,
-                                    icons_as_buttons, access_keys)
+                                    icons_as_buttons, access_keys,
+                                    is_text_browser)
 
     tl_str += \
         '  <div id="timelineposts" class="timeline-posts" ' + \

From aa78d5be2aa6a90e94f5c65c803d471bab8c9b97 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@libreserver.org>
Date: Wed, 13 Jul 2022 14:16:54 +0100
Subject: [PATCH 08/10] Remove show/hide button for text mode browsers

---
 webapp_headerbuttons.py | 33 +++++++++++++++++----------------
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/webapp_headerbuttons.py b/webapp_headerbuttons.py
index fea7aa53a..5ee09a099 100644
--- a/webapp_headerbuttons.py
+++ b/webapp_headerbuttons.py
@@ -323,22 +323,23 @@ def header_buttons_timeline(default_timeline: str,
                     '<span>' + translate['Calendar'] + \
                     '</span></button></a>'
 
-    if not features_header:
-        # the show/hide button, for a simpler header appearance
-        if not icons_as_buttons:
-            tl_str += \
-                '      <a class="imageAnchor" href="' + \
-                users_path + '/minimal" tabindex="3">' + \
-                '<img loading="lazy" decoding="async" src="/icons' + \
-                '/showhide.png" title="' + translate['Show/Hide Buttons'] + \
-                '" alt="| ' + translate['Show/Hide Buttons'] + \
-                '" class="timelineicon"/></a>\n'
-        else:
-            tl_str += \
-                '<a href="' + users_path + '/minimal' + \
-                '" tabindex="3"><button class="button">' + \
-                '<span>' + translate['Show/Hide Buttons'] + \
-                '</span></button></a>'
+        if not features_header:
+            # the show/hide button, for a simpler header appearance
+            if not icons_as_buttons:
+                tl_str += \
+                    '      <a class="imageAnchor" href="' + \
+                    users_path + '/minimal" tabindex="3">' + \
+                    '<img loading="lazy" decoding="async" src="/icons' + \
+                    '/showhide.png" title="' + \
+                    translate['Show/Hide Buttons'] + \
+                    '" alt="| ' + translate['Show/Hide Buttons'] + \
+                    '" class="timelineicon"/></a>\n'
+            else:
+                tl_str += \
+                    '<a href="' + users_path + '/minimal' + \
+                    '" tabindex="3"><button class="button">' + \
+                    '<span>' + translate['Show/Hide Buttons'] + \
+                    '</span></button></a>'
 
     if features_header:
         tl_str += \

From b594411ee84c7ad8f3715e7d30927105050f4085 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@libreserver.org>
Date: Wed, 13 Jul 2022 14:21:14 +0100
Subject: [PATCH 09/10] Extra space

---
 webapp_timeline.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webapp_timeline.py b/webapp_timeline.py
index 3426bb0d3..a828f9944 100644
--- a/webapp_timeline.py
+++ b/webapp_timeline.py
@@ -341,7 +341,7 @@ def _html_timeline_keyboard(moderator: bool, text_mode_banner: str,
     menu_shares = \
         html_hide_from_screen_reader('🤝') + ' ' + shares_str
     menu_wanted = \
-        html_hide_from_screen_reader('⛱') + ' ' + wanted_str
+        html_hide_from_screen_reader('⛱') + '  ' + wanted_str
     menu_blogs = \
         html_hide_from_screen_reader('📝') + ' ' + translate['Blogs']
     menu_newswire = \

From 2ff4f9102d0d10b52650024fd381471dbe509803 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@libreserver.org>
Date: Wed, 13 Jul 2022 14:23:12 +0100
Subject: [PATCH 10/10] Remove space

---
 webapp_timeline.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webapp_timeline.py b/webapp_timeline.py
index a828f9944..3426bb0d3 100644
--- a/webapp_timeline.py
+++ b/webapp_timeline.py
@@ -341,7 +341,7 @@ def _html_timeline_keyboard(moderator: bool, text_mode_banner: str,
     menu_shares = \
         html_hide_from_screen_reader('🤝') + ' ' + shares_str
     menu_wanted = \
-        html_hide_from_screen_reader('⛱') + '  ' + wanted_str
+        html_hide_from_screen_reader('⛱') + ' ' + wanted_str
     menu_blogs = \
         html_hide_from_screen_reader('📝') + ' ' + translate['Blogs']
     menu_newswire = \