From b6e55dd647adf6dd49c4b77a838c36cabd51cc82 Mon Sep 17 00:00:00 2001 From: Thomas Sileo Date: Thu, 5 Sep 2019 23:16:11 +0200 Subject: [PATCH] Finish reply processing --- blueprints/tasks.py | 5 ++++- core/activitypub.py | 5 +---- core/meta.py | 1 - 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/blueprints/tasks.py b/blueprints/tasks.py index d6c463b..ce38180 100644 --- a/blueprints/tasks.py +++ b/blueprints/tasks.py @@ -597,7 +597,10 @@ def task_process_reply() -> _Response: else: reply_actor = new_replies[new_reply_idx + 1].get_actor() is_in_reply_to_self = actor.id == reply_actor.id - reply_flags = {MetaKey.IN_REPLY_TO_SELF.value: is_in_reply_to_self} + reply_flags = { + MetaKey.IN_REPLY_TO_SELF.value: is_in_reply_to_self, + MetaKey.IN_REPLY_TO.value: new_reply.get_in_reply_to(), + } if not is_in_reply_to_self: reply_flags[MetaKey.IN_REPLY_TO_ACTOR.value] = reply_actor.to_dict( embed=True diff --git a/core/activitypub.py b/core/activitypub.py index 8bc64ec..30d48cb 100644 --- a/core/activitypub.py +++ b/core/activitypub.py @@ -763,10 +763,7 @@ def handle_replies(create: ap.Create) -> None: ) return None - in_reply_to_data = { - MetaKey.IN_REPLY_TO: in_reply_to, - MetaKey.IN_REPLY_TO_URL: reply.get_url(), - } + in_reply_to_data = {MetaKey.IN_REPLY_TO: in_reply_to} # Update the activity to save some data about the reply if reply.get_actor().id == create.get_actor().id: in_reply_to_data.update({MetaKey.IN_REPLY_TO_SELF: True}) diff --git a/core/meta.py b/core/meta.py index bc2f5e7..4f6a9b5 100644 --- a/core/meta.py +++ b/core/meta.py @@ -55,7 +55,6 @@ class MetaKey(Enum): THREAD_ROOT_PARENT = "thread_root_parent" IN_REPLY_TO = "in_reply_to" - IN_REPLY_TO_URL = "in_reply_to_url" IN_REPLY_TO_SELF = "in_reply_to_self" IN_REPLY_TO_ACTOR = "in_reply_to_actor"