deblan-mirror/thelounge
deblan-mirror/thelounge
1
0
Fork 0
mirror of https://github.com/thelounge/thelounge.git synced 2024-05-14 20:26:42 +02:00
Code Issues 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
parent 011b086760 fc39a67e10
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);
if (!target) {
return;
return null;
}
const chan = target.chan;
@ -415,10 +415,10 @@ Client.prototype.more = function(data) {
messages = chan.messages.slice(Math.max(0, index - 100), index);
}
client.emit("more", {
return {
chan: chan.id,
messages: messages,
});
};
};
Client.prototype.open = function(socketId, target) {

6
src/server.js
View file

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