moon
/
honkoma
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'hotfix/null-content' into 'develop' 

Fix text being nullable in TwitterAPI

See merge request pleroma/pleroma!966
This commit is contained in:
rinpatch 2019-03-22 21:17:00 +00:00
parent fee360e581 1b33986bfa
commit 8b18955a59
1 changed files with 2 additions and 0 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

@ -266,6 +266,8 @@ def render(
content content
|> String.replace(~r/<br\s?\/?>/, "\n") |> String.replace(~r/<br\s?\/?>/, "\n")
|> HTML.get_cached_stripped_html_for_object(activity, __MODULE__) |> HTML.get_cached_stripped_html_for_object(activity, __MODULE__)
else
""
end end
reply_parent = Activity.get_in_reply_to_activity(activity) reply_parent = Activity.get_in_reply_to_activity(activity)