X-Git-Url: https://git.squeep.com/?a=blobdiff_plain;ds=inline;f=lib%2Fpleroma%2Femoji%2Floader.ex;h=03a6bca0b1ee4dfe0be0570469843a29f26ff540;hb=bae48c98e32af6c43fa668771c6253f299d4bf8a;hp=a29de0a33a152ee9e72efc42f70843ce2d598ea2;hpb=1a858134edabfe9a85e07fb801b9ed41649ba08a;p=akkoma
diff --git a/lib/pleroma/emoji/loader.ex b/lib/pleroma/emoji/loader.ex
index a29de0a33..03a6bca0b 100644
--- a/lib/pleroma/emoji/loader.ex
+++ b/lib/pleroma/emoji/loader.ex
@@ -1,5 +1,5 @@
# Pleroma: A lightweight social networking server
-# Copyright © 2017-2019 Pleroma Authors
+# Copyright © 2017-2020 Pleroma Authors
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Emoji.Loader do
@@ -99,7 +99,7 @@ defmodule Pleroma.Emoji.Loader do
contents["files"]
|> Enum.map(fn {name, rel_file} ->
filename = Path.join("/emoji/#{pack_name}", rel_file)
- {name, filename, pack_name}
+ {name, filename, ["pack:#{pack_name}"]}
end)
else
# Load from emoji.txt / all files
@@ -108,7 +108,7 @@ defmodule Pleroma.Emoji.Loader do
if File.exists?(emoji_txt) do
load_from_file(emoji_txt, emoji_groups)
else
- extensions = Pleroma.Config.get([:emoji, :pack_extensions])
+ extensions = Config.get([:emoji, :pack_extensions])
Logger.info(
"No emoji.txt found for pack \"#{pack_name}\", assuming all #{