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

Tidying

main
bashrc 2026-04-20 20:34:03 +01:00
parent d8f53e0e2e
commit 618f6b435f
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
posts.py
View File

@ -6493,7 +6493,12 @@ def download_announce(session, base_dir: str, http_prefix: str,
post_json_object['object'] + ' ' + post_json_object['object'] + ' ' +
str(announced_json)) str(announced_json))
return None return None
if not announced_json.get('id'):
announced_id: str = ''
if announced_json.get('id'):
announced_id = remove_id_ending(announced_json['id'])
if not announced_id:
print('WARN: announced post does not have an id ' + print('WARN: announced post does not have an id ' +
str(announced_json)) str(announced_json))
_reject_announce(announce_filename, _reject_announce(announce_filename,
@ -6501,7 +6506,7 @@ def download_announce(session, base_dir: str, http_prefix: str,
recent_posts_cache, debug) recent_posts_cache, debug)
return None return None
announced_actor = announced_json['id'] announced_actor = announced_id
if announced_json.get('attributedTo'): if announced_json.get('attributedTo'):
announced_actor = get_attributed_to(announced_json['attributedTo']) announced_actor = get_attributed_to(announced_json['attributedTo'])
@ -6562,7 +6567,7 @@ def download_announce(session, base_dir: str, http_prefix: str,
languages_understood) languages_understood)
if converted_json: if converted_json:
announced_json = converted_json announced_json = converted_json
if not contains_statuses(announced_json['id']): if not contains_statuses(announced_id):
print('WARN: announced post id does not contain /statuses/ ' + print('WARN: announced post id does not contain /statuses/ ' +
'or /objects/ or /p/ ' + str(announced_json)) 'or /objects/ or /p/ ' + str(announced_json))
_reject_announce(announce_filename, _reject_announce(announce_filename,
@ -6668,9 +6673,9 @@ def download_announce(session, base_dir: str, http_prefix: str,
summary_str + ' ' + content_str + ' ' + media_descriptions summary_str + ' ' + content_str + ' ' + media_descriptions
if is_filtered(base_dir, nickname, domain, content_all, if is_filtered(base_dir, nickname, domain, content_all,
system_language): system_language):
if announced_json.get('id'): if announced_id:
print('REJECT: announced post has been filtered ' + print('REJECT: announced post has been filtered ' +
str(announced_json['id'])) str(announced_id))
_reject_announce(announce_filename, _reject_announce(announce_filename,
base_dir, nickname, domain, post_id, base_dir, nickname, domain, post_id,
recent_posts_cache, debug) recent_posts_cache, debug)

2
utils.py
View File

@ -1239,7 +1239,7 @@ def _get_statuses_list() -> []:
'/note/', '/notes/', '/comment/', '/post/', '/item/', '/videos/', '/note/', '/notes/', '/comment/', '/post/', '/item/', '/videos/',
'/button/', '/x/', '/o/', '/posts/', '/items/', '/object/', '/r/', '/button/', '/x/', '/o/', '/posts/', '/items/', '/object/', '/r/',
'/content/', '/federation/', '/elsewhere/', '/article/', '/content/', '/federation/', '/elsewhere/', '/article/',
'/activity/', '/blog/', '/app.bsky.feed.post/') '/activity/', '/blog/', '/app.bsky.feed.post/', '/?p=')
def contains_statuses(url: str) -> bool: def contains_statuses(url: str) -> bool: