diff options
| author | Roger Braun <roger@rogerbraun.net> | 2017-06-19 18:06:58 +0200 |
|---|---|---|
| committer | Roger Braun <roger@rogerbraun.net> | 2017-06-19 18:06:58 +0200 |
| commit | 45c751985ee1612bd788c460ee1f6aca75f24464 (patch) | |
| tree | 52eba9b3f8fd07d15e8aba88cf8da6760d553dfe /lib | |
| parent | 66b4fee80ebad58d3a7ed2457d522e8f862d9e71 (diff) | |
| download | pleroma-45c751985ee1612bd788c460ee1f6aca75f24464.tar.gz | |
Move finmojis to representation.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/web/twitter_api/representers/activity_representer.ex | 3 | ||||
| -rw-r--r-- | lib/pleroma/web/twitter_api/utils.ex | 1 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/pleroma/web/twitter_api/representers/activity_representer.ex b/lib/pleroma/web/twitter_api/representers/activity_representer.ex index adb3f89ea..8630f4f79 100644 --- a/lib/pleroma/web/twitter_api/representers/activity_representer.ex +++ b/lib/pleroma/web/twitter_api/representers/activity_representer.ex @@ -4,6 +4,7 @@ defmodule Pleroma.Web.TwitterAPI.Representers.ActivityRepresenter do alias Pleroma.{Activity, User} alias Calendar.Strftime alias Pleroma.Web.TwitterAPI.TwitterAPI + alias Pleroma.Formatter defp user_by_ap_id(user_list, ap_id) do Enum.find(user_list, fn (%{ap_id: user_id}) -> ap_id == user_id end) @@ -92,7 +93,7 @@ defmodule Pleroma.Web.TwitterAPI.Representers.ActivityRepresenter do "id" => activity.id, "user" => UserRepresenter.to_map(user, opts), "attentions" => [], - "statusnet_html" => HtmlSanitizeEx.basic_html(content), + "statusnet_html" => HtmlSanitizeEx.basic_html(content) |> Formatter.finmojifiy, "text" => HtmlSanitizeEx.strip_tags(content), "is_local" => true, "is_post_verb" => true, diff --git a/lib/pleroma/web/twitter_api/utils.ex b/lib/pleroma/web/twitter_api/utils.ex index 122edfdd4..5cbe0cf9c 100644 --- a/lib/pleroma/web/twitter_api/utils.ex +++ b/lib/pleroma/web/twitter_api/utils.ex @@ -22,7 +22,6 @@ defmodule Pleroma.Web.TwitterAPI.Utils do |> Formatter.linkify |> String.replace("\n", "<br>\n") |> add_user_links(mentions) - |> Formatter.finmojifiy end def add_user_links(text, mentions) do |