supernets/hardlounge
supernets/hardlounge
4
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2082 from thelounge/xpaw/rm-isRegistered

Browse Source 
Remove isRegistered
This commit is contained in:
Jérémie Astori 2018-02-22 00:45:22 -05:00 committed by GitHub
commit f8c894d7e1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/client.js
View File

@ -102,10 +102,6 @@ function Client(manager, name, config = {}) {
} }
} }
Client.prototype.isRegistered = function() {
return this.name.length > 0;
};
Client.prototype.emit = function(event, data) { Client.prototype.emit = function(event, data) {
if (this.sockets !== null) { if (this.sockets !== null) {
this.sockets.in(this.id).emit(event, data); this.sockets.in(this.id).emit(event, data);

38
src/server.js
View File

@ -407,30 +407,26 @@ function initializeClient(socket, client, token, lastMessage) {
} }
}); });
socket.on("push:register", (subscription) => { if (!Helper.config.public) {
if (!client.isRegistered() || !client.config.sessions.hasOwnProperty(token)) { socket.on("push:register", (subscription) => {
return; if (!client.config.sessions.hasOwnProperty(token)) {
} return;
}
const registration = client.registerPushSubscription(client.config.sessions[token], subscription); const registration = client.registerPushSubscription(client.config.sessions[token], subscription);
if (registration) { if (registration) {
client.manager.webPush.pushSingle(client, registration, { client.manager.webPush.pushSingle(client, registration, {
type: "notification", type: "notification",
timestamp: Date.now(), timestamp: Date.now(),
title: "The Lounge", title: "The Lounge",
body: "🚀 Push notifications have been enabled", body: "🚀 Push notifications have been enabled",
}); });
} }
}); });
socket.on("push:unregister", () => { socket.on("push:unregister", () => client.unregisterPushSubscription(token));
if (!client.isRegistered()) { }
return;
}
client.unregisterPushSubscription(token);
});
const sendSessionList = () => { const sendSessionList = () => {
const sessions = _.map(client.config.sessions, (session, sessionToken) => ({ const sessions = _.map(client.config.sessions, (session, sessionToken) => ({