logo

pleroma

My custom branche(s) on git.pleroma.social/pleroma/pleroma git clone https://hacktivis.me/git/pleroma.git
commit: 49741961f234816c1fff278adca397e9ff7cabe7
parent a7864a94295eedaee1c2ad0829c9b668c7acd705
Author: Haelwenn <contact+git.pleroma.social@hacktivis.me>
Date:   Thu,  4 Feb 2021 14:05:30 +0000

Merge branch 'chore/external-emoji-example' into 'develop'

Stop external emoji example from leaking

See merge request pleroma/pleroma!3302

Diffstat:

Mconfig/emoji.txt1-
Mlib/pleroma/emoji/loader.ex11++++++++++-
Atest/config/emoji.txt1+
3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/config/emoji.txt b/config/emoji.txt @@ -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 diff --git a/lib/pleroma/emoji/loader.ex b/lib/pleroma/emoji/loader.ex @@ -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) diff --git a/test/config/emoji.txt b/test/config/emoji.txt @@ -0,0 +1 @@ +external_emoji, https://example.com/emoji.png