summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorHaelwenn (lanodan) Monnier <contact@hacktivis.me>2022-12-23 17:06:09 +0100
committerHaelwenn (lanodan) Monnier <contact@hacktivis.me>2022-12-23 17:06:09 +0100
commit3fbd42061cf791bb5e33fb08701429ea63378e56 (patch)
tree29e7b907315f7129371292da702335bc579044ee /lib
parent7d68d64d633a8ba43965a6f93d22cb0ae76027e0 (diff)
downloadpleroma-3fbd42061cf791bb5e33fb08701429ea63378e56.tar.gz
pleroma-3fbd42061cf791bb5e33fb08701429ea63378e56.zip
Revert "Delete report notifs when demoting from superuser"
This reverts commit 4504c810802e2253599f06ddf6d58d3389fb23ac.
Diffstat (limited to 'lib')
-rw-r--r--lib/pleroma/notification.ex8
-rw-r--r--lib/pleroma/user.ex16
2 files changed, 1 insertions, 23 deletions
diff --git a/lib/pleroma/notification.ex b/lib/pleroma/notification.ex
index d661d6ab2..aba6096bc 100644
--- a/lib/pleroma/notification.ex
+++ b/lib/pleroma/notification.ex
@@ -338,14 +338,6 @@ defmodule Pleroma.Notification do
|> Repo.delete_all()
end
- def destroy_multiple_from_types(%{id: user_id}, types) do
- from(n in Notification,
- where: n.user_id == ^user_id,
- where: n.type in ^types
- )
- |> Repo.delete_all()
- end
-
def dismiss(%Pleroma.Activity{} = activity) do
Notification
|> where([n], n.activity_id == ^activity.id)
diff --git a/lib/pleroma/user.ex b/lib/pleroma/user.ex
index f32907f01..f6e30555c 100644
--- a/lib/pleroma/user.ex
+++ b/lib/pleroma/user.ex
@@ -1202,24 +1202,10 @@ defmodule Pleroma.User do
|> update_and_set_cache()
end
- def update_and_set_cache(%{data: %Pleroma.User{} = user} = changeset) do
- was_superuser_before_update = User.superuser?(user)
-
+ def update_and_set_cache(changeset) do
with {:ok, user} <- Repo.update(changeset, stale_error_field: :id) do
set_cache(user)
end
- |> maybe_remove_report_notifications(was_superuser_before_update)
- end
-
- defp maybe_remove_report_notifications({:ok, %Pleroma.User{} = user} = result, true) do
- if not User.superuser?(user),
- do: user |> Notification.destroy_multiple_from_types(["pleroma:report"])
-
- result
- end
-
- defp maybe_remove_report_notifications(result, _) do
- result
end
def get_user_friends_ap_ids(user) do