diff options
| author | Alex S <alex.strizhakov@gmail.com> | 2019-04-01 17:17:57 +0700 |
|---|---|---|
| committer | Alex S <alex.strizhakov@gmail.com> | 2019-04-01 17:17:57 +0700 |
| commit | 3601f03147bd104f6acff64e7c8d5d4d3e1f53a2 (patch) | |
| tree | 9575002d2291587dc3080fdd3b65144d6535bfef /config | |
| parent | dc39d8d3fb941bad9fe26586c321bb00a0b92fe4 (diff) | |
| download | pleroma-3601f03147bd104f6acff64e7c8d5d4d3e1f53a2.tar.gz pleroma-3601f03147bd104f6acff64e7c8d5d4d3e1f53a2.zip | |
Adding tag to emoji ets table
changes in apis
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 7 | ||||
| -rw-r--r-- | config/emoji.txt | 5 |
2 files changed, 8 insertions, 4 deletions
diff --git a/config/config.exs b/config/config.exs index 0df38d75a..245c7d268 100644 --- a/config/config.exs +++ b/config/config.exs @@ -54,7 +54,12 @@ 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"], + custom_tag: "Custom", + finmoji_tag: "Finmoji", + emoji_tag: "Emoji", + custom_emoji_tag: "Custom" 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 - |