diff options
author | kaniini <nenolod@gmail.com> | 2018-08-26 23:24:41 +0000 |
---|---|---|
committer | kaniini <nenolod@gmail.com> | 2018-08-26 23:24:41 +0000 |
commit | 63094cfd3ec0a9ca6e17a3ba6fa8271050cfb9b0 (patch) | |
tree | af47338befa0fc1d54bd6076c7aaba4bd0e10357 /lib/pleroma/web/common_api/utils.ex | |
parent | 927be2c62b40fafdfd3eabba768bccf428d4c74d (diff) | |
parent | 86dca3964084c3c1b1a9c0d051ac5e214ff03c94 (diff) | |
download | pleroma-63094cfd3ec0a9ca6e17a3ba6fa8271050cfb9b0.tar.gz |
Merge branch 'feature/emoji-in-local-users' into 'develop'
Add emoji to local user profiles.
Closes #202
See merge request pleroma/pleroma!271
Diffstat (limited to 'lib/pleroma/web/common_api/utils.ex')
-rw-r--r-- | lib/pleroma/web/common_api/utils.ex | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/lib/pleroma/web/common_api/utils.ex b/lib/pleroma/web/common_api/utils.ex index 869f4c566..358ca22ac 100644 --- a/lib/pleroma/web/common_api/utils.ex +++ b/lib/pleroma/web/common_api/utils.ex @@ -1,6 +1,7 @@ defmodule Pleroma.Web.CommonAPI.Utils do alias Pleroma.{Repo, Object, Formatter, Activity} alias Pleroma.Web.ActivityPub.Utils + alias Pleroma.Web.Endpoint alias Pleroma.User alias Calendar.Strftime alias Comeonin.Pbkdf2 @@ -195,4 +196,15 @@ defmodule Pleroma.Web.CommonAPI.Utils do _ -> {:error, "Invalid password."} end end + + def emoji_from_profile(%{info: info} = user) do + (Formatter.get_emoji(user.bio) ++ Formatter.get_emoji(user.name)) + |> Enum.map(fn {shortcode, url} -> + %{ + "type" => "Emoji", + "icon" => %{"type" => "Image", "url" => "#{Endpoint.url()}#{url}"}, + "name" => ":#{shortcode}:" + } + end) + end end |