M Gemfile.lock => Gemfile.lock +1 -1
@@ 616,7 616,7 @@ GEM
rubocop-performance (1.18.0)
rubocop (>= 1.7.0, < 2.0)
rubocop-ast (>= 0.4.0)
- rubocop-rails (2.19.1)
+ rubocop-rails (2.20.2)
activesupport (>= 4.2.0)
rack (>= 1.1)
rubocop (>= 1.33.0, < 2.0)
M app/serializers/web/notification_serializer.rb => app/serializers/web/notification_serializer.rb +1 -1
@@ 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