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

Tidying

merge-requests/30/head
Bob Mottram 2024-04-11 16:24:43 +01:00
parent 034165e4e3
commit dde3f6231b
2 changed files with 45 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
daemon_get.py
View File

@ -1334,7 +1334,12 @@ def daemon_http_get(self) -> None:
proxy_type, proxy_type,
getreq_start_time, getreq_start_time,
self.server.debug, self.server.debug,
curr_session) curr_session,
self.server.newswire,
self.server.http_prefix,
self.server.domain_full,
self.server.translate,
self.server.fitness)
return return
# RSS 2.0 # RSS 2.0
@ -3202,7 +3207,10 @@ def daemon_http_get(self) -> None:
self.server.onion_domain, self.server.onion_domain,
self.server.i2p_domain, self.server.i2p_domain,
getreq_start_time, getreq_start_time,
self.server.newswire) self.server.newswire,
self.server.default_timeline,
self.server.fitness,
self.server.debug)
self.server.getreq_busy = False self.server.getreq_busy = False
return return
@ -3218,7 +3226,9 @@ def daemon_http_get(self) -> None:
self.server.i2p_domain, self.server.i2p_domain,
getreq_start_time, getreq_start_time,
self.server.debug, self.server.debug,
self.server.newswire) self.server.newswire,
self.server.default_timeline,
self.server.fitness)
self.server.getreq_busy = False self.server.getreq_busy = False
return return
@ -3738,7 +3748,12 @@ def daemon_http_get(self) -> None:
if edit_newswire2(self, calling_domain, self.path, if edit_newswire2(self, calling_domain, self.path,
self.server.translate, self.server.translate,
self.server.base_dir, self.server.base_dir,
self.server.domain, cookie): self.server.domain, cookie,
self.server.access_keys,
self.server.key_shortcuts,
self.server.default_timeline,
self.server.theme_name,
self.server.dogwhistles):
self.server.getreq_busy = False self.server.getreq_busy = False
return return

46
daemon_get_newswire.py
View File

