mirrors/pleroma
1
0
Fork 0
mirror of https://git.pleroma.social/pleroma/pleroma.git synced 2024-11-15 21:51:09 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse source 
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
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 @@ defmodule Pleroma.Web.TwitterAPI.ActivityView do
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)