about summary refs log tree commit diff
path: root/app/models/web/push_subscription.rb
diff options
context:
space:
mode:
authorDavid Yip <yipdw@member.fsf.org>2017-11-16 22:52:37 -0600
committerDavid Yip <yipdw@member.fsf.org>2017-11-16 22:52:37 -0600
commitb28b405b9763a0bb3df653b51e6d084b42e9a54d (patch)
treec69f1ccb99440fea8cc94014e77687238e205160 /app/models/web/push_subscription.rb
parentee560abdbe7a2caf0f7ac6137faf248bbaff9a93 (diff)
parentdc6e031364d1f47a49ea47f20070a4e9986a4c68 (diff)
Merge remote-tracking branch 'origin/master' into gs-master
Diffstat (limited to 'app/models/web/push_subscription.rb')
-rw-r--r--app/models/web/push_subscription.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/models/web/push_subscription.rb b/app/models/web/push_subscription.rb
index da67e7665..a41906227 100644
--- a/app/models/web/push_subscription.rb
+++ b/app/models/web/push_subscription.rb
@@ -24,12 +24,12 @@ class Web::PushSubscription < ApplicationRecord
   end
 
   def pushable?(notification)
-    data && data.key?('alerts') && data['alerts'][notification.type.to_s]
+    data&.key?('alerts') && data['alerts'][notification.type.to_s]
   end
 
   def as_payload
     payload = { id: id, endpoint: endpoint }
-    payload[:alerts] = data['alerts'] if data && data.key?('alerts')
+    payload[:alerts] = data['alerts'] if data&.key?('alerts')
     payload
   end