From dfc21dc1242e30c348a95e0835779c179933a5ec Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Thu, 5 Nov 2026 16:31:02 +0200 Subject: [PATCH] Revert "mix format" This reverts commit 573134ac6cf5ba51a47380cfe6f3967022a67b44. --- lib/pleroma/web/activity_pub/mrf/anti_followbot_policy.ex | 6 +----- lib/pleroma/web/activity_pub/mrf/simple_policy.ex | 2 +- lib/pleroma/workers/mailer_worker.ex | 4 +--- .../web/activity_pub/mrf/force_mentions_in_content_test.exs | 6 +----- test/pleroma/web/o_auth/token_controller_test.exs | 3 +-- 5 files changed, 5 insertions(+), 16 deletions(-) diff --git a/lib/pleroma/web/activity_pub/mrf/anti_followbot_policy.ex b/lib/pleroma/web/activity_pub/mrf/anti_followbot_policy.ex index 72a71c25c..990ff31c9 100644 --- a/lib/pleroma/web/activity_pub/mrf/anti_followbot_policy.ex +++ b/lib/pleroma/web/activity_pub/mrf/anti_followbot_policy.ex @@ -24,11 +24,7 @@ defmodule Pleroma.Web.ActivityPub.MRF.AntiFollowbotPolicy do defp score_displayname("fedibot"), do: 1.0 defp score_displayname(_), do: 0.0 - defp determine_if_followbot(%User{ - nickname: nickname, - name: displayname, - actor_type: actor_type - }) do + defp determine_if_followbot(%User{nickname: nickname, name: displayname, actor_type: actor_type}) do # nickname will be a binary string except when following a relay nick_score = if is_binary(nickname) do diff --git a/lib/pleroma/web/activity_pub/mrf/simple_policy.ex b/lib/pleroma/web/activity_pub/mrf/simple_policy.ex index e415a1da3..b58d1c75a 100644 --- a/lib/pleroma/web/activity_pub/mrf/simple_policy.ex +++ b/lib/pleroma/web/activity_pub/mrf/simple_policy.ex @@ -110,7 +110,7 @@ defmodule Pleroma.Web.ActivityPub.MRF.SimplePolicy do end defp intersection(list1, list2) do - list1 -- (list1 -- list2) + list1 -- list1 -- list2 end defp check_followers_only(%{host: actor_host} = _actor_info, activity) do diff --git a/lib/pleroma/workers/mailer_worker.ex b/lib/pleroma/workers/mailer_worker.ex index 9ef6a80c9..b0259b191 100644 --- a/lib/pleroma/workers/mailer_worker.ex +++ b/lib/pleroma/workers/mailer_worker.ex @@ -6,9 +6,7 @@ defmodule Pleroma.Workers.MailerWorker do use Oban.Worker, queue: :background @impl true - def perform(%Job{ - args: %{"op" => "email", "encoded_email" => encoded_email, "config" => config} - }) do + def perform(%Job{args: %{"op" => "email", "encoded_email" => encoded_email, "config" => config}}) do encoded_email |> Base.decode64!() |> :erlang.binary_to_term() diff --git a/test/pleroma/web/activity_pub/mrf/force_mentions_in_content_test.exs b/test/pleroma/web/activity_pub/mrf/force_mentions_in_content_test.exs index 97d63dc92..811ef105c 100644 --- a/test/pleroma/web/activity_pub/mrf/force_mentions_in_content_test.exs +++ b/test/pleroma/web/activity_pub/mrf/force_mentions_in_content_test.exs @@ -16,11 +16,7 @@ defmodule Pleroma.Web.ActivityPub.MRF.ForceMentionsInContentTest do test "adds mentions to post content" do [lain, coolboymew, dielan, hakui, fence] = [ - insert(:user, - ap_id: "https://lain.com/users/lain", - nickname: "lain@lain.com", - local: false - ), + insert(:user, ap_id: "https://lain.com/users/lain", nickname: "lain@lain.com", local: false), insert(:user, ap_id: "https://shitposter.club/users/coolboymew", nickname: "coolboymew@shitposter.club", diff --git a/test/pleroma/web/o_auth/token_controller_test.exs b/test/pleroma/web/o_auth/token_controller_test.exs index e41584cd0..c408c7c32 100644 --- a/test/pleroma/web/o_auth/token_controller_test.exs +++ b/test/pleroma/web/o_auth/token_controller_test.exs @@ -62,8 +62,7 @@ defmodule Pleroma.Web.OAuth.TokenControllerTest do |> hd() |> Map.keys() - assert Enum.sort(keys) == - Enum.sort(["id", "app_name", "valid_until", "scopes", "is_current_token"]) + assert Enum.sort(keys) == Enum.sort(["id", "app_name", "valid_until", "scopes", "is_current_token"]) end test "marks which token is being used for the request" do