indymedia
/
epicyon
mirror of https://gitlab.com/bashrc2/epicyon
7
4
Fork 1
Code Issues 14 Releases Wiki Activity

Don't show left and right timeline columns in text-mode browser

merge-requests/25/head
Bob Mottram 2022-07-13 12:11:57 +01:00
parent 1f46faa698
commit 26d8e88407
3 changed files with 104 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
daemon.py
View File

@ -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

4
webapp_moderation.py
View File

@ -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: {},

104
webapp_timeline.py
View File

@ -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)