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

Fix text being nullable in TwitterAPI See merge request pleroma/pleroma!966
2019-03-22 21:17:00 +00:00 · 2019-03-22 21:17:00 +00:00 · 8b18955a59
commit 8b18955a59
parent fee360e581 1b33986bfa
1 changed files with 2 additions and 0 deletions
--- a/lib/pleroma/web/twitter_api/views/activity_view.ex
+++ b/lib/pleroma/web/twitter_api/views/activity_view.ex
@ -266,6 +266,8 @@ def render(
        content
        |> String.replace(~r/<br\s?\/?>/, "\n")
        |> HTML.get_cached_stripped_html_for_object(activity, __MODULE__)
+      else
+        ""
      end

    reply_parent = Activity.get_in_reply_to_activity(activity)