diff options
-rw-r--r-- | app/models/web/push_subscription.rb | 2 | ||||
-rw-r--r-- | app/serializers/web/notification_serializer.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/models/web/push_subscription.rb b/app/models/web/push_subscription.rb index 79f782114..cb15dfa37 100644 --- a/app/models/web/push_subscription.rb +++ b/app/models/web/push_subscription.rb @@ -50,7 +50,7 @@ class Web::PushSubscription < ApplicationRecord auth: key_auth, ttl: ttl, vapid: { - subject: "mailto:#{Setting.site_contact_email}", + subject: "mailto:#{::Setting.site_contact_email}", private_key: Rails.configuration.x.vapid_private_key, public_key: Rails.configuration.x.vapid_public_key, } diff --git a/app/serializers/web/notification_serializer.rb b/app/serializers/web/notification_serializer.rb index 21a09f01e..e5524fe7a 100644 --- a/app/serializers/web/notification_serializer.rb +++ b/app/serializers/web/notification_serializer.rb @@ -121,7 +121,7 @@ class Web::NotificationSerializer < ActiveModel::Serializer attributes :title, :image, :badge, :tag, :timestamp, :icon - has_one :data + has_one :data, serializer: DataSerializer def title case object.type |