run mix format

lib/pleroma/emoji.ex

@@ -50,13 +50,14 @@ def reload do
   @doc "Returns the path of the emoji `name`."
   @spec get(String.t()) :: String.t() | nil
   def get(name) do
-    name = if String.starts_with?(name, ":") do
+    name =
-      name
+      if String.starts_with?(name, ":") do
-      |> String.replace_leading(":", "")
+        name
-      |> String.replace_trailing(":", "")
+        |> String.replace_leading(":", "")
-    else
+        |> String.replace_trailing(":", "")
-      name
+      else
-    end
+        name
+      end
 
     case :ets.lookup(@ets, name) do
       [{_, path}] -> path

lib/pleroma/web/activity_pub/builder.ex

@@ -58,29 +58,32 @@ def follow(follower, followed) do
   @spec emoji_react(User.t(), Object.t(), String.t()) :: {:ok, map(), keyword()}
   def emoji_react(actor, object, emoji) do
     with {:ok, data, meta} <- object_action(actor, object) do
-      data = if Emoji.is_unicode_emoji?(emoji) do
+      data =
-        data
+        if Emoji.is_unicode_emoji?(emoji) do
-        |> Map.put("content", emoji)
+          data
-        |> Map.put("type", "EmojiReact")
+          |> Map.put("content", emoji)
-      else
+          |> Map.put("type", "EmojiReact")
-        emojo = Emoji.get(emoji)
+        else
-        path = emojo |> Map.get(:file)
+          emojo = Emoji.get(emoji)
-        url = "#{Endpoint.url()}#{path}"
+          path = emojo |> Map.get(:file)
-        data
+          url = "#{Endpoint.url()}#{path}"
-        |> Map.put("content", emoji)
+
-        |> Map.put("type", "EmojiReact")
+          data
-        |> Map.put("tag", [
+          |> Map.put("content", emoji)
+          |> Map.put("type", "EmojiReact")
+          |> Map.put("tag", [
             %{}
             |> Map.put("id", url)
             |> Map.put("type", "Emoji")
             |> Map.put("name", emojo.code)
-            |> Map.put("icon",
+            |> Map.put(
-                %{}
+              "icon",
-                |> Map.put("type", "Image")
+              %{}
-                |> Map.put("url", url)
+              |> Map.put("type", "Image")
+              |> Map.put("url", url)
             )
-        ])
+          ])
-      end
+        end
 
       {:ok, data, meta}
     end

lib/pleroma/web/activity_pub/object_validators/emoji_react_validator.ex

@@ -55,11 +55,12 @@ defp fix(data) do
       |> CommonFixes.fix_actor()
       |> CommonFixes.fix_activity_addressing()
 
-    data = if Map.has_key?(data, "tag") do
+    data =
+      if Map.has_key?(data, "tag") do
         data
-    else
+      else
         Map.put(data, "tag", [])
-    end
+      end
 
     with %Object{} = object <- Object.normalize(data["object"]) do
       data
@@ -72,6 +73,7 @@ defp fix(data) do
 
   defp validate_emoji(cng) do
     content = get_field(cng, :content)
+
     if Pleroma.Emoji.is_unicode_emoji?(content) || Regex.match?(@emoji_regex, content) do
       cng
     else

lib/pleroma/web/activity_pub/transmogrifier.ex

@@ -433,7 +433,7 @@ def handle_incoming(
   def handle_incoming(
         %{
           "type" => "Like",
-          "_misskey_reaction" => reaction,
+          "_misskey_reaction" => reaction
         } = data,
         options
       ) do

lib/pleroma/web/activity_pub/utils.ex

@@ -350,14 +350,15 @@ def add_emoji_reaction_to_object(
     reactions = get_cached_emoji_reactions(object)
     emoji = stripped_emoji_name(emoji)
     url = emoji_url(emoji, activity)
+
     new_reactions =
       case Enum.find_index(reactions, fn [candidate, _, candidate_url] ->
-        if is_nil(candidate_url) do
+             if is_nil(candidate_url) do
-            emoji == candidate
+               emoji == candidate
-        else
+             else
-            url == candidate_url
+               url == candidate_url
-        end
+             end
-      end) do
+           end) do
         nil ->
           reactions ++ [[emoji, [actor], url]]
 
@@ -380,12 +381,18 @@ defp stripped_emoji_name(name) do
     |> String.replace_trailing(":", "")
   end
 
-  defp emoji_url(name,
+  defp emoji_url(
-    %Activity{
+         name,
-        data: %{"tag" => [
+         %Activity{
-            %{"type" => "Emoji", "name" => name, "icon" => %{"url" => url}}
+           data: %{
-        ]}
+             "tag" => [
-    }), do: url
+               %{"type" => "Emoji", "name" => name, "icon" => %{"url" => url}}
+             ]
+           }
+         }
+       ),
+       do: url
+
   defp emoji_url(_, _), do: nil
 
   def emoji_count(reactions_list) do
@@ -399,14 +406,15 @@ def remove_emoji_reaction_from_object(
     emoji = stripped_emoji_name(emoji)
     reactions = get_cached_emoji_reactions(object)
     url = emoji_url(emoji, activity)
+
     new_reactions =
       case Enum.find_index(reactions, fn [candidate, _, candidate_url] ->
-        if is_nil(candidate_url) do
+             if is_nil(candidate_url) do
-            emoji == candidate
+               emoji == candidate
-        else
+             else
-            url == candidate_url
+               url == candidate_url
-        end
+             end
-      end) do
+           end) do
         nil ->
           reactions
 
@@ -536,11 +544,13 @@ def fetch_latest_undo(%User{ap_id: ap_id}) do
 
   def get_latest_reaction(internal_activity_id, %{ap_id: ap_id}, emoji) do
     %{data: %{"object" => object_ap_id}} = Activity.get_by_id(internal_activity_id)
-    emoji = if String.starts_with?(emoji, ":") do
+
-      emoji
+    emoji =
-    else
+      if String.starts_with?(emoji, ":") do
-      ":#{emoji}:"
+        emoji
-    end
+      else
+        ":#{emoji}:"
+      end
 
     "EmojiReact"
     |> Activity.Queries.by_type()

lib/pleroma/web/mastodon_api/views/status_view.ex

@@ -304,6 +304,7 @@ def render("show.json", %{activity: %{data: %{"object" => _object}} = activity}
         _e ->
           nil
       end
+
     emoji_reactions =
       object.data
       |> Map.get("reactions", [])

lib/pleroma/web/pleroma_api/views/emoji_reaction_view.ex

@@ -14,6 +14,7 @@ def render("index.json", %{emoji_reactions: emoji_reactions} = opts) do
 
   def render("show.json", %{emoji_reaction: {emoji, user_ap_ids, url}, user: user}) do
     users = fetch_users(user_ap_ids)
+
     %{
       name: emoji,
       count: length(users),

mix.exs

@@ -157,7 +157,9 @@ defp deps do
       {:floki, "~> 0.27"},
       {:timex, "~> 3.6"},
       {:ueberauth, "~> 0.4"},
-      {:linkify, git: "https://git.ihatebeinga.live/floatingghost/linkify.git", branch: "bugfix/line-ending-buffer"},
+      {:linkify,
+       git: "https://git.ihatebeinga.live/floatingghost/linkify.git",
+       branch: "bugfix/line-ending-buffer"},
       {:http_signatures, "~> 0.1.1"},
       {:telemetry, "~> 0.3"},
       {:poolboy, "~> 1.5"},