diff options
| author | Jorty <jorty@jort.space> | 2018-06-30 20:35:34 -0400 |
|---|---|---|
| committer | Jorty <jorty@jort.space> | 2018-06-30 21:31:08 -0400 |
| commit | 748fff6544cc70476bb0892a661d4d8c7f6ee295 (patch) | |
| tree | 7be2b78a8b44567d456329f00f2eb9b7b94c3021 /config | |
| parent | c171f9790bc2d6a1b215792ade1b1cfc7e458ac4 (diff) | |
| download | pleroma-748fff6544cc70476bb0892a661d4d8c7f6ee295.tar.gz pleroma-748fff6544cc70476bb0892a661d4d8c7f6ee295.zip | |
Fix auto-shortcode emoji
Emoji were broken due to `Pleroma.Formatter` not knowing about the
auto-shortcode emoji. This moves that logic from
`Pleroma.Web.TwitterAPI.UtilController` to `Pleroma.Formatter`.
Additionally, it's now possible to specify multiple shortcode globs, and
the default globs were changed to `["/emoji/custom/**/*.png"]`, since
that's in the .gitignore and the files there would have to be shortcode
emoji anyway.
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config/config.exs b/config/config.exs index 96350d064..0616fe4fb 100644 --- a/config/config.exs +++ b/config/config.exs @@ -12,7 +12,7 @@ config :pleroma, Pleroma.Repo, types: Pleroma.PostgresTypes config :pleroma, Pleroma.Upload, uploads: "uploads" -config :pleroma, :emoji, shortcode_glob: "/emoji/by-shortcode/**/*.png" +config :pleroma, :emoji, shortcode_globs: ["/emoji/custom/**/*.png"] # Configures the endpoint config :pleroma, Pleroma.Web.Endpoint, |