diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2018-05-23 16:05:19 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2018-05-23 16:05:19 +0200 |
| commit | e0ef89c73f6b380a2841b9dcde07725d515340a4 (patch) | |
| tree | 3e96aef309d0ce02649fc115abb4eb4f3020beb2 /app/serializers | |
| parent | 2289250f69e78a8888f8fc4db7ec24a1049c161e (diff) | |
| parent | d8864b9e9d4fd56606a3b809bedeb1216b6620ae (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Diffstat (limited to 'app/serializers')
| -rw-r--r-- | app/serializers/web/notification_serializer.rb | 3 |
1 files changed, 2 insertions, 1 deletions
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 |