sjw
/
pleroma
mirror of https://git.pleroma.social/sjw/pleroma.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Make emoji default_manifest a config option

This commit is contained in:
Ekaterina Vaartis 2019-04-18 20:48:57 +03:00
parent 98d4b3de53
commit 9bd5e2dec9
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
config/config.exs
View File

@ -102,7 +102,8 @@ config :pleroma, :emoji,
# Put groups that have higher priority than defaults here. Example in `docs/config/custom_emoji.md` # Put groups that have higher priority than defaults here. Example in `docs/config/custom_emoji.md`
Finmoji: ["/finmoji/128px/*-128.png"], Finmoji: ["/finmoji/128px/*-128.png"],
Custom: ["/emoji/*.png", "/emoji/custom/*.png"] Custom: ["/emoji/*.png", "/emoji/custom/*.png"]
] ],
default_manifest: "https://git.pleroma.social/vaartis/emoji-index/raw/master/index.json"
config :pleroma, :uri_schemes, config :pleroma, :uri_schemes,
valid_schemes: [ valid_schemes: [

2
lib/mix/tasks/pleroma/emoji.ex
View File

@ -9,7 +9,7 @@ defmodule Mix.Tasks.Pleroma.Emoji do
@moduledoc """ @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 def run(["ls-packs" | args]) do
Application.ensure_all_started(:hackney) Application.ensure_all_started(:hackney)