diff options
| author | ensra <ensra@users.noreply.github.com> | 2018-08-21 14:12:55 +0100 |
|---|---|---|
| committer | ensra <ensra@users.noreply.github.com> | 2018-08-21 14:12:55 +0100 |
| commit | cdb3dd48ab7177a21e1cdcef4bcff00bf5dc124f (patch) | |
| tree | 46b867cd5396ae9a22708f13f0394af7b231b9aa /lib | |
| parent | 5debd7b5cc31a6dedd8d0c8bc177be2cd1b995aa (diff) | |
| download | pleroma-cdb3dd48ab7177a21e1cdcef4bcff00bf5dc124f.tar.gz | |
Format
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/web/twitter_api/twitter_api_controller.ex | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/pleroma/web/twitter_api/twitter_api_controller.ex b/lib/pleroma/web/twitter_api/twitter_api_controller.ex index dfa6d2464..b3a56b27e 100644 --- a/lib/pleroma/web/twitter_api/twitter_api_controller.ex +++ b/lib/pleroma/web/twitter_api/twitter_api_controller.ex @@ -415,15 +415,16 @@ defmodule Pleroma.Web.TwitterAPI.Controller do if bio = params["description"] do mentions = Formatter.parse_mentions(bio) tags = Formatter.parse_tags(bio) + emoji = (user.info["source_data"]["tag"] || []) |> Enum.filter(fn %{"type" => t} -> t == "Emoji" end) |> Enum.map(fn %{"icon" => %{"url" => url}, "name" => name} -> {String.trim(name, ":"), url} end) + bio_html = CommonUtils.format_input(bio, mentions, tags) - |> Formatter.emojify(emoji) - Map.put(params, "bio", bio_html) + Map.put(params, "bio", bio_html |> Formatter.emojify(emoji)) else params end |