limepotato/akkoma
1
0
Fork 0
forked from ouroboros-gorup/akkoma
Code Pull requests Activity

mix format

Browse source
This commit is contained in:
Floatingghost 2024-06-15 15:06:28 +01:00
parent cba2c5725f
commit 4b765b1886
2 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/pleroma/web/pleroma_api/controllers/emoji_reaction_controller.ex
View file

@ -54,11 +54,10 @@ defmodule Pleroma.Web.PleromaAPI.EmojiReactionController do
defp filter_allowed_users_by_domain(ap_ids, %User{} = for_user) do defp filter_allowed_users_by_domain(ap_ids, %User{} = for_user) do
Enum.reject(ap_ids, fn ap_id -> Enum.reject(ap_ids, fn ap_id ->
User.blocks_domain?(for_user, ap_id) User.blocks_domain?(for_user, ap_id)
end) end)
end end
defp filter_allowed_users_by_domain(ap_ids, nil), do: ap_ids defp filter_allowed_users_by_domain(ap_ids, nil), do: ap_ids
def filter_allowed_users(reactions, user, with_muted) do def filter_allowed_users(reactions, user, with_muted) do
@ -80,7 +79,6 @@ defmodule Pleroma.Web.PleromaAPI.EmojiReactionController do
end end
end end
reactions reactions
|> Stream.map(fn |> Stream.map(fn
[emoji, users, url] when is_list(users) -> filter_emoji.(emoji, users, url) [emoji, users, url] when is_list(users) -> filter_emoji.(emoji, users, url)

4
test/pleroma/web/mastodon_api/views/status_view_test.exs
View file

@ -62,7 +62,7 @@ defmodule Pleroma.Web.MastodonAPI.StatusViewTest do
account_ids: [other_user.id, user.id] account_ids: [other_user.id, user.id]
}, },
%{name: "🍵", count: 1, me: false, url: nil, account_ids: [third_user.id]}, %{name: "🍵", count: 1, me: false, url: nil, account_ids: [third_user.id]},
%{name: "😈", count: 1, me: false, url: nil, account_ids: [domain_blocked_user.id]} %{name: "😈", count: 1, me: false, url: nil, account_ids: [domain_blocked_user.id]}
] ]
status = StatusView.render("show.json", activity: activity, for: user) status = StatusView.render("show.json", activity: activity, for: user)
@ -81,7 +81,7 @@ defmodule Pleroma.Web.MastodonAPI.StatusViewTest do
%{name: "🍵", count: 1, me: false, url: nil, account_ids: [third_user.id]} %{name: "🍵", count: 1, me: false, url: nil, account_ids: [third_user.id]}
] ]
refute Enum.any?(status[:pleroma][:emoji_reactions], fn reaction -> reaction[:name] == "😈" end) refute Enum.any?(status[:pleroma][:emoji_reactions], fn reaction -> reaction[:name] == "😈" end)
end end
test "works correctly with badly formatted emojis" do test "works correctly with badly formatted emojis" do