Browse Source

Load an emoji.txt specific to the test env

youtube-fix
Mark Felder 3 years ago
parent
commit
887db076b5
3 changed files with 11 additions and 2 deletions
  1. +0
    -1
      config/emoji.txt
  2. +10
    -1
      lib/pleroma/emoji/loader.ex
  3. +1
    -0
      test/config/emoji.txt

+ 0
- 1
config/emoji.txt View File

@@ -1,4 +1,3 @@
firefox, /emoji/Firefox.gif, Gif,Fun
blank, /emoji/blank.png, Fun
dinosaur, /emoji/dino walking.gif, Gif
external_emoji, https://example.com/emoji.png

+ 10
- 1
lib/pleroma/emoji/loader.ex View File

@@ -77,10 +77,19 @@ defmodule Pleroma.Emoji.Loader do
# it should run even if there are no emoji packs
shortcode_globs = Config.get([:emoji, :shortcode_globs], [])

# for testing emoji.txt entries we do not want exposed in normal operation
test_emoji =
if Mix.env() == :test do
load_from_file("test/config/emoji.txt", emoji_groups)
else
[]
end

emojis_txt =
(load_from_file("config/emoji.txt", emoji_groups) ++
load_from_file("config/custom_emoji.txt", emoji_groups) ++
load_from_globs(shortcode_globs, emoji_groups))
load_from_globs(shortcode_globs, emoji_groups) ++
test_emoji)
|> Enum.reject(fn value -> value == nil end)

Enum.map(emojis ++ emojis_txt, &prepare_emoji/1)


+ 1
- 0
test/config/emoji.txt View File

@@ -0,0 +1 @@
external_emoji, https://example.com/emoji.png

Loading…
Cancel
Save