hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'feature/770-add-emoji-tags' into 'develop'

Browse source 
Feature/770 add emoji tags

See merge request pleroma/pleroma!998
This commit is contained in:
lambda 2019-04-08 09:50:00 +00:00
commit 23067908de
15 changed files with 270 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

8
config/config.exs
View file

@ -58,7 +58,13 @@ config :pleroma, Pleroma.Uploaders.MDII,
cgi: "https://mdii.sakura.ne.jp/mdii-post.cgi",
files: "https://mdii.sakura.ne.jp"
config :pleroma, :emoji, shortcode_globs: ["/emoji/custom/**/*.png"]
config :pleroma, :emoji,
shortcode_globs: ["/emoji/custom/**/*.png"],
groups: [
# 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"]
]
config :pleroma, :uri_schemes,
valid_schemes: [