hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Added get_stripped_html_for_object. Renamed a few things

Browse source
This commit is contained in:
Rin Toshaka 2018-12-30 16:51:16 +01:00
commit d9f40b05b3
3 changed files with 32 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

5
lib/pleroma/web/twitter_api/views/activity_view.ex
View file

@ -15,7 +15,6 @@ defmodule Pleroma.Web.TwitterAPI.ActivityView do
alias Pleroma.User
alias Pleroma.Repo
alias Pleroma.Formatter
alias Pleroma.HTML
import Ecto.Query
require Logger
@ -245,14 +244,14 @@ defmodule Pleroma.Web.TwitterAPI.ActivityView do
html =
content
|> Utils.get_scrubbed_html(User.html_filter_policy(opts[:for]), activity)
|> Utils.get_scrubbed_html_for_object(User.html_filter_policy(opts[:for]), activity)
|> Formatter.emojify(object["emoji"])
text =
if content do
content
|> String.replace(~r/<br\s?\/?>/, "\n")
|> HTML.strip_tags()
|> Utils.get_stripped_html_for_object(activity)
end
reply_parent = Activity.get_in_reply_to_activity(activity)