hippoz/brainlet
Archived
5
1
Fork 1
Code Issues 6 Pull requests Releases Wiki Activity

Compare commits

base: hippoz:31798c60a29a76d906617d3ca5d92d77316b7d13
Branches Tags
hippoz:master
..
compare: hippoz:da3962b9f162473c8c4754c467e2633a07a6a7d5
Branches Tags
hippoz:master

2 commits
31798c60a2 ... da3962b9f1

Author SHA1 Message Date
hippoz
da3962b9f1
Merge branch 'master' of https://git.hippoz.xyz/hippoz/brainlet 2021-01-03 17:04:45 +02:00
hippoz
6c5470e6b1
fix #10 2021-01-03 17:04:23 +02:00
1 changed files with 19 additions and 15 deletions
Show stats Expand all files Collapse all files

28
api/v1/gateway/index.js
View file

@ -226,21 +226,25 @@ GatewayServer.prototype.eventSetup = function() {
socket.on('subscribe', async (categories) => { socket.on('subscribe', async (categories) => {
if ( !socket.isConnected || !socket.user || !categories || !Array.isArray(categories) || categories === []) return; if ( !socket.isConnected || !socket.user || !categories || !Array.isArray(categories) || categories === []) return;
for (const v of categories) { try {
if (!v && !(typeof v === 'string')) continue; for (const v of categories) {
// TODO: When/if category permissions are added, check if the user has permissions for that category if (!v && !(typeof v === 'string')) continue;
const category = await Category.findById(v); // TODO: When/if category permissions are added, check if the user has permissions for that category
if (category && category.title && category._id) { const category = await Category.findById(v);
if (!socket.joinedCategories) socket.joinedCategories = {}; if (category && category.title && category._id) {
if (socket.joinedCategories[v]) continue; if (!socket.joinedCategories) socket.joinedCategories = {};
socket.joinedCategories[v] = category.title; if (socket.joinedCategories[v]) continue;
await socket.join(v); socket.joinedCategories[v] = category.title;
await socket.join(v);
console.log(`[*] [gateway] User ${socket.user.username} subscribed to room ${v} (${category.title}), sending updated user list to all members of that room...`); console.log(`[*] [gateway] User ${socket.user.username} subscribed to room ${v} (${category.title}), sending updated user list to all members of that room...`);
const upd = await this._generateClientListUpdateObject(v, category.title); const upd = await this._generateClientListUpdateObject(v, category.title);
this._gateway.in(v).emit('clientListUpdate', upd); this._gateway.in(v).emit('clientListUpdate', upd);
}
} }
} catch (e) {
return;
} }
}); });