metadata.moe/social.metadata.moe
1
0
Fork 0
mirror of https://github.com/Babibubebon/social.metadata.moe.git synced 2024-09-22 16:54:19 +09:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix order of args for show_reblogs/2

Browse source
This commit is contained in:
Mark Felder 2024-07-22 19:19:21 -04:00
parent 3f4f567c9c
commit 12f498bc0d
4 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/pleroma/web/common_api.ex
View file

@ -692,7 +692,7 @@ def hide_reblogs(%User{} = target, %User{} = user) do
end end
@spec show_reblogs(User.t(), User.t()) :: {:ok, any()} | {:error, any()} @spec show_reblogs(User.t(), User.t()) :: {:ok, any()} | {:error, any()}
def show_reblogs(%User{} = user, %User{} = target) do def show_reblogs(%User{} = target, %User{} = user) do
UserRelationship.delete_reblog_mute(user, target) UserRelationship.delete_reblog_mute(user, target)
end end

2
lib/pleroma/web/mastodon_api/mastodon_api.ex
View file

@ -34,7 +34,7 @@ defp set_reblogs_visibility(false, {:ok, follower, followed, _}) do
end end
defp set_reblogs_visibility(_, {:ok, follower, followed, _}) do defp set_reblogs_visibility(_, {:ok, follower, followed, _}) do
CommonAPI.show_reblogs(follower, followed) CommonAPI.show_reblogs(followed, follower)
end end
defp set_subscription(true, {:ok, follower, followed, _}) do defp set_subscription(true, {:ok, follower, followed, _}) do

2
test/pleroma/web/activity_pub/activity_pub_test.exs
View file

@ -1372,7 +1372,7 @@ test "returns reblogs for users for whom reblogs have not been muted" do
user = insert(:user) user = insert(:user)
booster = insert(:user) booster = insert(:user)
{:ok, _reblog_mute} = CommonAPI.hide_reblogs(booster, user) {:ok, _reblog_mute} = CommonAPI.hide_reblogs(booster, user)
{:ok, _reblog_mute} = CommonAPI.show_reblogs(user, booster) {:ok, _reblog_mute} = CommonAPI.show_reblogs(booster, user)
{:ok, activity} = CommonAPI.repeat(activity.id, booster) {:ok, activity} = CommonAPI.repeat(activity.id, booster)

2
test/pleroma/web/common_api_test.exs
View file

@ -1411,7 +1411,7 @@ test "add a reblog mute", %{muter: muter, muted: muted} do
test "remove a reblog mute", %{muter: muter, muted: muted} do test "remove a reblog mute", %{muter: muter, muted: muted} do
{:ok, _reblog_mute} = CommonAPI.hide_reblogs(muted, muter) {:ok, _reblog_mute} = CommonAPI.hide_reblogs(muted, muter)
{:ok, _reblog_mute} = CommonAPI.show_reblogs(muter, muted) {:ok, _reblog_mute} = CommonAPI.show_reblogs(muted, muter)
assert User.showing_reblogs?(muter, muted) == true assert User.showing_reblogs?(muter, muted) == true
end end