From f176294d6d1597e13b325f00d1472bd3e0c0a85f Mon Sep 17 00:00:00 2001 From: Floatingghost Date: Sun, 2 Mar 2025 11:54:00 +0000 Subject: [PATCH] elixir 1.18 formatting --- lib/pleroma/web/activity_pub/mrf/anti_followbot_policy.ex | 6 +++++- lib/pleroma/web/activity_pub/mrf/simple_policy.ex | 2 +- .../web/activity_pub/object_validators/user_validator.ex | 5 ++++- lib/pleroma/web/mastodon_api/views/status_view.ex | 4 +++- lib/pleroma/workers/mailer_worker.ex | 4 +++- lib/pleroma/workers/mute_expire_worker.ex | 4 +++- lib/pleroma/workers/publisher_worker.ex | 4 +++- 7 files changed, 22 insertions(+), 7 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 627f52168..bccb1a37e 100644 --- a/lib/pleroma/web/activity_pub/mrf/anti_followbot_policy.ex +++ b/lib/pleroma/web/activity_pub/mrf/anti_followbot_policy.ex @@ -24,7 +24,11 @@ defp score_displayname("federationbot"), do: 1.0 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 0b8b846ec..a49d75237 100644 --- a/lib/pleroma/web/activity_pub/mrf/simple_policy.ex +++ b/lib/pleroma/web/activity_pub/mrf/simple_policy.ex @@ -108,7 +108,7 @@ defp check_ftl_removal(%{host: actor_host} = _actor_info, object) do end defp intersection(list1, list2) do - list1 -- list1 -- list2 + list1 -- (list1 -- list2) end defp check_followers_only(%{host: actor_host} = _actor_info, object) do diff --git a/lib/pleroma/web/activity_pub/object_validators/user_validator.ex b/lib/pleroma/web/activity_pub/object_validators/user_validator.ex index f75e2f87e..5612ded1b 100644 --- a/lib/pleroma/web/activity_pub/object_validators/user_validator.ex +++ b/lib/pleroma/web/activity_pub/object_validators/user_validator.ex @@ -34,7 +34,10 @@ def validate(%{"type" => type, "id" => _id} = data, meta) def validate(_, _), do: {:error, "Not a user object"} - defp validate_pubkey(%{"id" => user_id, "publicKey" => %{"id" => pk_id, "publicKeyPem" => _key}}) do + defp validate_pubkey(%{ + "id" => user_id, + "publicKey" => %{"id" => pk_id, "publicKeyPem" => _key} + }) do with {_, true} <- {:user, is_binary(user_id)}, {_, true} <- {:key, is_binary(pk_id)}, :ok <- Containment.contain_key_user(pk_id, user_id) do diff --git a/lib/pleroma/web/mastodon_api/views/status_view.ex b/lib/pleroma/web/mastodon_api/views/status_view.ex index a5229f5e4..65aeecfcf 100644 --- a/lib/pleroma/web/mastodon_api/views/status_view.ex +++ b/lib/pleroma/web/mastodon_api/views/status_view.ex @@ -617,7 +617,9 @@ def render("context.json", %{activity: activity, activities: activities, user: u %{ancestors: ancestors, descendants: descendants} = activities |> Enum.reverse() - |> Enum.group_by(fn %{id: id} -> if id < activity.id, do: :ancestors, else: :descendants end) + |> Enum.group_by(fn %{id: id} -> + if id < activity.id, do: :ancestors, else: :descendants + end) |> Map.put_new(:ancestors, []) |> Map.put_new(:descendants, []) diff --git a/lib/pleroma/workers/mailer_worker.ex b/lib/pleroma/workers/mailer_worker.ex index 592230e7a..48c3fc9d1 100644 --- a/lib/pleroma/workers/mailer_worker.ex +++ b/lib/pleroma/workers/mailer_worker.ex @@ -6,7 +6,9 @@ defmodule Pleroma.Workers.MailerWorker do use Pleroma.Workers.WorkerHelper, queue: "mailer" @impl Oban.Worker - 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/lib/pleroma/workers/mute_expire_worker.ex b/lib/pleroma/workers/mute_expire_worker.ex index 8da903e76..c253027d9 100644 --- a/lib/pleroma/workers/mute_expire_worker.ex +++ b/lib/pleroma/workers/mute_expire_worker.ex @@ -6,7 +6,9 @@ defmodule Pleroma.Workers.MuteExpireWorker do use Pleroma.Workers.WorkerHelper, queue: "mute_expire" @impl Oban.Worker - def perform(%Job{args: %{"op" => "unmute_user", "muter_id" => muter_id, "mutee_id" => mutee_id}}) do + def perform(%Job{ + args: %{"op" => "unmute_user", "muter_id" => muter_id, "mutee_id" => mutee_id} + }) do Pleroma.User.unmute(muter_id, mutee_id) :ok end diff --git a/lib/pleroma/workers/publisher_worker.ex b/lib/pleroma/workers/publisher_worker.ex index 545887071..be94134b9 100644 --- a/lib/pleroma/workers/publisher_worker.ex +++ b/lib/pleroma/workers/publisher_worker.ex @@ -13,7 +13,9 @@ def backoff(%Job{attempt: attempt}) when is_integer(attempt) do end @impl Oban.Worker - def perform(%Job{args: %{"op" => "publish", "activity_id" => activity_id, "object_data" => nil}}) do + def perform(%Job{ + args: %{"op" => "publish", "activity_id" => activity_id, "object_data" => nil} + }) do activity = Activity.get_by_id(activity_id) Federator.perform(:publish, activity) end