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

Less indentation

merge-requests/30/head
Bob Mottram 2024-08-05 11:04:05 +01:00
parent 0cb9a946b2
commit 37d7b7fbc3
1 changed files with 31 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
utils.py
View File

@ -508,18 +508,20 @@ def get_language_from_post(post_json_object: {}, system_language: str,
if not this_post_json.get(content_type): if not this_post_json.get(content_type):
return system_language return system_language
map_dict = content_type + 'Map' map_dict = content_type + 'Map'
if this_post_json.get(map_dict): if not this_post_json.get(map_dict):
if isinstance(this_post_json[map_dict], dict): return system_language
if this_post_json[map_dict].get(system_language): if not isinstance(this_post_json[map_dict], dict):
sys_lang = this_post_json[map_dict][system_language] return system_language
if isinstance(sys_lang, str): if this_post_json[map_dict].get(system_language):
return system_language sys_lang = this_post_json[map_dict][system_language]
else: if isinstance(sys_lang, str):
# is there a contentMap/summaryMap entry for one of return system_language
# the understood languages? else:
for lang in languages_understood: # is there a contentMap/summaryMap entry for one of
if this_post_json[map_dict].get(lang): # the understood languages?
return lang for lang in languages_understood:
if this_post_json[map_dict].get(lang):
return lang
return system_language return system_language
@ -4250,15 +4252,20 @@ def is_group_actor(base_dir: str, actor: str, person_cache: {},
debug: bool = False) -> bool: debug: bool = False) -> bool:
"""Is the given actor a group? """Is the given actor a group?
""" """
person_cache_actor = None
if person_cache: if person_cache:
if person_cache.get(actor): if person_cache.get(actor):
if person_cache[actor].get('actor'): if person_cache[actor].get('actor'):
if person_cache[actor]['actor'].get('type'): person_cache_actor = person_cache[actor]['actor']
if person_cache[actor]['actor']['type'] == 'Group':
if debug: if person_cache_actor:
print('Cached actor ' + actor + ' has Group type') if person_cache_actor.get('type'):
return True if person_cache_actor['type'] == 'Group':
return False if debug:
print('Cached actor ' + actor + ' has Group type')
return True
return False
if debug: if debug:
print('Actor ' + actor + ' not in cache') print('Actor ' + actor + ' not in cache')
cached_actor_filename = \ cached_actor_filename = \
@ -4984,11 +4991,12 @@ def get_quote_toot_url(post_json_object: str) -> str:
object_quote_url_fields = ('quoteUri', 'quoteUrl', 'quoteReply', object_quote_url_fields = ('quoteUri', 'quoteUrl', 'quoteReply',
'toot:quoteReply', '_misskey_quote') 'toot:quoteReply', '_misskey_quote')
for fieldname in object_quote_url_fields: for fieldname in object_quote_url_fields:
if post_json_object['object'].get(fieldname): if not post_json_object['object'].get(fieldname):
quote_url = post_json_object['object'][fieldname] continue
if isinstance(quote_url, str): quote_url = post_json_object['object'][fieldname]
if resembles_url(quote_url): if isinstance(quote_url, str):
return remove_html(quote_url) if resembles_url(quote_url):
return remove_html(quote_url)
# More correct ActivityPub implementation - adding a Link tag # More correct ActivityPub implementation - adding a Link tag
if not post_json_object['object'].get('tag'): if not post_json_object['object'].get('tag'):