From: Eugen Rochko <eugen@zeonfederated.com>
Date: Tue, 22 May 2018 16:12:45 +0000 (+0200)
Subject: Do not encode HTML entities in initial Web Push payload body (#7592)
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=1a564df586acc4554bba7e3200ced5bcf2ea017e;p=mastodon.git

Do not encode HTML entities in initial Web Push payload body (#7592)
---

diff --git a/app/serializers/web/notification_serializer.rb b/app/serializers/web/notification_serializer.rb
index f3c4ffc47..43ba4d92a 100644
--- a/app/serializers/web/notification_serializer.rb
+++ b/app/serializers/web/notification_serializer.rb
@@ -33,6 +33,7 @@ class Web::NotificationSerializer < ActiveModel::Serializer
   end
 
   def body
-    truncate(strip_tags(object.target_status&.spoiler_text&.presence || object.target_status&.text || object.from_account.note), length: 140)
+    str = truncate(strip_tags(object.target_status&.spoiler_text&.presence || object.target_status&.text || object.from_account.note), length: 140)
+    HTMLEntities.new.decode(str.to_str) # Do not encode entities, since this value will not be used in HTML
   end
 end