diff --git a/inbox.py b/inbox.py index cad9ebd37..e832b4641 100644 --- a/inbox.py +++ b/inbox.py @@ -637,21 +637,22 @@ def save_post_to_inbox_queue(base_dir: str, http_prefix: str, reply_nickname + '@' + reply_domain) return None - if post_json_object['object'].get('content'): - content_str = \ - get_base_content_from_post(post_json_object, system_language) - if content_str: - summary_str = \ - get_summary_from_post(post_json_object, - system_language, []) - media_descriptions = \ - get_media_descriptions_from_post(post_json_object) - content_all = \ - summary_str + ' ' + content_str + ' ' + media_descriptions - if is_filtered(base_dir, nickname, domain, content_all): - if debug: - print('WARN: post was filtered out due to content') - return None + # filter on the content of the post + content_str = \ + get_base_content_from_post(post_json_object, system_language) + if content_str: + summary_str = \ + get_summary_from_post(post_json_object, + system_language, []) + media_descriptions = \ + get_media_descriptions_from_post(post_json_object) + content_all = \ + summary_str + ' ' + content_str + ' ' + media_descriptions + if is_filtered(base_dir, nickname, domain, content_all): + if debug: + print('WARN: post was filtered out due to content') + return None + original_post_id = None if post_json_object.get('id'): if not isinstance(post_json_object['id'], str): diff --git a/utils.py b/utils.py index b56ef86b6..2da0d2e30 100644 --- a/utils.py +++ b/utils.py @@ -792,7 +792,6 @@ def load_json_onionify(filename: str, domain: str, onion_domain: str, if data: data = data.replace(domain, onion_domain) data = data.replace('https:', 'http:') - print('*****data: ' + data) json_object = json.loads(data) break except BaseException: diff --git a/webapp_utils.py b/webapp_utils.py index 133c39598..a0b45c2a7 100644 --- a/webapp_utils.py +++ b/webapp_utils.py @@ -1125,7 +1125,7 @@ def _is_nsfw(content: str) -> bool: content_lower = content.lower() nsfw_tags = ( 'nsfw', 'porn', 'pr0n', 'explicit', 'lewd', - 'nude', 'boob', 'erotic' + 'nude', 'boob', 'erotic', 'sex' ) for tag_name in nsfw_tags: if tag_name in content_lower: diff --git a/webfinger.py b/webfinger.py index 69fad9636..4f97ff4bb 100644 --- a/webfinger.py +++ b/webfinger.py @@ -501,6 +501,7 @@ def webfinger_update(base_dir: str, nickname: str, domain: str, filename = base_dir + wf_subdir + '/' + handle + '.json' onionify = False + i2pify = False if onion_domain: if onion_domain in handle: handle = handle.replace(onion_domain, domain)