summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorMark Felder <feld@feld.me>2024-07-22 18:18:30 -0400
committerMark Felder <feld@feld.me>2024-07-22 18:25:37 -0400
commit4601473aaf65cfc5696e17069014a92750f1560d (patch)
treee17a48f28e29dfd001fb3fc173a5779ba6a7d769 /lib
parentd27ad36ce4b2f00d89ca96bd4d7c6f688ec67262 (diff)
downloadpleroma-4601473aaf65cfc5696e17069014a92750f1560d.tar.gz
pleroma-4601473aaf65cfc5696e17069014a92750f1560d.zip
Fix order of args for add_mute/2
Diffstat (limited to 'lib')
-rw-r--r--lib/pleroma/web/common_api.ex4
-rw-r--r--lib/pleroma/web/mastodon_api/controllers/status_controller.ex2
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/pleroma/web/common_api.ex b/lib/pleroma/web/common_api.ex
index 751260a46..b5ba081b8 100644
--- a/lib/pleroma/web/common_api.ex
+++ b/lib/pleroma/web/common_api.ex
@@ -552,8 +552,8 @@ defmodule Pleroma.Web.CommonAPI do
end
end
- @spec add_mute(User.t(), Activity.t(), map()) :: {:ok, Activity.t()} | {:error, any()}
- def add_mute(user, activity, params \\ %{}) do
+ @spec add_mute(Activity.t(), User.t(), map()) :: {:ok, Activity.t()} | {:error, any()}
+ def add_mute(activity, user, params \\ %{}) do
expires_in = Map.get(params, :expires_in, 0)
with {:ok, _} <- ThreadMute.add_mute(user.id, activity.data["context"]),
diff --git a/lib/pleroma/web/mastodon_api/controllers/status_controller.ex b/lib/pleroma/web/mastodon_api/controllers/status_controller.ex
index ab5a104dd..b9b236920 100644
--- a/lib/pleroma/web/mastodon_api/controllers/status_controller.ex
+++ b/lib/pleroma/web/mastodon_api/controllers/status_controller.ex
@@ -453,7 +453,7 @@ defmodule Pleroma.Web.MastodonAPI.StatusController do
_
) do
with %Activity{} = activity <- Activity.get_by_id(id),
- {:ok, activity} <- CommonAPI.add_mute(user, activity, params) do
+ {:ok, activity} <- CommonAPI.add_mute(activity, user, params) do
try_render(conn, "show.json", activity: activity, for: user, as: :activity)
end
end