alyssa
/
pleroma
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'hotfix/activity-without-content' into 'develop' 

Twitter ActivityView: fix crash with activity without content

See merge request pleroma/pleroma!572
This commit is contained in:
lambda 2018-12-23 13:17:25 +00:00
parent 093d39b634 f58f20abbb
commit a3e33fa177
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/pleroma/web/twitter_api/views/activity_view.ex
View File

@ -245,9 +245,11 @@ def render(
|> Formatter.emojify(object["emoji"]) |> Formatter.emojify(object["emoji"])
text = text =
if content do
content content
|> String.replace(~r/<br\s?\/?>/, "\n") |> String.replace(~r/<br\s?\/?>/, "\n")
|> HTML.strip_tags() |> HTML.strip_tags()
end
reply_parent = Activity.get_in_reply_to_activity(activity) reply_parent = Activity.get_in_reply_to_activity(activity)