aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/web/twitter_api/twitter_api_controller.ex
diff options
context:
space:
mode:
authorJorty <jorty@jort.space>2018-06-30 20:35:34 -0400
committerJorty <jorty@jort.space>2018-06-30 21:31:08 -0400
commit748fff6544cc70476bb0892a661d4d8c7f6ee295 (patch)
tree7be2b78a8b44567d456329f00f2eb9b7b94c3021 /lib/pleroma/web/twitter_api/twitter_api_controller.ex
parentc171f9790bc2d6a1b215792ade1b1cfc7e458ac4 (diff)
downloadpleroma-748fff6544cc70476bb0892a661d4d8c7f6ee295.tar.gz
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 'lib/pleroma/web/twitter_api/twitter_api_controller.ex')
0 files changed, 0 insertions, 0 deletions