sjw
/
pleroma
mirror of https://git.pleroma.social/sjw/pleroma.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix credo warnings

This commit is contained in:
Ekaterina Vaartis 2019-09-10 22:09:20 +03:00
parent 87057101b0
commit f6d4acc871
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/pleroma/web/emoji_api/emoji_api_controller.ex
View File

@ -532,7 +532,8 @@ keeping it in cache for #{div(cache_ms, 1000)}s")
|> Enum.map(&String.trim/1)
|> Enum.map(fn line ->
case String.split(line, ~r/,\s*/) do
# This matches both strings with and without tags and we don't care about tags here
# This matches both strings with and without tags
# and we don't care about tags here
[name, file | _] ->
{name, file}
@ -543,8 +544,8 @@ keeping it in cache for #{div(cache_ms, 1000)}s")
|> Enum.filter(fn x -> not is_nil(x) end)
|> Enum.into(%{})
else
# If there's no emoji.txt, assume all files that are of certain extensions from the config
# are emojis and import them all
# If there's no emoji.txt, assume all files
# that are of certain extensions from the config are emojis and import them all
Pleroma.Emoji.make_shortcode_to_file_map(
dir_path,
Pleroma.Config.get!([:emoji, :pack_extensions])