diff options
| author | Haelwenn (lanodan) Monnier <contact@hacktivis.me> | 2019-02-12 14:59:34 +0100 |
|---|---|---|
| committer | Haelwenn (lanodan) Monnier <contact@hacktivis.me> | 2019-05-03 16:27:50 +0200 |
| commit | 2f76a40d028c45e99425b061298a1b05e4b59923 (patch) | |
| tree | 6a3f9ee4e90915dd6d44422f92969b3d856b44c2 /lib/pleroma/web/twitter_api/twitter_api_controller.ex | |
| parent | d70af32127bda1431bacad58e7c6516a2e652fcd (diff) | |
| download | pleroma-2f76a40d028c45e99425b061298a1b05e4b59923.tar.gz | |
formatter.ex: Add get_emoji_map/1
Diffstat (limited to 'lib/pleroma/web/twitter_api/twitter_api_controller.ex')
| -rw-r--r-- | lib/pleroma/web/twitter_api/twitter_api_controller.ex | 12 |
1 files changed, 11 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..261cc4462 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,16 @@ 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)) + user_info = + user.info + |> Map.put( + "emojis", + Formatter.get_emoji_map(params["description"]) + ) + + params + |> Map.put("bio", User.parse_bio(bio, user)) + |> Map.put("info", user_info) else params end |