diff options
| author | lambda <lain@soykaf.club> | 2019-04-08 09:50:00 +0000 |
|---|---|---|
| committer | lambda <lain@soykaf.club> | 2019-04-08 09:50:00 +0000 |
| commit | 23067908de957bb1e7ad2c87e64ae91e4328cb87 (patch) | |
| tree | 2c75327c2b35d5759eb971d5486a7f30bef8d386 /config | |
| parent | b177e1e7f330ff1531be190949db7f75e378a449 (diff) | |
| parent | 7410aee886fbb38615bb595b8b7be0722761a0a4 (diff) | |
| download | pleroma-23067908de957bb1e7ad2c87e64ae91e4328cb87.tar.gz pleroma-23067908de957bb1e7ad2c87e64ae91e4328cb87.zip | |
Merge branch 'feature/770-add-emoji-tags' into 'develop'
Feature/770 add emoji tags
See merge request pleroma/pleroma!998
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 8 | ||||
| -rw-r--r-- | config/emoji.txt | 5 |
2 files changed, 9 insertions, 4 deletions
diff --git a/config/config.exs b/config/config.exs index 8a977ece5..5d959a859 100644 --- a/config/config.exs +++ b/config/config.exs @@ -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: [ diff --git a/config/emoji.txt b/config/emoji.txt index 7afacb09f..79246f239 100644 --- a/config/emoji.txt +++ b/config/emoji.txt @@ -1,5 +1,5 @@ -firefox, /emoji/Firefox.gif -blank, /emoji/blank.png +firefox, /emoji/Firefox.gif, Gif,Fun +blank, /emoji/blank.png, Fun f_00b, /emoji/f_00b.png f_00b11b, /emoji/f_00b11b.png f_00b33b, /emoji/f_00b33b.png @@ -28,4 +28,3 @@ f_33b00b, /emoji/f_33b00b.png f_33b22b, /emoji/f_33b22b.png f_33h, /emoji/f_33h.png f_33t, /emoji/f_33t.png - |