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

Twitter ActivityView: fix crash with activity without content See merge request pleroma/pleroma!572
2018-12-23 13:17:25 +00:00 · 2018-12-23 13:17:25 +00:00 · a3e33fa177
commit a3e33fa177
parent 093d39b634 f58f20abbb
1 changed files with 5 additions and 3 deletions
--- a/lib/pleroma/web/twitter_api/views/activity_view.ex
+++ b/lib/pleroma/web/twitter_api/views/activity_view.ex
@ -245,9 +245,11 @@ def render(
      |> Formatter.emojify(object["emoji"])

    text =
+      if content do
        content
        |> String.replace(~r/<br\s?\/?>/, "\n")
        |> HTML.strip_tags()
+      end

    reply_parent = Activity.get_in_reply_to_activity(activity)