Remove a couple of old uncalled functions

app/activitypub/routes.py

@@ -23,7 +23,7 @@ from app.activitypub.util import public_key, users_total, active_half_year, acti
     lemmy_site_data, is_activitypub_request, delete_post_or_comment, community_members, \
     user_removed_from_remote_server, create_post, create_post_reply, update_post_reply_from_activity, \
     update_post_from_activity, undo_vote, undo_downvote, post_to_page, get_redis_connection, find_reported_object, \
-    process_report, ensure_domains_match, can_edit, can_delete, remove_data_from_banned_user, resolve_remote_post, \
+    process_report, ensure_domains_match, can_edit, can_delete, resolve_remote_post, \
     inform_followers_of_post_update, comment_model_to_json, restore_post_or_comment, ban_user, unban_user, \
     log_incoming_ap, find_community, site_ban_remove_data, community_ban_remove_data, verify_object_from_source
 from app.utils import gibberish, get_setting, render_template, \
@@ -1302,48 +1302,6 @@ def community_moderators_route(actor):
         return jsonify(community_data)
 
 
-@celery.task
-def process_user_follow_request(request_json, activitypublog_id, remote_user_id):
-    activity_log = ActivityPubLog.query.get(activitypublog_id)
-    local_user_ap_id = request_json['object']
-    follow_id = request_json['id']
-    local_user = find_actor_or_create(local_user_ap_id, create_if_not_found=False)
-    remote_user = User.query.get(remote_user_id)
-    if local_user and local_user.is_local() and not remote_user.is_local():
-        existing_follower = UserFollower.query.filter_by(local_user_id=local_user.id, remote_user_id=remote_user.id).first()
-        if not existing_follower:
-            auto_accept = not local_user.ap_manually_approves_followers
-            new_follower = UserFollower(local_user_id=local_user.id, remote_user_id=remote_user.id, is_accepted=auto_accept)
-            if not local_user.ap_followers_url:
-                local_user.ap_followers_url = local_user.public_url() + '/followers'
-            db.session.add(new_follower)
-        accept = {
-            "@context": default_context(),
-            "actor": local_user.public_url(),
-            "to": [
-                remote_user.public_url()
-            ],
-            "object": {
-                "actor": remote_user.public_url(),
-                "to": None,
-                "object": local_user.public_url(),
-                "type": "Follow",
-                "id": follow_id
-            },
-            "type": "Accept",
-            "id": f"https://{current_app.config['SERVER_NAME']}/activities/accept/" + gibberish(32)
-        }
-        if post_request(remote_user.ap_inbox_url, accept, local_user.private_key, f"{local_user.public_url()}#main-key") is True:
-            activity_log.result = 'success'
-        else:
-            activity_log.exception_message = 'Error sending Accept'
-    else:
-        activity_log.exception_message = 'Could not find local user'
-        activity_log.result = 'failure'
-
-    db.session.commit()
-
-
 @bp.route('/c/<actor>/followers', methods=['GET'])
 def community_followers(actor):
     actor = actor.strip()

app/activitypub/util.py

@@ -1434,53 +1434,6 @@ def site_ban_remove_data(blocker_id, blocked):
     db.session.commit()
 
 
-def remove_data_from_banned_user(deletor_ap_id, user_ap_id, target):
-    if current_app.debug:
-        remove_data_from_banned_user_task(deletor_ap_id, user_ap_id, target)
-    else:
-        remove_data_from_banned_user_task.delay(deletor_ap_id, user_ap_id, target)
-
-
-@celery.task
-def remove_data_from_banned_user_task(deletor_ap_id, user_ap_id, target):
-    deletor = find_actor_or_create(deletor_ap_id, create_if_not_found=False)
-    user = find_actor_or_create(user_ap_id, create_if_not_found=False)
-    community = Community.query.filter_by(ap_profile_id=target).first()
-
-    if not deletor or not user:
-        return
-
-    # site bans by admins
-    if deletor.instance.user_is_admin(deletor.id) and target == f"https://{deletor.instance.domain}/" and deletor.instance_id == user.instance_id:
-        post_replies = PostReply.query.filter_by(user_id=user.id)
-        posts = Post.query.filter_by(user_id=user.id)
-
-    # community bans by mods or admins
-    elif community and (community.is_moderator(deletor) or community.is_instance_admin(deletor)):
-        post_replies = PostReply.query.filter_by(user_id=user.id, community_id=community.id, deleted=False)
-        posts = Post.query.filter_by(user_id=user.id, community_id=community.id, deleted=False)
-    else:
-        return
-
-    for post_reply in post_replies:
-        if not user.bot:
-            post_reply.post.reply_count -= 1
-        post_reply.deleted = True
-        post_reply.deleted_by = deletor.id
-    db.session.commit()
-
-    for post in posts:
-        if post.cross_posts:
-            old_cross_posts = Post.query.filter(Post.id.in_(post.cross_posts)).all()
-            for ocp in old_cross_posts:
-                if ocp.cross_posts is not None:
-                    ocp.cross_posts.remove(post.id)
-        post.delete_dependencies()
-        post.deleted = True
-        post.community.post_count -= 1
-    db.session.commit()
-
-
 def community_ban_remove_data(blocker_id, community_id, blocked):
     replies = PostReply.query.filter_by(user_id=blocked.id, deleted=False, community_id=community_id)
     for reply in replies: