mirror of
https://github.com/discourse/discourse.git
synced 2024-11-25 20:33:38 +08:00
0954ae70a6
This change ensures native push notifications respect the site setting for push_notification_time_window_mins. Previously only web push notifications would account for the delay, now we can bring more consistency between Discourse in browser vs Hub, by applying the same delay strategy to both forms of push notifications.
55 lines
1.7 KiB
Ruby
55 lines
1.7 KiB
Ruby
# frozen_string_literal: true
|
|
|
|
module Jobs
|
|
class PushNotification < ::Jobs::Base
|
|
def execute(args)
|
|
user = User.find_by(id: args["user_id"])
|
|
push_window = SiteSetting.push_notification_time_window_mins
|
|
return if !user || (push_window > 0 && user.seen_since?(push_window.minutes.ago))
|
|
|
|
notification = args["payload"]
|
|
notification["url"] = UrlHelper.absolute_without_cdn(
|
|
Discourse.base_path + notification["post_url"],
|
|
)
|
|
notification.delete("post_url")
|
|
|
|
payload = {
|
|
secret_key: SiteSetting.push_api_secret_key,
|
|
url: Discourse.base_url,
|
|
title: SiteSetting.title,
|
|
description: SiteSetting.site_description,
|
|
}
|
|
|
|
clients = args["clients"]
|
|
clients
|
|
.group_by { |r| r[1] }
|
|
.each do |push_url, group|
|
|
notifications = group.map { |client_id, _| notification.merge(client_id: client_id) }
|
|
|
|
next if push_url.blank?
|
|
|
|
begin
|
|
result =
|
|
Excon.post(
|
|
push_url,
|
|
body: payload.merge(notifications: notifications).to_json,
|
|
headers: {
|
|
"Content-Type" => "application/json",
|
|
"Accept" => "application/json",
|
|
},
|
|
)
|
|
|
|
if result.status != 200
|
|
# we failed to push a notification ... log it
|
|
Rails.logger.warn(
|
|
"Failed to push a notification to #{push_url} Status: #{result.status}: #{result.status_line}",
|
|
)
|
|
end
|
|
rescue => e
|
|
Rails.logger.error("An error occurred while pushing a notification: #{e.message}")
|
|
end
|
|
end
|
|
end
|
|
end
|
|
end
|