Anon/pleroma
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

code style

Browse Source 
little fix
This commit is contained in:
Alex S 2019-04-01 17:54:30 +07:00
parent 3601f03147
commit 17d3d05a71
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/pleroma/emoji.ex
View File

@ -152,7 +152,7 @@ defmodule Pleroma.Emoji do
"woollysocks" "woollysocks"
] ]
defp load_finmoji(true) do 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 -> Enum.map(@finmoji, fn finmoji ->
{finmoji, "/finmoji/128px/#{finmoji}-128.png", tag} {finmoji, "/finmoji/128px/#{finmoji}-128.png", tag}
@ -193,14 +193,14 @@ defmodule Pleroma.Emoji do
end end
@spec get_default_tag(String.t()) :: String.t() @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( Keyword.get(
Application.get_env(:pleroma, :emoji), Application.get_env(:pleroma, :emoji),
String.to_existing_atom(file_name <> "_tag") String.to_existing_atom(file_name <> "_tag")
) )
end 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 defp load_from_globs(globs) do
static_path = Path.join(:code.priv_dir(:pleroma), "static") static_path = Path.join(:code.priv_dir(:pleroma), "static")

3
test/emoji_test.exs
View File

@ -7,6 +7,7 @@ defmodule Pleroma.EmojiTest do
emoji_list = Emoji.get_all() emoji_list = Emoji.get_all()
{:ok, emoji_list: emoji_list} {:ok, emoji_list: emoji_list}
end end
test "first emoji", %{emoji_list: emoji_list} do test "first emoji", %{emoji_list: emoji_list} do
[emoji | _others] = emoji_list [emoji | _others] = emoji_list
{code, path, tags} = emoji {code, path, tags} = emoji
@ -19,7 +20,7 @@ defmodule Pleroma.EmojiTest do
test "random emoji", %{emoji_list: emoji_list} do test "random emoji", %{emoji_list: emoji_list} do
emoji = Enum.random(emoji_list) emoji = Enum.random(emoji_list)
{code, path, tags} = emoji {code, path, tags} = emoji
assert tuple_size(emoji) == 3 assert tuple_size(emoji) == 3
assert is_binary(code) assert is_binary(code)

5
test/formatter_test.exs
View File

@ -272,7 +272,10 @@ defmodule Pleroma.FormatterTest do
text = "I love :moominmamma:" text = "I love :moominmamma:"
tag = Keyword.get(Application.get_env(:pleroma, :emoji), :finmoji_tag) 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 end
test "it returns a nice empty result when no emojis are present" do test "it returns a nice empty result when no emojis are present" do