From e5fcc51a067dd420d37c68f9eabe0b7df2e048d5 Mon Sep 17 00:00:00 2001 From: lain Date: Sat, 24 Feb 2018 17:36:02 +0100 Subject: [PATCH] Remove unneccesary subscriptions on update. --- .../web/activity_pub/transmogrifier.ex | 11 +++++++ test/web/activity_pub/transmogrifier_test.exs | 30 +++++++++++++++++++ 2 files changed, 41 insertions(+) diff --git a/lib/pleroma/web/activity_pub/transmogrifier.ex b/lib/pleroma/web/activity_pub/transmogrifier.ex index b64b69565..2e5ca70fd 100644 --- a/lib/pleroma/web/activity_pub/transmogrifier.ex +++ b/lib/pleroma/web/activity_pub/transmogrifier.ex @@ -204,6 +204,8 @@ defp user_upgrade_task(user) do update: [set: [following: fragment("array_replace(?,?,?)", u.following, ^old_follower_address, ^user.follower_address)]] Repo.update_all(q, []) + maybe_retire_websub(user.ap_id) + # Only do this for recent activties, don't go through the whole db. since = (Repo.aggregate(Activity, :max, :id) || 0) - 100_000 q = from a in Activity, @@ -236,4 +238,13 @@ def upgrade_user_from_ap_id(ap_id, async \\ true) do e -> e end end + + def maybe_retire_websub(ap_id) do + # some sanity checks + if is_binary(ap_id) && (String.length(ap_id) > 8) do + q = from ws in Pleroma.Web.Websub.WebsubClientSubscription, + where: fragment("? like ?", ws.topic, ^"#{ap_id}%") + Repo.delete_all(q) + end + end end diff --git a/test/web/activity_pub/transmogrifier_test.exs b/test/web/activity_pub/transmogrifier_test.exs index 297d48f42..2e500d11d 100644 --- a/test/web/activity_pub/transmogrifier_test.exs +++ b/test/web/activity_pub/transmogrifier_test.exs @@ -4,6 +4,8 @@ defmodule Pleroma.Web.ActivityPub.TransmogrifierTest do alias Pleroma.Activity alias Pleroma.User alias Pleroma.Repo + alias Pleroma.Web.Websub.WebsubClientSubscription + alias Pleroma.Web.Websub.WebsubServerSubscription import Ecto.Query import Pleroma.Factory @@ -216,4 +218,32 @@ test "it upgrades a user to activitypub" do refute "..." in user_two.following end end + + describe "maybe_retire_websub" do + test "it deletes all websub client subscripitions with the user as topic" do + subscription = %WebsubClientSubscription{topic: "https://niu.moe/users/rye.atom"} + {:ok, ws} = Repo.insert(subscription) + + subscription = %WebsubClientSubscription{topic: "https://niu.moe/users/pasty.atom"} + {:ok, ws2} = Repo.insert(subscription) + + Transmogrifier.maybe_retire_websub("https://niu.moe/users/rye") + + refute Repo.get(WebsubClientSubscription, ws.id) + assert Repo.get(WebsubClientSubscription, ws2.id) + end + + test "it deletes all websub server subscriptions with the server as callback" do + subscription = %WebsubClientSubscription{topic: "https://niu.moe/users/rye.atom"} + {:ok, ws} = Repo.insert(subscription) + + subscription = %WebsubClientSubscription{topic: "https://niu.moe/users/pasty.atom"} + {:ok, ws2} = Repo.insert(subscription) + + Transmogrifier.maybe_retire_websub("https://niu.moe/users/rye") + + refute Repo.get(WebsubClientSubscription, ws.id) + assert Repo.get(WebsubClientSubscription, ws2.id) + end + end end