pleroma

commit: 8127e0d8cce9fa8fb62f6699fdee1bed466a6fb6
parent 4601473aaf65cfc5696e17069014a92750f1560d
Author: Mark Felder <feld@feld.me>
Date:   Mon, 22 Jul 2024 18:23:13 -0400

Fix order of args for thread_muted?/2

Diffstat:
M
lib/pleroma/notification.ex
2
+-
M
lib/pleroma/web/common_api.ex
4
++--
M
lib/pleroma/web/mastodon_api/views/status_view.ex
2
+-
M
lib/pleroma/web/streamer.ex
2
+-
M
test/pleroma/user_test.exs
2
+-
M
test/pleroma/web/common_api_test.exs
12
++++++------

6 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/lib/pleroma/notification.ex b/lib/pleroma/notification.ex
@@ -734,7 +734,7 @@ defmodule Pleroma.Notification do
 
   def mark_as_read?(activity, target_user) do
     user = Activity.user_actor(activity)
-    User.mutes_user?(target_user, user) || CommonAPI.thread_muted?(target_user, activity)
+    User.mutes_user?(target_user, user) || CommonAPI.thread_muted?(activity, target_user)
   end
 
   def for_user_and_activity(user, activity) do
diff --git a/lib/pleroma/web/common_api.ex b/lib/pleroma/web/common_api.ex
@@ -593,8 +593,8 @@ defmodule Pleroma.Web.CommonAPI do
     end
   end
 
-  @spec thread_muted?(User.t(), Activity.t()) :: boolean()
-  def thread_muted?(%User{id: user_id}, %{data: %{"context" => context}})
+  @spec thread_muted?(Activity.t(), User.t()) :: boolean()
+  def thread_muted?(%{data: %{"context" => context}}, %User{id: user_id})
       when is_binary(context) do
     ThreadMute.exists?(user_id, context)
   end
diff --git a/lib/pleroma/web/mastodon_api/views/status_view.ex b/lib/pleroma/web/mastodon_api/views/status_view.ex
@@ -293,7 +293,7 @@ defmodule Pleroma.Web.MastodonAPI.StatusView do
       cond do
         is_nil(opts[:for]) -> false
         is_boolean(activity.thread_muted?) -> activity.thread_muted?
-        true -> CommonAPI.thread_muted?(opts[:for], activity)
+        true -> CommonAPI.thread_muted?(activity, opts[:for])
       end
 
     attachment_data = object.data["attachment"] || []
diff --git a/lib/pleroma/web/streamer.ex b/lib/pleroma/web/streamer.ex
@@ -206,7 +206,7 @@ defmodule Pleroma.Web.Streamer do
          false <- Pleroma.Web.ActivityPub.MRF.subdomain_match?(domain_blocks, item_host),
          false <- Pleroma.Web.ActivityPub.MRF.subdomain_match?(domain_blocks, parent_host),
          true <- thread_containment(item, user),
-         false <- CommonAPI.thread_muted?(user, parent) do
+         false <- CommonAPI.thread_muted?(parent, user) do
       false
     else
       _ -> true
diff --git a/test/pleroma/user_test.exs b/test/pleroma/user_test.exs
@@ -1526,7 +1526,7 @@ defmodule Pleroma.UserTest do
 
       assert [activity] == ActivityPub.fetch_public_activities(%{}) |> Repo.preload(:bookmark)
 
-      assert [%{activity | thread_muted?: CommonAPI.thread_muted?(user2, activity)}] ==
+      assert [%{activity | thread_muted?: CommonAPI.thread_muted?(activity, user2)}] ==
                ActivityPub.fetch_activities([user2.ap_id | User.following(user2)], %{
                  user: user2
                })
diff --git a/test/pleroma/web/common_api_test.exs b/test/pleroma/web/common_api_test.exs
@@ -1173,7 +1173,7 @@ defmodule Pleroma.Web.CommonAPITest do
              end)
 
       {:ok, _} = CommonAPI.add_mute(activity, author)
-      assert CommonAPI.thread_muted?(author, activity)
+      assert CommonAPI.thread_muted?(activity, author)
 
       assert Repo.aggregate(
                from(n in Notification, where: n.seen == false and n.user_id == ^friend1.id),
@@ -1198,12 +1198,12 @@ defmodule Pleroma.Web.CommonAPITest do
 
     test "add mute", %{user: user, activity: activity} do
       {:ok, _} = CommonAPI.add_mute(activity, user)
-      assert CommonAPI.thread_muted?(user, activity)
+      assert CommonAPI.thread_muted?(activity, user)
     end
 
     test "add expiring mute", %{user: user, activity: activity} do
       {:ok, _} = CommonAPI.add_mute(activity, user, %{expires_in: 60})
-      assert CommonAPI.thread_muted?(user, activity)
+      assert CommonAPI.thread_muted?(activity, user)
 
       worker = Pleroma.Workers.MuteExpireWorker
       args = %{"op" => "unmute_conversation", "user_id" => user.id, "activity_id" => activity.id}
@@ -1214,19 +1214,19 @@ defmodule Pleroma.Web.CommonAPITest do
       )
 
       assert :ok = perform_job(worker, args)
-      refute CommonAPI.thread_muted?(user, activity)
+      refute CommonAPI.thread_muted?(activity, user)
     end
 
     test "remove mute", %{user: user, activity: activity} do
       CommonAPI.add_mute(activity, user)
       {:ok, _} = CommonAPI.remove_mute(activity, user)
-      refute CommonAPI.thread_muted?(user, activity)
+      refute CommonAPI.thread_muted?(activity, user)
     end
 
     test "remove mute by ids", %{user: user, activity: activity} do
       CommonAPI.add_mute(activity, user)
       {:ok, _} = CommonAPI.remove_mute(activity.id, user.id)
-      refute CommonAPI.thread_muted?(user, activity)
+      refute CommonAPI.thread_muted?(activity, user)
     end
 
     test "check that mutes can't be duplicate", %{user: user, activity: activity} do