github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-30 15:28:37 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

DEV: Apply syntax_tree formatting to app/*

Browse Source
This commit is contained in:
David Taylor
2023-01-09 12:20:10 +00:00
parent a641ce4b62
commit 5a003715d3
696 changed files with 18447 additions and 15481 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
app/services/push_notification_pusher.rb
View File

@ -8,30 +8,36 @@ class PushNotificationPusher
message = nil
I18n.with_locale(user.effective_locale) do
notification_icon_name = Notification.types[payload[:notification_type]]
if !File.exist?(File.expand_path("../../app/assets/images/push-notifications/#{notification_icon_name}.png", __dir__))
if !File.exist?(
File.expand_path(
"../../app/assets/images/push-notifications/#{notification_icon_name}.png",
__dir__,
),
)
notification_icon_name = "discourse"
end
notification_icon = ActionController::Base.helpers.image_url("push-notifications/#{notification_icon_name}.png")
notification_icon =
ActionController::Base.helpers.image_url("push-notifications/#{notification_icon_name}.png")
message = {
title: payload[:translated_title] || I18n.t(
"discourse_push_notifications.popup.#{Notification.types[payload[:notification_type]]}",
site_title: SiteSetting.title,
topic: payload[:topic_title],
username: payload[:username]
),
title:
payload[:translated_title] ||
I18n.t(
"discourse_push_notifications.popup.#{Notification.types[payload[:notification_type]]}",
site_title: SiteSetting.title,
topic: payload[:topic_title],
username: payload[:username],
),
body: payload[:excerpt],
badge: get_badge,
icon: notification_icon,
tag: payload[:tag] || "#{Discourse.current_hostname}-#{payload[:topic_id]}",
base_url: Discourse.base_url,
url: payload[:post_url],
hide_when_active: true
hide_when_active: true,
}
subscriptions(user).each do |subscription|
send_notification(user, subscription, message)
end
subscriptions(user).each { |subscription| send_notification(user, subscription, message) }
end
message
@ -50,21 +56,22 @@ class PushNotificationPusher
subscriptions = PushSubscription.where(user: user, data: data)
subscriptions_count = subscriptions.count
new_subscription = if subscriptions_count > 1
subscriptions.destroy_all
PushSubscription.create!(user: user, data: data)
elsif subscriptions_count == 0
PushSubscription.create!(user: user, data: data)
end
new_subscription =
if subscriptions_count > 1
subscriptions.destroy_all
PushSubscription.create!(user: user, data: data)
elsif subscriptions_count == 0
PushSubscription.create!(user: user, data: data)
end
if send_confirmation == "true"
message = {
title: I18n.t("discourse_push_notifications.popup.confirm_title",
site_title: SiteSetting.title),
title:
I18n.t("discourse_push_notifications.popup.confirm_title", site_title: SiteSetting.title),
body: I18n.t("discourse_push_notifications.popup.confirm_body"),
icon: ActionController::Base.helpers.image_url("push-notifications/check.png"),
badge: get_badge,
tag: "#{Discourse.current_hostname}-subscription"
tag: "#{Discourse.current_hostname}-subscription",
}
send_notification(user, new_subscription, message)
@ -84,7 +91,7 @@ class PushNotificationPusher
end
MAX_ERRORS ||= 3
MIN_ERROR_DURATION ||= 86400 # 1 day
MIN_ERROR_DURATION ||= 86_400 # 1 day
def self.handle_generic_error(subscription, error, user, endpoint, message)
subscription.error_count += 1
@ -103,8 +110,8 @@ class PushNotificationPusher
env: {
user_id: user.id,
endpoint: endpoint,
message: message.to_json
}
message: message.to_json,
},
)
end
@ -130,11 +137,11 @@ class PushNotificationPusher
subject: Discourse.base_url,
public_key: SiteSetting.vapid_public_key,
private_key: SiteSetting.vapid_private_key,
expiration: TOKEN_VALID_FOR_SECONDS
expiration: TOKEN_VALID_FOR_SECONDS,
},
open_timeout: CONNECTION_TIMEOUT_SECONDS,
read_timeout: CONNECTION_TIMEOUT_SECONDS,
ssl_timeout: CONNECTION_TIMEOUT_SECONDS
ssl_timeout: CONNECTION_TIMEOUT_SECONDS,
)
if subscription.first_error_at || subscription.error_count != 0
@ -155,5 +162,4 @@ class PushNotificationPusher
private_class_method :send_notification
private_class_method :handle_generic_error
end