diff options
author | Thibaut Girka <thib@sitedethib.com> | 2018-08-24 13:34:51 +0200 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2018-08-24 15:10:34 +0200 |
commit | 246c313d457397f412f9fb5eed3ee02cf5d9a561 (patch) | |
tree | 4c8d12cc031476870a918bec3b3000f899101a32 /app/serializers/web/notification_serializer.rb | |
parent | 0ddf439999b05b5dfd6d5a5257327fa7d3565e65 (diff) | |
parent | a2cabf3f4af9271d8bfdb13c1ae2b7a8b4e6fb88 (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: app/controllers/application_controller.rb Changed instance theme selection by instance flavour selection.
Diffstat (limited to 'app/serializers/web/notification_serializer.rb')
-rw-r--r-- | app/serializers/web/notification_serializer.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/serializers/web/notification_serializer.rb b/app/serializers/web/notification_serializer.rb index 43ba4d92a..ee83ec8b2 100644 --- a/app/serializers/web/notification_serializer.rb +++ b/app/serializers/web/notification_serializer.rb @@ -33,7 +33,7 @@ class Web::NotificationSerializer < ActiveModel::Serializer end def body - 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 + str = strip_tags(object.target_status&.spoiler_text&.presence || object.target_status&.text || object.from_account.note) + truncate(HTMLEntities.new.decode(str.to_str), length: 140) # Do not encode entities, since this value will not be used in HTML end end |