diff options
| author | Ekaterina Vaartis <vaartis@cock.li> | 2019-04-18 20:48:57 +0300 |
|---|---|---|
| committer | Ekaterina Vaartis <vaartis@cock.li> | 2019-04-20 11:17:17 +0300 |
| commit | 9bd5e2dec9ce0b23f287b3ea6ad375280d92bb7b (patch) | |
| tree | 00b4d321d7c58181a51ca5efe0a61c0a16fbb699 | |
| parent | 98d4b3de53a5eaf412e3b200d4f0ed04c9c4622d (diff) | |
| download | pleroma-9bd5e2dec9ce0b23f287b3ea6ad375280d92bb7b.tar.gz | |
Make emoji default_manifest a config option
| -rw-r--r-- | config/config.exs | 3 | ||||
| -rw-r--r-- | lib/mix/tasks/pleroma/emoji.ex | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/config/config.exs b/config/config.exs index edb4195d0..fcad55bbe 100644 --- a/config/config.exs +++ b/config/config.exs @@ -102,7 +102,8 @@ config :pleroma, :emoji, # Put groups that have higher priority than defaults here. Example in `docs/config/custom_emoji.md` Finmoji: ["/finmoji/128px/*-128.png"], Custom: ["/emoji/*.png", "/emoji/custom/*.png"] - ] + ], + default_manifest: "https://git.pleroma.social/vaartis/emoji-index/raw/master/index.json" config :pleroma, :uri_schemes, valid_schemes: [ diff --git a/lib/mix/tasks/pleroma/emoji.ex b/lib/mix/tasks/pleroma/emoji.ex index 9cb6fb88d..8261c2122 100644 --- a/lib/mix/tasks/pleroma/emoji.ex +++ b/lib/mix/tasks/pleroma/emoji.ex @@ -9,7 +9,7 @@ defmodule Mix.Tasks.Pleroma.Emoji do @moduledoc """ """ - @default_manifest "https://git.pleroma.social/vaartis/emoji-index/raw/master/index.json" + @default_manifest Pleroma.Config.get!([:emoji, :default_manifest]) def run(["ls-packs" | args]) do Application.ensure_all_started(:hackney) |