X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Femoji.ex;h=bedad99d67c0ed870d14814f4257ff6b793dad12;hb=059dd6f681caf14ee9d288ec14b82132be29ae2c;hp=7da1a24383406781f35c155791356256dbddb129;hpb=fd0e7d18d96fb242088d8c6bb7ea5e1eb7053ce8;p=akkoma

diff --git a/lib/pleroma/emoji.ex b/lib/pleroma/emoji.ex
index 7da1a2438..bedad99d6 100644
--- a/lib/pleroma/emoji.ex
+++ b/lib/pleroma/emoji.ex
@@ -10,7 +10,7 @@ defmodule Pleroma.Emoji do
   """
   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
@@ -153,7 +153,7 @@ defmodule Pleroma.Emoji do
     end)
   end
 
-  defp load_finmoji(_), do: :ok
+  defp load_finmoji(_), 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
-    |> 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}