diff options
author | ThibG <thib@sitedethib.com> | 2018-08-26 13:23:52 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-08-26 13:23:52 +0200 |
commit | 2903f8f36b7c41b77de4ad6c8c5b0a6c0b2a7ace (patch) | |
tree | 4c8d12cc031476870a918bec3b3000f899101a32 /app/serializers/web | |
parent | 0ddf439999b05b5dfd6d5a5257327fa7d3565e65 (diff) | |
parent | 246c313d457397f412f9fb5eed3ee02cf5d9a561 (diff) |
Merge pull request #671 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/serializers/web')
-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 |