Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add Desktop notifications #252

Merged
merged 12 commits into from
Jan 29, 2022
Merged

Add Desktop notifications #252

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
dc8937e
Add notifications
ginnyTheCat Jan 23, 2022
96c4479
Abide push actions
ginnyTheCat Jan 23, 2022
fd71f23
Handle browsers not having notification support
ginnyTheCat Jan 25, 2022
18b928b
Ask for notification permission after loading
ginnyTheCat Jan 25, 2022
95568bd
Make usePermission work without live permission support
ginnyTheCat Jan 27, 2022
1467395
Focus message when clicking the notification
ginnyTheCat Jan 27, 2022
45edf20
make const all caps
ginnyTheCat Jan 27, 2022
74bce67
Fix usePermission error in Safari
ginnyTheCat Jan 28, 2022
a484711
Fix live permissions
ginnyTheCat Jan 28, 2022
40d9e22
Remove userActivity and use document.visibilityState instead
ginnyTheCat Jan 28, 2022
42f73bd
Change setting label to "desktop notifications"
ginnyTheCat Jan 28, 2022
79f348d
Check for notification permissions in the settings.js
ginnyTheCat Jan 28, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 2 additions & 12 deletions src/client/state/Notifications.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,6 @@ class Notifications extends EventEmitter {

this.roomIdToNoti = new Map();

this._isSyncing = false;

this._initNoti();
this._listenEvents();

Expand Down Expand Up @@ -192,7 +190,7 @@ class Notifications extends EventEmitter {
body: mEvent.getContent().body,
icon: mEvent.sender?.getAvatarUrl(this.matrixClient.baseUrl, 36, 36, 'crop'),
});
noti.onclick = () => selectRoom(room.roomId);
noti.onclick = () => selectRoom(room.roomId, mEvent.getId());
}

_listenEvents() {
Expand All @@ -210,7 +208,7 @@ class Notifications extends EventEmitter {
const noti = this.getNoti(room.roomId);
this._setNoti(room.roomId, total - noti.total, highlight - noti.highlight);

if (this._isSyncing) {
if (this.matrixClient.getSyncState() === 'SYNCING') {
this._displayPopupNoti(mEvent, room);
}
});
Expand All @@ -231,14 +229,6 @@ class Notifications extends EventEmitter {
this.deleteNoti(room.roomId);
}
});

this.matrixClient.on('sync', (state) => {
if (state === 'SYNCING') {
this._isSyncing = true;
} else if (state === 'STOPPED' || state === 'ERROR') {
this._isSyncing = false;
}
});
}
}

Expand Down
5 changes: 3 additions & 2 deletions src/client/state/userActivity.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import EventEmitter from 'events';

const recentlyActiveThreshold = 2 * 60 * 1000; // 2 minutes
ginnyTheCat marked this conversation as resolved.
Show resolved Hide resolved

class UserActivity extends EventEmitter {
constructor() {
super();
Expand All @@ -14,15 +16,14 @@ class UserActivity extends EventEmitter {
const inactivityEvent = () => { this.lastActive = 0; };

window.addEventListener('mousedown', activityEvent);
// window.addEventListener('mousemove', activityEvent);
window.addEventListener('keydown', activityEvent);
window.addEventListener('wheel', activityEvent, { passive: true, capture: true });
window.addEventListener('focus', activityEvent);
window.addEventListener('blur', inactivityEvent);
}

recentlyActive() {
return Date.now() - this.lastActive <= 2 * 60 * 1000;
return Date.now() - this.lastActive <= recentlyActiveThreshold;
}
}

Expand Down