apf part 18: Undo / Delete requests

app/activitypub/routes.py

@@ -819,6 +819,28 @@ def process_inbox_request(request_json, store_ap_json):
                     log_incoming_ap(request_json['id'], APLOG_UNDO_FOLLOW, APLOG_FAILURE, request_json if store_ap_json else None, 'Unfound target')
                 return
 
+            if request_json['object']['type'] == 'Delete':                      # Restore something previously deleted
+                if isinstance(request_json['object']['object'], str):
+                    ap_id = request_json['object']['object']  # lemmy
+                else:
+                    ap_id = request_json['object']['object']['id']  # kbin
+                if user.ap_profile_id == ap_id.lower():
+                    # a user is undoing a self-delete
+                    # will never get here, because find_actor_or_create() in shared_inbox() will return None if user.deleted
+                    return
+
+                restorer = user
+                to_restore = find_liked_object(ap_id)                           # a user or a mod/admin is undoing the delete of a post or reply
+                if to_restore:
+                    if not to_restore.deleted:
+                        log_incoming_ap(request_json['id'], APLOG_UNDO_DELETE, APLOG_IGNORED, request_json if store_ap_json else None, 'Activity about local content which is already restored')
+                    else:
+                        restore_post_or_comment(restorer, to_restore, store_ap_json, request_json)
+                        announce_activity_to_followers(to_restore.community, user, request_json)
+                else:
+                    log_incoming_ap(request_json['id'], APLOG_UNDO_DELETE, APLOG_FAILURE, request_json if store_ap_json else None, 'Undo delete: cannot find ' + ap_id)
+                return
+
 
         # -- below this point is code that will be incrementally replaced to use log_incoming_ap() instead --
 

app/activitypub/util.py

@@ -1369,64 +1369,45 @@ def delete_post_or_comment(deletor, to_delete, store_ap_json, request_json):
         log_incoming_ap(request_json['id'], APLOG_DELETE, APLOG_FAILURE, request_json if store_ap_json else None, 'Deletor did not have permisson')
 
 
-def restore_post_or_comment(object_json, aplog_id):
+def restore_post_or_comment(restorer, to_restore, store_ap_json, request_json):
-    restorer = find_actor_or_create(object_json['actor']) if 'actor' in object_json else None
+    community = to_restore.community
-    to_restore = find_liked_object(object_json['object']) if 'object' in object_json else None
+    if to_restore.user_id == restorer.id or restorer.is_admin() or community.is_moderator(restorer) or community.is_instance_admin(restorer):
-    aplog = ActivityPubLog.query.get(aplog_id)
+        if isinstance(to_restore, Post):
+            to_restore.deleted = False
+            to_restore.deleted_by = None
+            community.post_count += 1
+            to_restore.author.post_count += 1
+            if to_restore.url:
+                new_cross_posts = Post.query.filter(Post.id != to_restore.id, Post.url == to_restore.url, Post.deleted == False,
+                                                                Post.posted_at > utcnow() - timedelta(days=6)).all()
+                for ncp in new_cross_posts:
+                    if ncp.cross_posts is None:
+                        ncp.cross_posts = [to_restore.id]
+                    else:
+                        ncp.cross_posts.append(to_restore.id)
+                    if to_restore.cross_posts is None:
+                        to_restore.cross_posts = [ncp.id]
+                    else:
+                        to_restore.cross_posts.append(ncp.id)
+            db.session.commit()
+            if to_restore.author.id != restorer.id:
+                add_to_modlog_activitypub('restore_post', restorer, community_id=community.id,
+                                          link_text=shorten_string(to_restore.title), link=f'post/{to_restore.id}')
 
-    if to_restore and not to_restore.deleted:
+        elif isinstance(to_restore, PostReply):
-        if aplog:
+            to_restore.deleted = False
-            aplog.result = 'ignored'
+            to_restore.deleted_by = None
-            aplog.exception_message = 'Activity about local content which is already restored'
+            if not to_restore.author.bot:
-        return
+                to_restore.post.reply_count += 1
-
+            to_restore.author.post_reply_count += 1
-    if restorer and to_restore:
+            db.session.commit()
-        community = to_restore.community
+            if to_restore.author.id != restorer.id:
-        if to_restore.author.id == restorer.id or restorer.is_admin() or community.is_moderator(restorer) or community.is_instance_admin(restorer):
+                add_to_modlog_activitypub('restore_post_reply', restorer, community_id=community.id,
-            if isinstance(to_restore, Post):
+                                          link_text=f'comment on {shorten_string(to_restore.post.title)}',
-                to_restore.deleted = False
+                                          link=f'post/{to_restore.post_id}#comment_{to_restore.id}')
-                to_restore.deleted_by = None
+        log_incoming_ap(request_json['id'], APLOG_UNDO_DELETE, APLOG_SUCCESS, request_json if store_ap_json else None)
-                community.post_count += 1
-                to_restore.author.post_count += 1
-                if to_restore.url:
-                    new_cross_posts = Post.query.filter(Post.id != to_restore.id, Post.url == to_restore.url, Post.deleted == False,
-                                                                    Post.posted_at > utcnow() - timedelta(days=6)).all()
-                    for ncp in new_cross_posts:
-                        if ncp.cross_posts is None:
-                            ncp.cross_posts = [to_restore.id]
-                        else:
-                            ncp.cross_posts.append(to_restore.id)
-                        if to_restore.cross_posts is None:
-                            to_restore.cross_posts = [ncp.id]
-                        else:
-                            to_restore.cross_posts.append(ncp.id)
-                db.session.commit()
-                if to_restore.author.id != restorer.id:
-                    add_to_modlog_activitypub('restore_post', restorer, community_id=community.id,
-                                              link_text=shorten_string(to_restore.title), link=f'post/{to_restore.id}')
-
-            elif isinstance(to_restore, PostReply):
-                to_restore.deleted = False
-                to_restore.deleted_by = None
-                if not to_restore.author.bot:
-                    to_restore.post.reply_count += 1
-                to_restore.author.post_reply_count += 1
-                db.session.commit()
-                if to_restore.author.id != restorer.id:
-                    add_to_modlog_activitypub('restore_post_reply', restorer, community_id=community.id,
-                                              link_text=f'comment on {shorten_string(to_restore.post.title)}',
-                                              link=f'post/{to_restore.post_id}#comment_{to_restore.id}')
-
-            if aplog:
-                aplog.result = 'success'
-        else:
-           if aplog:
-                aplog.result = 'failure'
-                aplog.exception_message = 'Restorer did not have permission'
     else:
-       if aplog:
+        log_incoming_ap(request_json['id'], APLOG_UNDO_DELETE, APLOG_FAILURE, request_json if store_ap_json else None, 'Restorer did not have permisson')
-            aplog.result = 'failure'
-            aplog.exception_message = 'Unable to resolve restorer or target'
 
 
 def site_ban_remove_data(blocker_id, blocked):