diff options
| author | rinpatch <rinpatch@sdf.org> | 2019-03-22 21:17:00 +0000 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2019-03-22 21:17:00 +0000 |
| commit | 8b18955a5989b1c1855c06d897f572fcf4938760 (patch) | |
| tree | a0bbf58977446be710656a70ec440ae46934bf21 | |
| parent | fee360e581d9aced145d21429eba5a63b3f682d1 (diff) | |
| parent | 1b33986bfa3e924d49e0b37228979ed5f8f82d8c (diff) | |
| download | pleroma-8b18955a5989b1c1855c06d897f572fcf4938760.tar.gz | |
Merge branch 'hotfix/null-content' into 'develop'
Fix text being nullable in TwitterAPI
See merge request pleroma/pleroma!966
| -rw-r--r-- | lib/pleroma/web/twitter_api/views/activity_view.ex | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/pleroma/web/twitter_api/views/activity_view.ex b/lib/pleroma/web/twitter_api/views/activity_view.ex index fe7d49975..aa1d41fa2 100644 --- a/lib/pleroma/web/twitter_api/views/activity_view.ex +++ b/lib/pleroma/web/twitter_api/views/activity_view.ex @@ -266,6 +266,8 @@ defmodule Pleroma.Web.TwitterAPI.ActivityView do 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) |