projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'bugfix/webfinger-jrd' into 'develop'
[akkoma]
/
lib
/
pleroma
/
emoji.ex
diff --git
a/lib/pleroma/emoji.ex
b/lib/pleroma/emoji.ex
index 7da1a24383406781f35c155791356256dbddb129..bedad99d67c0ed870d14814f4257ff6b793dad12 100644
(file)
--- a/
lib/pleroma/emoji.ex
+++ b/
lib/pleroma/emoji.ex
@@
-10,7
+10,7
@@
defmodule Pleroma.Emoji do
"""
use GenServer
@ets __MODULE__.Ets
"""
use GenServer
@ets __MODULE__.Ets
- @ets_options [:set, :protected, :named_table, {:read_concurrency, true}]
+ @ets_options [:
ordered_
set, :protected, :named_table, {:read_concurrency, true}]
@doc false
def start_link() do
@doc false
def start_link() do
@@
-153,7
+153,7
@@
defmodule Pleroma.Emoji do
end)
end
end)
end
- defp load_finmoji(_), do:
:ok
+ defp load_finmoji(_), do:
[]
defp load_from_file(file) do
if File.exists?(file) do
defp load_from_file(file) do
if File.exists?(file) do
@@
-165,7
+165,7
@@
defmodule Pleroma.Emoji do
defp load_from_file_stream(stream) do
stream
defp load_from_file_stream(stream) do
stream
- |> Stream.map(&String.
strip
/1)
+ |> Stream.map(&String.
trim
/1)
|> Stream.map(fn line ->
case String.split(line, ~r/,\s*/) do
[name, file] -> {name, file}
|> Stream.map(fn line ->
case String.split(line, ~r/,\s*/) do
[name, file] -> {name, file}