tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge commit '3ed9b55cb3987e3d32c56f857cb6903ca8bec3d4' into glitch-soc/merge-upstream

Browse Source
This commit is contained in:
Claire
2023-07-13 14:02:28 +02:00
parent 0870c7c95e 3ed9b55cb3
commit 177497b367
8 changed files with 116 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/serializers/web/notification_serializer.rb
View File

@@ -33,7 +33,7 @@ class Web::NotificationSerializer < ActiveModel::Serializer
end
def body
str = strip_tags(object.target_status&.spoiler_text&.presence || object.target_status&.text || object.from_account.note)
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, escape: false) # Do not encode entities, since this value will not be used in HTML
end
end