erik/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2024-08-20 21:08:15 -07:00
Code Issues Projects Releases Wiki Activity

Merge 33c1e2858e into a50c8e951f

Browse source
This commit is contained in:
Bei Li 2024-07-31 14:05:07 +00:00 committed by GitHub
commit 5e7d7fc7c5
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/serializers/web/notification_serializer.rb
View file

@ -6,7 +6,7 @@ class Web::NotificationSerializer < ActiveModel::Serializer
include ActionView::Helpers::SanitizeHelper
attributes :access_token, :preferred_locale, :notification_id,
:notification_type, :icon, :title, :body
:notification_type, :icon, :display_name, :title, :body
def access_token
current_push_subscription.associated_access_token
@ -28,8 +28,12 @@ class Web::NotificationSerializer < ActiveModel::Serializer
full_asset_url(object.from_account.avatar_static_url)
end
def display_name
object.from_account.display_name.presence || object.from_account.username
end
def title
I18n.t("notification_mailer.#{object.type}.subject", name: object.from_account.display_name.presence || object.from_account.username)
I18n.t("notification_mailer.#{object.type}.subject", name: display_name)
end
def body