pleroma

commit: f114f843248d207ff240b018a774ce32c34b6eaf
parent: 4fab4e9ba44cdedccb9cf92a0d9b590a654bba69
Author: Haelwenn <git.pleroma.social@hacktivis.me>
Date:   Thu,  1 Nov 2018 14:14:05 +0000

Merge branch 'hotfix/prismo-twitterapi' into 'develop'

Pleroma.Web.TwitterAPI.ActivityView: Harden TwitterAPI against remnant of prismo

Closes #353

See merge request pleroma/pleroma!415
Diffstat:
M
lib/pleroma/web/twitter_api/views/activity_view.ex
2
+-

1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/pleroma/web/twitter_api/views/activity_view.ex b/lib/pleroma/web/twitter_api/views/activity_view.ex
@@ -287,7 +287,7 @@ defmodule Pleroma.Web.TwitterAPI.ActivityView do
     summary = object["name"] || object["summary"]
 
     content =
-      if !!summary and summary != "" do
+      if !!summary and summary != "" and is_bitstring(object["url"]) do
         "<p><a href=\"#{object["url"]}\">#{summary}</a></p>#{object["content"]}"
       else
         object["content"]