github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-01-18 10:52:45 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: Update do-not-disturb icon in real-time on glimmer header (#28200)

Browse Source 
To achieve this, a new notifications service is set up with an `isInDoNotDisturb` tracked property. While a user is in do-not-disturb mode, it runs a regular timer until do-not-disturb is over.
This commit is contained in:
David Taylor 2024-08-02 08:55:51 +01:00 committed by GitHub
parent 183ef2024c
commit 7977ae61f7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 50 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/assets/javascripts/discourse/app/models/user.js
View File

@ -1215,6 +1215,7 @@ export default class User extends RestModel.extend(Evented) {
updateDoNotDisturbStatus(ends_at) {
this.set("do_not_disturb_until", ends_at);
this.appEvents.trigger("do-not-disturb:changed", this.do_not_disturb_until);
getOwner(this).lookup("service:notifications")._checkDoNotDisturb();
}
updateDraftProperties(properties) {
@ -1228,10 +1229,11 @@ export default class User extends RestModel.extend(Evented) {
}
isInDoNotDisturb() {
return (
this.do_not_disturb_until &&
new Date(this.do_not_disturb_until) >= new Date()
);
if (this !== getOwner(this).lookup("service:current-user")) {
throw "isInDoNotDisturb is only supported for currentUser";
}
return getOwner(this).lookup("service:notifications").isInDoNotDisturb;
}
@discourseComputed(

44
app/assets/javascripts/discourse/app/services/notifications.js Normal file
View File

@ -0,0 +1,44 @@
import { tracked } from "@glimmer/tracking";
import Service, { service } from "@ember/service";
import { disableImplicitInjections } from "discourse/lib/implicit-injections";
@disableImplicitInjections
export default class NotificationsService extends Service {
@service currentUser;
@tracked isInDoNotDisturb;
#dndTimer;
constructor() {
super(...arguments);
this._checkDoNotDisturb();
}
_checkDoNotDisturb() {
clearTimeout(this.#dndTimer);
if (this.currentUser?.do_not_disturb_until) {
const remainingMs = this.currentUser.do_not_disturb_until - Date.now();
if (remainingMs <= 0) {
this.isInDoNotDisturb = false;
return;
}
this.isInDoNotDisturb = true;
this.#dndTimer = setTimeout(
() => this._checkDoNotDisturb(),
Math.min(remainingMs, 60000)
);
} else {
this.isInDoNotDisturb = false;
}
}
willDestroy() {
clearTimeout(this.#dndTimer);
}
}