From b61f4670492f7b3363a133bbb8efc363fca70cc5 Mon Sep 17 00:00:00 2001 From: rimu <3310831+rimu@users.noreply.github.com> Date: Fri, 14 Jun 2024 21:33:20 +0800 Subject: [PATCH] disable problematic federation code #201 --- INSTALL.md | 2 +- app/activitypub/routes.py | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/INSTALL.md b/INSTALL.md index 1f654bf0..6e70b130 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -323,7 +323,7 @@ CELERYD_LOG_LEVEL=INFO # Path to celery binary, that is in your virtual environment CELERY_BIN=/home/rimu/pyfedi/venv/bin/celery -CELERYD_OPTS="--autoscale=5,1" +CELERYD_OPTS="--autoscale=5,1 --max-tasks-per-child=1000" ``` #### Enable and start background services diff --git a/app/activitypub/routes.py b/app/activitypub/routes.py index 541f0aa4..b29a2410 100644 --- a/app/activitypub/routes.py +++ b/app/activitypub/routes.py @@ -757,8 +757,8 @@ def process_inbox_request(request_json, activitypublog_id, ip_address): # Lemmy can send Announce/Update without ever sending an Announce/Create # presumably happens with quick edits after creation (e.g. https://midwest.social/post/13348959) # Pretend this activity was the Create, and try again. - request_json['object']['type'] = 'Create' - process_inbox_request(request_json, activitypublog_id, ip_address) + #request_json['object']['type'] = 'Create' + #process_inbox_request(request_json, activitypublog_id, ip_address) elif request_json['object']['object']['type'] == 'Note': reply = PostReply.query.filter_by(ap_id=request_json['object']['object']['id']).first() if reply: @@ -772,8 +772,8 @@ def process_inbox_request(request_json, activitypublog_id, ip_address): else: activity_log.exception_message = 'PostReply not found' # As with Update/Page, pretend this activity was the Create, and try again. - request_json['object']['type'] = 'Create' - process_inbox_request(request_json, activitypublog_id, ip_address) + #request_json['object']['type'] = 'Create' + #process_inbox_request(request_json, activitypublog_id, ip_address) elif request_json['object']['type'] == 'Undo': if request_json['object']['object']['type'] == 'Like' or request_json['object']['object']['type'] == 'Dislike': activity_log.activity_type = request_json['object']['object']['type']