KevinMidboe/zoff
1
0
Fork 0
mirror of https://github.com/KevinMidboe/zoff.git synced 2025-10-29 18:00:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:zoff-music/zoff

Browse Source
This commit is contained in:
Kasper Rynning-Tønnesen
2017-09-13 15:11:28 +02:00
parent e629f70906 26e4214a50
commit 5be5934ea2
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/handlers/chat.js
View File

@@ -103,7 +103,7 @@ var generate_name = function(guid, announce_payload) {
} else if(announce_payload.message && !announce_payload.all) { } else if(announce_payload.message && !announce_payload.all) {
io.to(announce_payload.channel).emit('chat', {from: name, msg: ": " + announce_payload.message}); io.to(announce_payload.channel).emit('chat', {from: name, msg: ": " + announce_payload.message});
} else if(announce_payload.message && announce_payload.all) { } else if(announce_payload.message && announce_payload.all) {
io.sockets.emit('chat.all', {from: docs[0].name, msg: ": " + announce_payload.message, channel: coll}); io.sockets.emit('chat.all', {from: name, msg: ": " + announce_payload.message, channel: coll});
} }
}); });
} else { } else {

2
server/server.js
View File

@@ -108,7 +108,7 @@ app.get('/robots.txt', function (req, res) {
app.use(function (req, res, next) { app.use(function (req, res, next) {
var cookie = req.cookies._uI; var cookie = req.cookies._uI;
if (cookie === undefined) { if (cookie === undefined) {
var user_name = rndName(uniqid.time(), 15); var user_name = Functions.rndName(uniqid.time(), 15);
res.cookie('_uI',user_name, { maxAge: 365 * 10000 * 3600000 }); res.cookie('_uI',user_name, { maxAge: 365 * 10000 * 3600000 });
} }
next(); next();