From: Alex S <alex.strizhakov@gmail.com>
Date: Mon, 1 Apr 2019 10:54:30 +0000 (+0700)
Subject: code style
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=17d3d05a7196140b62dd791af8d7ced8b0ad9fa1;p=akkoma

code style

little fix
---

diff --git a/lib/pleroma/emoji.ex b/lib/pleroma/emoji.ex
index c35aed6ee..ad3170f9a 100644
--- a/lib/pleroma/emoji.ex
+++ b/lib/pleroma/emoji.ex
@@ -152,7 +152,7 @@ defmodule Pleroma.Emoji do
     "woollysocks"
   ]
   defp load_finmoji(true) do
-    tag = Keyword.get(Application.get_env(:pleroma, :emoji), :finmoji_tag)
+    tag = Application.get_env(:pleroma, :emoji)[:finmoji_tag]
 
     Enum.map(@finmoji, fn finmoji ->
       {finmoji, "/finmoji/128px/#{finmoji}-128.png", tag}
@@ -193,14 +193,14 @@ defmodule Pleroma.Emoji do
   end
 
   @spec get_default_tag(String.t()) :: String.t()
-  defp get_default_tag(file_name) when file_name in ["emoji", "custom_emojii"] do
+  defp get_default_tag(file_name) when file_name in ["emoji", "custom_emoji"] do
     Keyword.get(
       Application.get_env(:pleroma, :emoji),
       String.to_existing_atom(file_name <> "_tag")
     )
   end
 
-  defp get_default_tag(_), do: Keyword.get(Application.get_env(:pleroma, :emoji), :custom_tag)
+  defp get_default_tag(_), do: Application.get_env(:pleroma, :emoji)[:custom_tag]
 
   defp load_from_globs(globs) do
     static_path = Path.join(:code.priv_dir(:pleroma), "static")
diff --git a/test/emoji_test.exs b/test/emoji_test.exs
index c9c32e20b..a90213d7d 100644
--- a/test/emoji_test.exs
+++ b/test/emoji_test.exs
@@ -7,6 +7,7 @@ defmodule Pleroma.EmojiTest do
       emoji_list = Emoji.get_all()
       {:ok, emoji_list: emoji_list}
     end
+
     test "first emoji", %{emoji_list: emoji_list} do
       [emoji | _others] = emoji_list
       {code, path, tags} = emoji
@@ -19,7 +20,7 @@ defmodule Pleroma.EmojiTest do
 
     test "random emoji", %{emoji_list: emoji_list} do
       emoji = Enum.random(emoji_list)
-     {code, path, tags} = emoji
+      {code, path, tags} = emoji
 
       assert tuple_size(emoji) == 3
       assert is_binary(code)
diff --git a/test/formatter_test.exs b/test/formatter_test.exs
index e67042a5f..38430e170 100644
--- a/test/formatter_test.exs
+++ b/test/formatter_test.exs
@@ -272,7 +272,10 @@ defmodule Pleroma.FormatterTest do
     text = "I love :moominmamma:"
 
     tag = Keyword.get(Application.get_env(:pleroma, :emoji), :finmoji_tag)
-    assert Formatter.get_emoji(text) == [{"moominmamma", "/finmoji/128px/moominmamma-128.png", tag}]
+
+    assert Formatter.get_emoji(text) == [
+             {"moominmamma", "/finmoji/128px/moominmamma-128.png", tag}
+           ]
   end
 
   test "it returns a nice empty result when no emojis are present" do