gitea/nas
1
0
Fork 2
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Fix #61 - Add list of blocked users to the UI; clean up failed push notifications API

Browse source 
Try to fix Travis CI setup
This commit is contained in:
Eugen Rochko 2017-02-05 19:18:11 +01:00
parent 77e13c2bc9
commit 920ba5fc4e
16 changed files with 186 additions and 69 deletions
Download patch file Download diff file Expand all files Collapse all files

5
app/services/notify_service.rb
View file

@ -10,7 +10,6 @@ class NotifyService < BaseService
create_notification
send_email if email_enabled?
send_push_notification
rescue ActiveRecord::RecordInvalid
return
end
@ -58,10 +57,6 @@ class NotifyService < BaseService
NotificationMailer.send(@notification.type, @recipient, @notification).deliver_later
end
def send_push_notification
PushNotificationWorker.perform_async(@notification.id)
end
def email_enabled?
@recipient.user.settings.notification_emails[@notification.type]
end

28
app/services/send_push_notification_service.rb
View file

@ -1,28 +0,0 @@
# frozen_string_literal: true
class SendPushNotificationService < BaseService
def call(notification)
return if ENV['FCM_API_KEY'].blank?
devices = Device.where(account: notification.account).pluck(:registration_id)
fcm = FCM.new(ENV['FCM_API_KEY'])
response = fcm.send(devices, data: { notification_id: notification.id }, collapse_key: :notifications, priority: :high)
handle_response(response)
end
private
def handle_response(response)
update_canonical_ids(response[:canonical_ids]) if response[:canonical_ids]
remove_bad_ids(response[:not_registered_ids]) if response[:not_registered_ids]
end
def update_canonical_ids(ids)
ids.each { |pair| Device.find_by(registration_id: pair[:old]).update(registration_id: pair[:new]) }
end
def remove_bad_ids(bad_ids)
Device.where(registration_id: bad_ids).delete_all unless bad_ids.empty?
end
end