Merge branch 'emoji-alphabetical-ordering' into 'develop'

[akkoma] / lib / pleroma / emoji.ex

diff --git a/lib/pleroma/emoji.ex b/lib/pleroma/emoji.ex
index 7da1a24383406781f35c155791356256dbddb129..523dea65299370e6f56e51717a5aa49a7be226a3 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
-  @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