osr-plastic/osr-discourse-src
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

REFACTOR: Remove Discourse.SiteSettings from desktop notifications

Browse Source
This commit is contained in:
Robin Ward 2020-07-21 14:40:23 -04:00
parent 37f2611d9c
commit 217b970e16
3 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/discourse/app/components/desktop-notification-config.js
View File

@ -114,7 +114,7 @@ export default Component.extend({
} else {
this.set("notificationsDisabled", "");
Notification.requestPermission(() => {
confirmNotification();
confirmNotification(this.siteSettings);
this.notifyPropertyChange("notificationsPermission");
});
}

4
app/assets/javascripts/discourse/app/initializers/subscribe-user-notifications.js
View File

@ -131,7 +131,9 @@ export default {
);
if (!isTesting()) {
bus.subscribe(alertChannel(user), data => onNotification(data, user));
bus.subscribe(alertChannel(user), data =>
onNotification(data, siteSettings)
);
initDesktopNotifications(bus, appEvents);
if (isPushNotificationsEnabled(user, site.mobileView)) {

20
app/assets/javascripts/discourse/app/lib/desktop-notifications.js
View File

@ -71,16 +71,14 @@ function init(messageBus, appEvents) {
}
}
function confirmNotification() {
function confirmNotification(siteSettings) {
const notification = new Notification(
I18n.t("notifications.popup.confirm_title", {
site_title: Discourse.SiteSettings.title
site_title: siteSettings.title
}),
{
body: I18n.t("notifications.popup.confirm_body"),
icon:
Discourse.SiteSettings.site_logo_small_url ||
Discourse.SiteSettings.site_logo_url,
icon: siteSettings.site_logo_small_url || siteSettings.site_logo_url,
tag: "confirm-subscription"
}
);
@ -138,7 +136,7 @@ function isIdle() {
}
// Call-in point from message bus
function onNotification(data) {
function onNotification(data, siteSettings) {
if (!liveEnabled) {
return;
}
@ -153,7 +151,7 @@ function onNotification(data) {
}
const notificationTitle = I18n.t(i18nKey(data.notification_type), {
site_title: Discourse.SiteSettings.title,
site_title: siteSettings.title,
topic: data.topic_title,
username: formatUsername(data.username)
});
@ -161,14 +159,10 @@ function onNotification(data) {
const notificationBody = data.excerpt;
const notificationIcon =
Discourse.SiteSettings.site_logo_small_url ||
Discourse.SiteSettings.site_logo_url;
siteSettings.site_logo_small_url || siteSettings.site_logo_url;
const notificationTag =
"discourse-notification-" +
Discourse.SiteSettings.title +
"-" +
data.topic_id;
"discourse-notification-" + siteSettings.title + "-" + data.topic_id;
requestPermission().then(function() {
// This shows the notification!