mirrors/pleroma
1
0
Fork 0
mirror of https://git.pleroma.social/pleroma/pleroma.git synced 2024-12-23 16:40:29 +00:00
Code Issues Projects Releases Wiki Activity

Move finmojis to representation.

Browse source
This commit is contained in:
Roger Braun 2017-06-19 18:06:58 +02:00
parent 66b4fee80e
commit 45c751985e
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib/pleroma/web/twitter_api/representers/activity_representer.ex
View file

@ -4,6 +4,7 @@ defmodule Pleroma.Web.TwitterAPI.Representers.ActivityRepresenter do
alias Pleroma.{Activity, User} alias Pleroma.{Activity, User}
alias Calendar.Strftime alias Calendar.Strftime
alias Pleroma.Web.TwitterAPI.TwitterAPI alias Pleroma.Web.TwitterAPI.TwitterAPI
alias Pleroma.Formatter
defp user_by_ap_id(user_list, ap_id) do defp user_by_ap_id(user_list, ap_id) do
Enum.find(user_list, fn (%{ap_id: user_id}) -> ap_id == user_id end) 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, "id" => activity.id,
"user" => UserRepresenter.to_map(user, opts), "user" => UserRepresenter.to_map(user, opts),
"attentions" => [], "attentions" => [],
"statusnet_html" => HtmlSanitizeEx.basic_html(content), "statusnet_html" => HtmlSanitizeEx.basic_html(content) |> Formatter.finmojifiy,
"text" => HtmlSanitizeEx.strip_tags(content), "text" => HtmlSanitizeEx.strip_tags(content),
"is_local" => true, "is_local" => true,
"is_post_verb" => true, "is_post_verb" => true,

1
lib/pleroma/web/twitter_api/utils.ex
View file

@ -22,7 +22,6 @@ defmodule Pleroma.Web.TwitterAPI.Utils do
|> Formatter.linkify |> Formatter.linkify
|> String.replace("\n", "<br>\n") |> String.replace("\n", "<br>\n")
|> add_user_links(mentions) |> add_user_links(mentions)
|> Formatter.finmojifiy
end end
def add_user_links(text, mentions) do def add_user_links(text, mentions) do