diff options
| author | href <href@random.sh> | 2018-12-18 15:32:41 +0100 |
|---|---|---|
| committer | href <href@random.sh> | 2018-12-18 15:34:27 +0100 |
| commit | f58f20abbb761f652dbc6b44d213ebe90e305899 (patch) | |
| tree | ae60bb106f941748e7398c44c589b87d6983005e | |
| parent | b6ae412fcd7c67d64dd1467e8e35d17140e992df (diff) | |
| download | pleroma-f58f20abbb761f652dbc6b44d213ebe90e305899.tar.gz | |
Twitter ActivityView: fix crash when activity content is nil
| -rw-r--r-- | lib/pleroma/web/twitter_api/views/activity_view.ex | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/lib/pleroma/web/twitter_api/views/activity_view.ex b/lib/pleroma/web/twitter_api/views/activity_view.ex index 91d086740..bc90a1cd4 100644 --- a/lib/pleroma/web/twitter_api/views/activity_view.ex +++ b/lib/pleroma/web/twitter_api/views/activity_view.ex @@ -245,9 +245,11 @@ defmodule Pleroma.Web.TwitterAPI.ActivityView do |> Formatter.emojify(object["emoji"]) text = - content - |> String.replace(~r/<br\s?\/?>/, "\n") - |> HTML.strip_tags() + if content do + content + |> String.replace(~r/<br\s?\/?>/, "\n") + |> HTML.strip_tags() + end reply_parent = Activity.get_in_reply_to_activity(activity) |