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 2022-06-12 21:31:56 +01:00
parent fd279807b0
commit cee17389a2
1 changed files with 9 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
newsdaemon.py
View File

@ -66,8 +66,7 @@ def _update_feeds_outbox_index(base_dir: str, domain: str,
print('EX: unable to write ' + index_filename) print('EX: unable to write ' + index_filename)
def _save_arrived_time(base_dir: str, post_filename: str, def _save_arrived_time(post_filename: str, arrived: str) -> None:
arrived: str) -> None:
"""Saves the time when an rss post arrived to a file """Saves the time when an rss post arrived to a file
""" """
try: try:
@ -100,8 +99,7 @@ def _hashtag_logical_not(tree: [], hashtags: [], moderated: bool,
return False return False
def _hashtag_logical_contains(tree: [], hashtags: [], moderated: bool, def _hashtag_logical_contains(tree: [], content: str) -> bool:
content: str, url: str) -> bool:
""" Contains """ Contains
""" """
if len(tree) != 2: if len(tree) != 2:
@ -121,8 +119,7 @@ def _hashtag_logical_contains(tree: [], hashtags: [], moderated: bool,
return False return False
def _hashtag_logical_from(tree: [], hashtags: [], moderated: bool, def _hashtag_logical_from(tree: [], url: str) -> bool:
content: str, url: str) -> bool:
""" FROM """ FROM
""" """
if len(tree) != 2: if len(tree) != 2:
@ -210,10 +207,9 @@ def hashtag_rule_resolve(tree: [], hashtags: [], moderated: bool,
if tree[0] == 'not': if tree[0] == 'not':
return _hashtag_logical_not(tree, hashtags, moderated, content, url) return _hashtag_logical_not(tree, hashtags, moderated, content, url)
if tree[0] == 'contains': if tree[0] == 'contains':
return _hashtag_logical_contains(tree, hashtags, moderated, return _hashtag_logical_contains(tree, content)
content, url)
if tree[0] == 'from': if tree[0] == 'from':
return _hashtag_logical_from(tree, hashtags, moderated, content, url) return _hashtag_logical_from(tree, url)
if tree[0] == 'and': if tree[0] == 'and':
return _hashtag_logical_and(tree, hashtags, moderated, content, url) return _hashtag_logical_and(tree, hashtags, moderated, content, url)
if tree[0] == 'or': if tree[0] == 'or':
@ -378,13 +374,9 @@ def _hashtag_remove(http_prefix: str, domain_full: str, post_json_object: {},
post_json_object['object']['tag'].remove(rm_tag_object) post_json_object['object']['tag'].remove(rm_tag_object)
def _newswire_hashtag_processing(session, base_dir: str, post_json_object: {}, def _newswire_hashtag_processing(base_dir: str, post_json_object: {},
hashtags: [], http_prefix: str, hashtags: [], http_prefix: str,
domain: str, port: int, domain: str, port: int,
person_cache: {},
cached_webfingers: {},
federation_list: [],
send_threads: [], post_log: [],
moderated: bool, url: str, moderated: bool, url: str,
system_language: str, system_language: str,
translate: {}) -> bool: translate: {}) -> bool:
@ -549,11 +541,6 @@ def _convert_rss_to_activitypub(base_dir: str, http_prefix: str,
newswire: {}, newswire: {},
translate: {}, translate: {},
recent_posts_cache: {}, recent_posts_cache: {},
max_recent_posts: int,
session, cached_webfingers: {},
person_cache: {},
federation_list: [],
send_threads: [], post_log: [],
max_mirrored_articles: int, max_mirrored_articles: int,
allow_local_network_access: bool, allow_local_network_access: bool,
system_language: str, system_language: str,
@ -697,12 +684,8 @@ def _convert_rss_to_activitypub(base_dir: str, http_prefix: str,
moderated = item[5] moderated = item[5]
save_post = \ save_post = \
_newswire_hashtag_processing(session, base_dir, _newswire_hashtag_processing(base_dir, blog, hashtags,
blog, hashtags,
http_prefix, domain, port, http_prefix, domain, port,
person_cache, cached_webfingers,
federation_list,
send_threads, post_log,
moderated, url, system_language, moderated, url, system_language,
translate) translate)
@ -755,7 +738,7 @@ def _convert_rss_to_activitypub(base_dir: str, http_prefix: str,
# this can then later be used to construct the news timeline # this can then later be used to construct the news timeline
# excluding items during the voting period # excluding items during the voting period
if moderated: if moderated:
_save_arrived_time(base_dir, filename, _save_arrived_time(filename,
blog['object']['arrived']) blog['object']['arrived'])
else: else:
if os.path.isfile(filename + '.arrived'): if os.path.isfile(filename + '.arrived'):
@ -842,17 +825,9 @@ def run_newswire_daemon(base_dir: str, httpd,
print('No new newswire') print('No new newswire')
print('Converting newswire to activitypub format') print('Converting newswire to activitypub format')
_convert_rss_to_activitypub(base_dir, _convert_rss_to_activitypub(base_dir, http_prefix, domain, port,
http_prefix, domain, port,
new_newswire, translate, new_newswire, translate,
httpd.recent_posts_cache, httpd.recent_posts_cache,
httpd.max_recent_posts,
httpd.session,
httpd.cached_webfingers,
httpd.person_cache,
httpd.federation_list,
httpd.send_threads,
httpd.postLog,
httpd.max_mirrored_articles, httpd.max_mirrored_articles,
httpd.allow_local_network_access, httpd.allow_local_network_access,
httpd.system_language, httpd.system_language,