From 1a564df586acc4554bba7e3200ced5bcf2ea017e Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Tue, 22 May 2018 18:12:45 +0200
Subject: [PATCH] Do not encode HTML entities in initial Web Push payload body
 (#7592)

---
 app/serializers/web/notification_serializer.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/serializers/web/notification_serializer.rb b/app/serializers/web/notification_serializer.rb
index f3c4ffc477..43ba4d92a2 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
-- 
GitLab