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

Merge pull request #1949 from thelounge/xpaw/no-history-spam

Browse Source 
Only emit "more" history to the client that requested it
This commit is contained in:
Jérémie Astori 2018-01-07 13:37:36 -05:00 committed by GitHub
commit b8bd6fccbb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/client.js
View File

@ -396,7 +396,7 @@ Client.prototype.more = function(data) {
const target = client.find(data.target); const target = client.find(data.target);
if (!target) { if (!target) {
return; return null;
} }
const chan = target.chan; const chan = target.chan;
@ -415,10 +415,10 @@ Client.prototype.more = function(data) {
messages = chan.messages.slice(Math.max(0, index - 100), index); messages = chan.messages.slice(Math.max(0, index - 100), index);
} }
client.emit("more", { return {
chan: chan.id, chan: chan.id,
messages: messages, messages: messages,
}); };
}; };
Client.prototype.open = function(socketId, target) { Client.prototype.open = function(socketId, target) {

6
src/server.js
View File

@ -258,7 +258,11 @@ function initializeClient(socket, client, token, lastMessage) {
socket.on( socket.on(
"more", "more",
function(data) { function(data) {
client.more(data); const history = client.more(data);
if (history !== null) {
socket.emit("more", history);
}
} }
); );