diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-04-25 18:28:27 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-25 18:28:27 +0200 |
| commit | a481af15a9b2a7829c2a849906aa4b475ccdbd98 (patch) | |
| tree | 2316623ed73758bd1d61477d94aee3492744933c /app/serializers | |
| parent | bb12af7250c9368905bae7d91c6ff0b06f3aa400 (diff) | |
| parent | 002d2729fb342ec899d4322bbd64331da7d22a03 (diff) | |
Merge pull request #1750 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/serializers')
| -rw-r--r-- | app/serializers/web/notification_serializer.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/serializers/web/notification_serializer.rb b/app/serializers/web/notification_serializer.rb index ee83ec8b2..c5a908b19 100644 --- a/app/serializers/web/notification_serializer.rb +++ b/app/serializers/web/notification_serializer.rb @@ -34,6 +34,6 @@ class Web::NotificationSerializer < ActiveModel::Serializer def body 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 + truncate(HTMLEntities.new.decode(str.to_str), length: 140, escape: false) # Do not encode entities, since this value will not be used in HTML end end |