jonny/microblog.pub
1
0
Fork 0
forked from forks/microblog.pub
Code Pull requests Activity

Bugfixes

Browse source
This commit is contained in:
Thomas Sileo 2018-06-18 23:34:07 +02:00
parent ef7a887146
commit c383259296
1 changed files with 23 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
activitypub.py
View file

@ -241,8 +241,16 @@ class MicroblogPubBackend(Backend):
) )
obj = delete.get_object() obj = delete.get_object()
if obj.ACTIVITY_TYPE != ap.ActivityType.NOTE: if obj.ACTIVITY_TYPE != ap.ActivityType.NOTE:
obj = self.fetch_iri(delete.get_object().id) obj = DB.inbox.find_one(
self._handle_replies_delete(as_actor, obj) {
"activity.object.id": delete.get_object().id,
"type": ap.ActivityType.CREATE.value,
}
)
logger.info(f"inbox_delete handle_replies obj={obj!r}")
if obj:
self._handle_replies_delete(as_actor, obj)
# FIXME(tsileo): handle threads # FIXME(tsileo): handle threads
# obj = delete._get_actual_object() # obj = delete._get_actual_object()
@ -257,6 +265,18 @@ class MicroblogPubBackend(Backend):
{"activity.object.id": delete.get_object().id}, {"activity.object.id": delete.get_object().id},
{"$set": {"meta.deleted": True}}, {"$set": {"meta.deleted": True}},
) )
obj = delete.get_object()
if delete.get_object().ACTIVITY_TYPE != ap.ActivityType.NOTE:
obj = ap.parse_activity(
DB.outbox.find_one(
{
"activity.object.id": delete.get_object().id,
"type": ap.ActivityType.CREATE.value,
}
)
).get_object()
self._handle_replies_delete(as_actor, obj)
@ensure_it_is_me @ensure_it_is_me
def inbox_update(self, as_actor: ap.Person, update: ap.Update) -> None: def inbox_update(self, as_actor: ap.Person, update: ap.Update) -> None:
@ -305,7 +325,7 @@ class MicroblogPubBackend(Backend):
self._handle_replies(as_actor, create) self._handle_replies(as_actor, create)
@ensure_it_is_me @ensure_it_is_me
def _handle_replies_delete(self, as_actor: ap.Person, note: ap.Create) -> None: def _handle_replies_delete(self, as_actor: ap.Person, note: ap.Note) -> None:
in_reply_to = note.inReplyTo in_reply_to = note.inReplyTo
if not in_reply_to: if not in_reply_to:
pass pass