diff options
| author | lambda <lain@soykaf.club> | 2019-05-03 17:26:39 +0000 |
|---|---|---|
| committer | lambda <lain@soykaf.club> | 2019-05-03 17:26:39 +0000 |
| commit | 4948a73e3787a32140e433ded59be460ec29e8d7 (patch) | |
| tree | 9efa30a7f425eda2efe4ae3f36edc875dad73458 /lib/pleroma/web/twitter_api/twitter_api_controller.ex | |
| parent | 027ded0df799266d74d9680bd7ef24450efc910f (diff) | |
| parent | b5ad1715b2d4a2a5bdaefa2d56bde71120d23acb (diff) | |
| download | pleroma-4948a73e3787a32140e433ded59be460ec29e8d7.tar.gz | |
Merge branch 'bugfix/emoji-size' into 'develop'
Bugfix: emoji size in profile
Closes #269
See merge request pleroma/pleroma!792
Diffstat (limited to 'lib/pleroma/web/twitter_api/twitter_api_controller.ex')
| -rw-r--r-- | lib/pleroma/web/twitter_api/twitter_api_controller.ex | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/lib/pleroma/web/twitter_api/twitter_api_controller.ex b/lib/pleroma/web/twitter_api/twitter_api_controller.ex index 79ed9dad2..ef7b6fe65 100644 --- a/lib/pleroma/web/twitter_api/twitter_api_controller.ex +++ b/lib/pleroma/web/twitter_api/twitter_api_controller.ex @@ -9,6 +9,7 @@ defmodule Pleroma.Web.TwitterAPI.Controller do alias Ecto.Changeset alias Pleroma.Activity + alias Pleroma.Formatter alias Pleroma.Notification alias Pleroma.Object alias Pleroma.Repo @@ -653,7 +654,22 @@ defmodule Pleroma.Web.TwitterAPI.Controller do defp parse_profile_bio(user, params) do if bio = params["description"] do - Map.put(params, "bio", User.parse_bio(bio, user)) + emojis_text = (params["description"] || "") <> " " <> (params["name"] || "") + + emojis = + ((user.info.emoji || []) ++ Formatter.get_emoji_map(emojis_text)) + |> Enum.dedup() + + user_info = + user.info + |> Map.put( + "emoji", + emojis + ) + + params + |> Map.put("bio", User.parse_bio(bio, user)) + |> Map.put("info", user_info) else params end |