Revert "mix format"

This reverts commit 573134ac6c.
This commit is contained in:
Henry Jameson 2026-11-05 16:31:02 +02:00
commit dfc21dc124
5 changed files with 5 additions and 16 deletions

View file

@ -24,11 +24,7 @@ defmodule Pleroma.Web.ActivityPub.MRF.AntiFollowbotPolicy do
defp score_displayname("fedibot"), do: 1.0 defp score_displayname("fedibot"), do: 1.0
defp score_displayname(_), do: 0.0 defp score_displayname(_), do: 0.0
defp determine_if_followbot(%User{ defp determine_if_followbot(%User{nickname: nickname, name: displayname, actor_type: actor_type}) do
nickname: nickname,
name: displayname,
actor_type: actor_type
}) do
# nickname will be a binary string except when following a relay # nickname will be a binary string except when following a relay
nick_score = nick_score =
if is_binary(nickname) do if is_binary(nickname) do

View file

@ -110,7 +110,7 @@ defmodule Pleroma.Web.ActivityPub.MRF.SimplePolicy do
end end
defp intersection(list1, list2) do defp intersection(list1, list2) do
list1 -- (list1 -- list2) list1 -- list1 -- list2
end end
defp check_followers_only(%{host: actor_host} = _actor_info, activity) do defp check_followers_only(%{host: actor_host} = _actor_info, activity) do

View file

@ -6,9 +6,7 @@ defmodule Pleroma.Workers.MailerWorker do
use Oban.Worker, queue: :background use Oban.Worker, queue: :background
@impl true @impl true
def perform(%Job{ def perform(%Job{args: %{"op" => "email", "encoded_email" => encoded_email, "config" => config}}) do
args: %{"op" => "email", "encoded_email" => encoded_email, "config" => config}
}) do
encoded_email encoded_email
|> Base.decode64!() |> Base.decode64!()
|> :erlang.binary_to_term() |> :erlang.binary_to_term()

View file

@ -16,11 +16,7 @@ defmodule Pleroma.Web.ActivityPub.MRF.ForceMentionsInContentTest do
test "adds mentions to post content" do test "adds mentions to post content" do
[lain, coolboymew, dielan, hakui, fence] = [ [lain, coolboymew, dielan, hakui, fence] = [
insert(:user, insert(:user, ap_id: "https://lain.com/users/lain", nickname: "lain@lain.com", local: false),
ap_id: "https://lain.com/users/lain",
nickname: "lain@lain.com",
local: false
),
insert(:user, insert(:user,
ap_id: "https://shitposter.club/users/coolboymew", ap_id: "https://shitposter.club/users/coolboymew",
nickname: "coolboymew@shitposter.club", nickname: "coolboymew@shitposter.club",

View file

@ -62,8 +62,7 @@ defmodule Pleroma.Web.OAuth.TokenControllerTest do
|> hd() |> hd()
|> Map.keys() |> Map.keys()
assert Enum.sort(keys) == assert Enum.sort(keys) == Enum.sort(["id", "app_name", "valid_until", "scopes", "is_current_token"])
Enum.sort(["id", "app_name", "valid_until", "scopes", "is_current_token"])
end end
test "marks which token is being used for the request" do test "marks which token is being used for the request" do