@ -24,7 +24,10 @@ from webapp_column_right import html_edit_newswire
def get_newswire_feed(self, calling_domain: str, path: str, def get_newswire_feed(self, calling_domain: str, path: str,
proxy_type: str, getreq_start_time, proxy_type: str, getreq_start_time,
debug: bool, curr_session) -> None: debug: bool, curr_session,
newswire: {}, http_prefix: str,
domain_full: str, translate: {},
fitness: {}) -> None:
"""Returns the newswire feed """Returns the newswire feed
""" """
curr_session = \ curr_session = \
@ -36,10 +39,7 @@ def get_newswire_feed(self, calling_domain: str, path: str,
http_404(self, 25) http_404(self, 25)
return return
msg = get_rss_from_dict(self.server.newswire, msg = get_rss_from_dict(newswire, http_prefix, domain_full, translate)
self.server.http_prefix,
self.server.domain_full,
self.server.translate)
if msg: if msg:
msg = msg.encode('utf-8') msg = msg.encode('utf-8')
msglen = len(msg) msglen = len(msg)
@ -49,7 +49,7 @@ def get_newswire_feed(self, calling_domain: str, path: str,
if debug: if debug:
print('Sent rss2 newswire feed: ' + print('Sent rss2 newswire feed: ' +
path + ' ' + calling_domain) path + ' ' + calling_domain)
fitness_performance(getreq_start_time, self.server.fitness, fitness_performance(getreq_start_time, fitness,
'_GET', '_get_newswire_feed', '_GET', '_get_newswire_feed',
debug) debug)
return return
@ -65,7 +65,8 @@ def newswire_vote(self, calling_domain: str, path: str,
domain_full: str, domain_full: str,
onion_domain: str, i2p_domain: str, onion_domain: str, i2p_domain: str,
getreq_start_time, getreq_start_time,
newswire: {}): newswire: {}, default_timeline: str,
fitness: {}, debug: bool) -> None:
"""Vote for a newswire item """Vote for a newswire item
""" """
origin_path_str = path.split('/newswirevote=')[0] origin_path_str = path.split('/newswirevote=')[0]
@ -102,16 +103,16 @@ def newswire_vote(self, calling_domain: str, path: str,
origin_path_str_absolute = \ origin_path_str_absolute = \
http_prefix + '://' + domain_full + origin_path_str + '/' + \ http_prefix + '://' + domain_full + origin_path_str + '/' + \
self.server.default_timeline default_timeline
if calling_domain.endswith('.onion') and onion_domain: if calling_domain.endswith('.onion') and onion_domain:
origin_path_str_absolute = \ origin_path_str_absolute = \
'http://' + onion_domain + origin_path_str 'http://' + onion_domain + origin_path_str
elif (calling_domain.endswith('.i2p') and i2p_domain): elif (calling_domain.endswith('.i2p') and i2p_domain):
origin_path_str_absolute = \ origin_path_str_absolute = \
'http://' + i2p_domain + origin_path_str 'http://' + i2p_domain + origin_path_str
fitness_performance(getreq_start_time, self.server.fitness, fitness_performance(getreq_start_time, fitness,
'_GET', '_newswire_vote', '_GET', '_newswire_vote',
self.server.debug) debug)
redirect_headers(self, origin_path_str_absolute, redirect_headers(self, origin_path_str_absolute,
cookie, calling_domain) cookie, calling_domain)
@ -121,7 +122,8 @@ def newswire_unvote(self, calling_domain: str, path: str,
domain_full: str, domain_full: str,
onion_domain: str, i2p_domain: str, onion_domain: str, i2p_domain: str,
getreq_start_time, debug: bool, getreq_start_time, debug: bool,
newswire: {}): newswire: {}, default_timeline: str,
fitness: {}) -> None:
"""Remove vote for a newswire item """Remove vote for a newswire item
""" """
origin_path_str = path.split('/newswireunvote=')[0] origin_path_str = path.split('/newswireunvote=')[0]
@ -156,7 +158,7 @@ def newswire_unvote(self, calling_domain: str, path: str,
origin_path_str_absolute = \ origin_path_str_absolute = \
http_prefix + '://' + domain_full + origin_path_str + '/' + \ http_prefix + '://' + domain_full + origin_path_str + '/' + \
self.server.default_timeline default_timeline
if calling_domain.endswith('.onion') and onion_domain: if calling_domain.endswith('.onion') and onion_domain:
origin_path_str_absolute = \ origin_path_str_absolute = \
'http://' + onion_domain + origin_path_str 'http://' + onion_domain + origin_path_str
@ -165,13 +167,18 @@ def newswire_unvote(self, calling_domain: str, path: str,
'http://' + i2p_domain + origin_path_str 'http://' + i2p_domain + origin_path_str
redirect_headers(self, origin_path_str_absolute, redirect_headers(self, origin_path_str_absolute,
cookie, calling_domain) cookie, calling_domain)
fitness_performance(getreq_start_time, self.server.fitness, fitness_performance(getreq_start_time, fitness,
'_GET', '_newswire_unvote', debug) '_GET', '_newswire_unvote', debug)
def edit_newswire2(self, calling_domain: str, path: str, def edit_newswire2(self, calling_domain: str, path: str,
translate: {}, base_dir: str, translate: {}, base_dir: str,
domain: str, cookie: str) -> bool: domain: str, cookie: str,
access_keys: {},
key_shortcuts: {},
default_timeline: str,
theme_name: str,
dogwhistles: {}) -> bool:
"""Show the newswire from the right column """Show the newswire from the right column
""" """
if '/users/' in path and path.endswith('/editnewswire'): if '/users/' in path and path.endswith('/editnewswire'):
@ -179,17 +186,16 @@ def edit_newswire2(self, calling_domain: str, path: str,
if '/' in nickname: if '/' in nickname:
nickname = nickname.split('/')[0] nickname = nickname.split('/')[0]
access_keys = self.server.access_keys if key_shortcuts.get(nickname):
if self.server.key_shortcuts.get(nickname): access_keys = key_shortcuts[nickname]
access_keys = self.server.key_shortcuts[nickname]
msg = html_edit_newswire(translate, msg = html_edit_newswire(translate,
base_dir, base_dir,
path, domain, path, domain,
self.server.default_timeline, default_timeline,
self.server.theme_name, theme_name,
access_keys, access_keys,
self.server.dogwhistles) dogwhistles)
if msg: if msg:
msg = msg.encode('utf-8') msg = msg.encode('utf-8')
msglen = len(msg) msglen = len(msg)