mirror of https://gitlab.com/bashrc2/epicyon
Merge branch 'main' of gitlab.com:bashrc2/epicyon
Bob Mottram
commit
fb38442ed3
339
daemon.py
339
daemon.py
|
|
@ -114,6 +114,7 @@ from inbox import run_inbox_queue
|
|||
from inbox import run_inbox_queue_watchdog
|
||||
from inbox import save_post_to_inbox_queue
|
||||
from inbox import populate_replies
|
||||
from inbox import receive_edit_to_post
|
||||
from follow import follower_approval_active
|
||||
from follow import is_following_actor
|
||||
from follow import get_following_feed
|
||||
|
|
@ -439,6 +440,93 @@ SHARES_PER_PAGE = 12
|
|||
class PubServer(BaseHTTPRequestHandler):
|
||||
protocol_version = 'HTTP/1.1'
|
||||
|
||||
def _update_edited_post(self, base_dir: str,
|
||||
nickname: str, domain: str,
|
||||
message_json: {},
|
||||
edited_published: str,
|
||||
edited_postid: str,
|
||||
recent_posts_cache: {},
|
||||
box_name: str,
|
||||
max_mentions: int, max_emoji: int,
|
||||
allow_local_network_access: bool,
|
||||
debug: bool,
|
||||
system_language: str, http_prefix: str,
|
||||
domain_full: str, person_cache: {},
|
||||
signing_priv_key_pem: str,
|
||||
max_recent_posts: int, translate: {},
|
||||
session, cached_webfingers: {}, port: int,
|
||||
allow_deletion: bool,
|
||||
yt_replace_domain: str,
|
||||
twitter_replacement_domain: str,
|
||||
show_published_date_only: bool,
|
||||
peertube_instances: [],
|
||||
theme_name: str, max_like_count: int,
|
||||
cw_lists: {}, dogwhistles: {},
|
||||
min_images_for_accounts: []) -> None:
|
||||
"""When an edited post is created this assigns
|
||||
a published and updated date to it, and uses
|
||||
the previous id
|
||||
"""
|
||||
edited_updated = \
|
||||
message_json['object']['published']
|
||||
if edited_published:
|
||||
message_json['published'] = \
|
||||
edited_published
|
||||
message_json['object']['published'] = \
|
||||
edited_published
|
||||
message_json['id'] = \
|
||||
edited_postid + '/activity'
|
||||
message_json['object']['id'] = \
|
||||
edited_postid
|
||||
message_json['object']['url'] = \
|
||||
edited_postid
|
||||
message_json['updated'] = \
|
||||
edited_updated
|
||||
message_json['object']['updated'] = \
|
||||
edited_updated
|
||||
message_json['type'] = 'Update'
|
||||
|
||||
message_json2 = message_json.copy()
|
||||
receive_edit_to_post(recent_posts_cache,
|
||||
message_json2,
|
||||
base_dir,
|
||||
nickname, domain,
|
||||
max_mentions, max_emoji,
|
||||
allow_local_network_access,
|
||||
debug,
|
||||
system_language, http_prefix,
|
||||
domain_full, person_cache,
|
||||
signing_priv_key_pem,
|
||||
max_recent_posts,
|
||||
translate,
|
||||
session,
|
||||
cached_webfingers,
|
||||
port,
|
||||
allow_deletion,
|
||||
yt_replace_domain,
|
||||
twitter_replacement_domain,
|
||||
show_published_date_only,
|
||||
peertube_instances,
|
||||
theme_name, max_like_count,
|
||||
cw_lists, dogwhistles,
|
||||
min_images_for_accounts)
|
||||
|
||||
# update the index
|
||||
id_str = edited_postid.split('/')[-1]
|
||||
index_filename = \
|
||||
acct_dir(base_dir, nickname, domain) + '/' + box_name + '.index'
|
||||
if not text_in_file(id_str, index_filename):
|
||||
try:
|
||||
with open(index_filename, 'r+',
|
||||
encoding='utf-8') as fp_index:
|
||||
content = fp_index.read()
|
||||
if id_str + '\n' not in content:
|
||||
fp_index.seek(0, 0)
|
||||
fp_index.write(id_str + '\n' + content)
|
||||
except OSError as ex:
|
||||
print('WARN: Failed to write index after edit ' +
|
||||
index_filename + ' ' + str(ex))
|
||||
|
||||
def _convert_domains(self, calling_domain, referer_domain,
|
||||
msg_str: str) -> str:
|
||||
"""Convert domains to onion or i2p, depending upon who is asking
|
||||
|
|
@ -19448,24 +19536,50 @@ class PubServer(BaseHTTPRequestHandler):
|
|||
self.server.translate)
|
||||
if message_json:
|
||||
if edited_postid:
|
||||
edited_updated = \
|
||||
message_json['object']['published']
|
||||
if edited_published:
|
||||
message_json['published'] = \
|
||||
edited_published
|
||||
message_json['object']['published'] = \
|
||||
edited_published
|
||||
message_json['id'] = \
|
||||
edited_postid + '/activity'
|
||||
message_json['object']['id'] = \
|
||||
edited_postid
|
||||
message_json['object']['url'] = \
|
||||
edited_postid
|
||||
message_json['updated'] = \
|
||||
edited_updated
|
||||
message_json['object']['updated'] = \
|
||||
edited_updated
|
||||
message_json['type'] = 'Update'
|
||||
recent_posts_cache = self.server.recent_posts_cache
|
||||
allow_local_network_access = \
|
||||
self.server.allow_local_network_access
|
||||
signing_priv_key_pem = \
|
||||
self.server.signing_priv_key_pem
|
||||
twitter_replacement_domain = \
|
||||
self.server.twitter_replacement_domain
|
||||
show_published_date_only = \
|
||||
self.server.show_published_date_only
|
||||
min_images_for_accounts = \
|
||||
self.server.min_images_for_accounts
|
||||
peertube_instances = \
|
||||
self.server.peertube_instances
|
||||
self._update_edited_post(self.server.base_dir,
|
||||
nickname, self.server.domain,
|
||||
message_json,
|
||||
edited_published,
|
||||
edited_postid,
|
||||
recent_posts_cache,
|
||||
'outbox',
|
||||
self.server.max_mentions,
|
||||
self.server.max_emoji,
|
||||
allow_local_network_access,
|
||||
self.server.debug,
|
||||
self.server.system_language,
|
||||
self.server.http_prefix,
|
||||
self.server.domain_full,
|
||||
self.server.person_cache,
|
||||
signing_priv_key_pem,
|
||||
self.server.max_recent_posts,
|
||||
self.server.translate,
|
||||
curr_session,
|
||||
self.server.cached_webfingers,
|
||||
self.server.port,
|
||||
self.server.allow_deletion,
|
||||
self.server.yt_replace_domain,
|
||||
twitter_replacement_domain,
|
||||
show_published_date_only,
|
||||
peertube_instances,
|
||||
self.server.theme_name,
|
||||
self.server.max_like_count,
|
||||
self.server.cw_lists,
|
||||
self.server.dogwhistles,
|
||||
min_images_for_accounts)
|
||||
print('DEBUG: sending edited public post ' +
|
||||
str(message_json))
|
||||
if fields['schedulePost']:
|
||||
|
|
@ -19725,24 +19839,50 @@ class PubServer(BaseHTTPRequestHandler):
|
|||
self.server.translate)
|
||||
if message_json:
|
||||
if edited_postid:
|
||||
edited_updated = \
|
||||
message_json['object']['published']
|
||||
if edited_published:
|
||||
message_json['published'] = \
|
||||
edited_published
|
||||
message_json['object']['published'] = \
|
||||
edited_published
|
||||
message_json['id'] = \
|
||||
edited_postid + '/activity'
|
||||
message_json['object']['id'] = \
|
||||
edited_postid
|
||||
message_json['object']['url'] = \
|
||||
edited_postid
|
||||
message_json['updated'] = \
|
||||
edited_updated
|
||||
message_json['object']['updated'] = \
|
||||
edited_updated
|
||||
message_json['type'] = 'Update'
|
||||
recent_posts_cache = self.server.recent_posts_cache
|
||||
allow_local_network_access = \
|
||||
self.server.allow_local_network_access
|
||||
signing_priv_key_pem = \
|
||||
self.server.signing_priv_key_pem
|
||||
twitter_replacement_domain = \
|
||||
self.server.twitter_replacement_domain
|
||||
show_published_date_only = \
|
||||
self.server.show_published_date_only
|
||||
min_images_for_accounts = \
|
||||
self.server.min_images_for_accounts
|
||||
peertube_instances = \
|
||||
self.server.peertube_instances
|
||||
self._update_edited_post(self.server.base_dir,
|
||||
nickname, self.server.domain,
|
||||
message_json,
|
||||
edited_published,
|
||||
edited_postid,
|
||||
recent_posts_cache,
|
||||
'outbox',
|
||||
self.server.max_mentions,
|
||||
self.server.max_emoji,
|
||||
allow_local_network_access,
|
||||
self.server.debug,
|
||||
self.server.system_language,
|
||||
self.server.http_prefix,
|
||||
self.server.domain_full,
|
||||
self.server.person_cache,
|
||||
signing_priv_key_pem,
|
||||
self.server.max_recent_posts,
|
||||
self.server.translate,
|
||||
curr_session,
|
||||
self.server.cached_webfingers,
|
||||
self.server.port,
|
||||
self.server.allow_deletion,
|
||||
self.server.yt_replace_domain,
|
||||
twitter_replacement_domain,
|
||||
show_published_date_only,
|
||||
peertube_instances,
|
||||
self.server.theme_name,
|
||||
self.server.max_like_count,
|
||||
self.server.cw_lists,
|
||||
self.server.dogwhistles,
|
||||
min_images_for_accounts)
|
||||
print('DEBUG: sending edited unlisted post ' +
|
||||
str(message_json))
|
||||
|
||||
|
|
@ -19808,24 +19948,50 @@ class PubServer(BaseHTTPRequestHandler):
|
|||
self.server.translate)
|
||||
if message_json:
|
||||
if edited_postid:
|
||||
edited_updated = \
|
||||
message_json['object']['published']
|
||||
if edited_published:
|
||||
message_json['published'] = \
|
||||
edited_published
|
||||
message_json['object']['published'] = \
|
||||
edited_published
|
||||
message_json['id'] = \
|
||||
edited_postid + '/activity'
|
||||
message_json['object']['id'] = \
|
||||
edited_postid
|
||||
message_json['object']['url'] = \
|
||||
edited_postid
|
||||
message_json['updated'] = \
|
||||
edited_updated
|
||||
message_json['object']['updated'] = \
|
||||
edited_updated
|
||||
message_json['type'] = 'Update'
|
||||
recent_posts_cache = self.server.recent_posts_cache
|
||||
allow_local_network_access = \
|
||||
self.server.allow_local_network_access
|
||||
signing_priv_key_pem = \
|
||||
self.server.signing_priv_key_pem
|
||||
twitter_replacement_domain = \
|
||||
self.server.twitter_replacement_domain
|
||||
show_published_date_only = \
|
||||
self.server.show_published_date_only
|
||||
min_images_for_accounts = \
|
||||
self.server.min_images_for_accounts
|
||||
peertube_instances = \
|
||||
self.server.peertube_instances
|
||||
self._update_edited_post(self.server.base_dir,
|
||||
nickname, self.server.domain,
|
||||
message_json,
|
||||
edited_published,
|
||||
edited_postid,
|
||||
recent_posts_cache,
|
||||
'outbox',
|
||||
self.server.max_mentions,
|
||||
self.server.max_emoji,
|
||||
allow_local_network_access,
|
||||
self.server.debug,
|
||||
self.server.system_language,
|
||||
self.server.http_prefix,
|
||||
self.server.domain_full,
|
||||
self.server.person_cache,
|
||||
signing_priv_key_pem,
|
||||
self.server.max_recent_posts,
|
||||
self.server.translate,
|
||||
curr_session,
|
||||
self.server.cached_webfingers,
|
||||
self.server.port,
|
||||
self.server.allow_deletion,
|
||||
self.server.yt_replace_domain,
|
||||
twitter_replacement_domain,
|
||||
show_published_date_only,
|
||||
peertube_instances,
|
||||
self.server.theme_name,
|
||||
self.server.max_like_count,
|
||||
self.server.cw_lists,
|
||||
self.server.dogwhistles,
|
||||
min_images_for_accounts)
|
||||
print('DEBUG: sending edited followers post ' +
|
||||
str(message_json))
|
||||
|
||||
|
|
@ -19905,24 +20071,50 @@ class PubServer(BaseHTTPRequestHandler):
|
|||
print('DEBUG: posting DM edited_postid ' +
|
||||
str(edited_postid))
|
||||
if edited_postid:
|
||||
edited_updated = \
|
||||
message_json['object']['published']
|
||||
if edited_published:
|
||||
message_json['published'] = \
|
||||
edited_published
|
||||
message_json['object']['published'] = \
|
||||
edited_published
|
||||
message_json['id'] = \
|
||||
edited_postid + '/activity'
|
||||
message_json['object']['id'] = \
|
||||
edited_postid
|
||||
message_json['object']['url'] = \
|
||||
edited_postid
|
||||
message_json['updated'] = \
|
||||
edited_updated
|
||||
message_json['object']['updated'] = \
|
||||
edited_updated
|
||||
message_json['type'] = 'Update'
|
||||
recent_posts_cache = self.server.recent_posts_cache
|
||||
allow_local_network_access = \
|
||||
self.server.allow_local_network_access
|
||||
signing_priv_key_pem = \
|
||||
self.server.signing_priv_key_pem
|
||||
twitter_replacement_domain = \
|
||||
self.server.twitter_replacement_domain
|
||||
show_published_date_only = \
|
||||
self.server.show_published_date_only
|
||||
min_images_for_accounts = \
|
||||
self.server.min_images_for_accounts
|
||||
peertube_instances = \
|
||||
self.server.peertube_instances
|
||||
self._update_edited_post(self.server.base_dir,
|
||||
nickname, self.server.domain,
|
||||
message_json,
|
||||
edited_published,
|
||||
edited_postid,
|
||||
recent_posts_cache,
|
||||
'outbox',
|
||||
self.server.max_mentions,
|
||||
self.server.max_emoji,
|
||||
allow_local_network_access,
|
||||
self.server.debug,
|
||||
self.server.system_language,
|
||||
self.server.http_prefix,
|
||||
self.server.domain_full,
|
||||
self.server.person_cache,
|
||||
signing_priv_key_pem,
|
||||
self.server.max_recent_posts,
|
||||
self.server.translate,
|
||||
curr_session,
|
||||
self.server.cached_webfingers,
|
||||
self.server.port,
|
||||
self.server.allow_deletion,
|
||||
self.server.yt_replace_domain,
|
||||
twitter_replacement_domain,
|
||||
show_published_date_only,
|
||||
peertube_instances,
|
||||
self.server.theme_name,
|
||||
self.server.max_like_count,
|
||||
self.server.cw_lists,
|
||||
self.server.dogwhistles,
|
||||
min_images_for_accounts)
|
||||
print('DEBUG: sending edited dm post ' +
|
||||
str(message_json))
|
||||
|
||||
|
|
@ -22012,6 +22204,9 @@ def run_daemon(map_format: str,
|
|||
|
||||
create_initial_last_seen(base_dir, http_prefix)
|
||||
|
||||
httpd.max_mentions = max_mentions
|
||||
httpd.max_emoji = max_emoji
|
||||
|
||||
print('THREAD: Creating inbox queue')
|
||||
httpd.thrInboxQueue = \
|
||||
thread_with_trace(target=run_inbox_queue,
|
||||
|
|
|
|||
6
inbox.py
6
inbox.py
|
|
@ -1137,7 +1137,7 @@ def _receive_update_to_question(recent_posts_cache: {}, message_json: {},
|
|||
remove_post_from_cache(message_json, recent_posts_cache)
|
||||
|
||||
|
||||
def _receive_edit_to_post(recent_posts_cache: {}, message_json: {},
|
||||
def receive_edit_to_post(recent_posts_cache: {}, message_json: {},
|
||||
base_dir: str,
|
||||
nickname: str, domain: str,
|
||||
max_mentions: int, max_emoji: int,
|
||||
|
|
@ -1205,7 +1205,7 @@ def _receive_edit_to_post(recent_posts_cache: {}, message_json: {},
|
|||
# has the content changed?
|
||||
if post_json_object['object']['content'] == \
|
||||
message_json['object']['content']:
|
||||
# same content
|
||||
# same content. Has the summary changed?
|
||||
if 'summary' in post_json_object['object'] and \
|
||||
'summary' in message_json['object']:
|
||||
if post_json_object['object']['summary'] == \
|
||||
|
|
@ -1329,7 +1329,7 @@ def _receive_update_activity(recent_posts_cache: {}, session, base_dir: str,
|
|||
elif message_json['object']['type'] == 'Note':
|
||||
if message_json['object'].get('id'):
|
||||
domain_full = get_full_domain(domain, port)
|
||||
if _receive_edit_to_post(recent_posts_cache, message_json,
|
||||
if receive_edit_to_post(recent_posts_cache, message_json,
|
||||
base_dir, nickname, domain,
|
||||
max_mentions, max_emoji,
|
||||
allow_local_network_access,
|
||||
|
|
|
|||
11
outbox.py
11
outbox.py
|
|
@ -414,7 +414,13 @@ def post_message_to_outbox(session, translate: {},
|
|||
post_id = None
|
||||
if debug:
|
||||
print('DEBUG: save_post_to_box')
|
||||
if message_json['type'] != 'Upgrade':
|
||||
|
||||
is_edited_post = False
|
||||
if message_json['type'] == 'Update' and \
|
||||
message_json['object']['type'] == 'Note':
|
||||
is_edited_post = True
|
||||
message_json['type'] = 'Create'
|
||||
|
||||
outbox_name = 'outbox'
|
||||
|
||||
store_hash_tags(base_dir, post_to_nickname, domain,
|
||||
|
|
@ -557,6 +563,9 @@ def post_message_to_outbox(session, translate: {},
|
|||
bold_reading, dogwhistles,
|
||||
minimize_all_images)
|
||||
|
||||
if is_edited_post:
|
||||
message_json['type'] = 'Update'
|
||||
|
||||
if outbox_announce(recent_posts_cache,
|
||||
base_dir, message_json, debug):
|
||||
if debug:
|
||||
|
|
|
|||
Loading…
Reference in New Issue