From: Ekaterina Vaartis <vaartis@cock.li>
Date: Thu, 18 Apr 2019 17:48:57 +0000 (+0300)
Subject: Make emoji default_manifest a config option
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=9bd5e2dec9ce0b23f287b3ea6ad375280d92bb7b;p=akkoma

Make emoji default_manifest a config option
---

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)