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

Check if post was deleted

main
Bob Mottram 2025-11-17 18:08:33 +00:00
parent fbc5439eb5
commit bdce3e1e35
2 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
posts.py
View File

@ -5420,9 +5420,10 @@ def _expire_posts_for_person(http_prefix: str, nickname: str, domain: str,
if is_dm(post_json_object): if is_dm(post_json_object):
continue continue
print('DEBUG: published_str ' + published_str + ' ' + str(max_age_days)) print('DEBUG: published_str ' + published_str + ' ' + str(max_age_days))
delete_post(base_dir, http_prefix, nickname, domain, debug = True
full_filename, debug, recent_posts_cache, True) if delete_post(base_dir, http_prefix, nickname, domain,
expired_post_count += 1 full_filename, debug, recent_posts_cache, True):
expired_post_count += 1
return expired_post_count return expired_post_count

18
utils.py
View File

@ -2204,8 +2204,9 @@ def _is_remote_dm(domain_full: str, post_json_object: {}) -> bool:
def delete_post(base_dir: str, http_prefix: str, def delete_post(base_dir: str, http_prefix: str,
nickname: str, domain: str, post_filename: str, nickname: str, domain: str, post_filename: str,
debug: bool, recent_posts_cache: {}, debug: bool, recent_posts_cache: {},
manual: bool) -> None: manual: bool) -> bool:
"""Recursively deletes a post and its replies and attachments """Recursively deletes a post and its replies and attachments
Returns True if deleted
""" """
post_json_object = load_json(post_filename) post_json_object = load_json(post_filename)
if not post_json_object: if not post_json_object:
@ -2216,27 +2217,32 @@ def delete_post(base_dir: str, http_prefix: str,
# finally, remove the post itself # finally, remove the post itself
try: try:
os.remove(post_filename) os.remove(post_filename)
return True
except OSError: except OSError:
if debug: if debug:
print('EX: delete_post unable to delete post ' + print('EX: delete_post unable to delete post ' +
str(post_filename)) str(post_filename))
return return False
# don't allow DMs to be deleted if they came from a different instance # don't allow DMs to be deleted if they came from a different instance
# otherwise this breaks expectations about how DMs should operate # otherwise this breaks expectations about how DMs should operate
# i.e. DMs should only be removed if they are manually deleted # i.e. DMs should only be removed if they are manually deleted
if not manual: if not manual:
if _is_remote_dm(domain, post_json_object): if _is_remote_dm(domain, post_json_object):
return print('DEBUG: remote DM not deleted ' + post_filename)
return False
# don't allow deletion of bookmarked posts # don't allow deletion of bookmarked posts
if _is_bookmarked(base_dir, nickname, domain, post_filename): if _is_bookmarked(base_dir, nickname, domain, post_filename):
return if debug:
print('DEBUG: bookmarked post not deleted ' + post_filename)
return False
# don't remove replies to blog posts # don't remove replies to blog posts
if _is_reply_to_blog_post(base_dir, nickname, domain, if _is_reply_to_blog_post(base_dir, nickname, domain,
post_json_object): post_json_object):
return print('DEBUG: reply to blog post not deleted ' + post_filename)
return False
# remove from recent posts cache in memory # remove from recent posts cache in memory
remove_post_from_cache(post_json_object, recent_posts_cache) remove_post_from_cache(post_json_object, recent_posts_cache)
@ -2294,10 +2300,12 @@ def delete_post(base_dir: str, http_prefix: str,
# finally, remove the post itself # finally, remove the post itself
try: try:
os.remove(post_filename) os.remove(post_filename)
return True
except OSError: except OSError:
if debug: if debug:
print('EX: delete_post unable to delete post ' + print('EX: delete_post unable to delete post ' +
str(post_filename)) str(post_filename))
return False
def _is_valid_language(text: str) -> bool: def _is_valid_language(text: str) -> bool: