deblan-mirror/thelounge
deblan-mirror/thelounge
1
0
Fork 0
mirror of https://github.com/thelounge/thelounge.git synced 2024-06-18 13:35:10 +02:00
Code Issues Projects Releases Wiki Activity

Avoid emitting multiple events to the server when collapsing/expanding channel previews

Browse source 
Fixes #1377
This commit is contained in:
Pavel Djundik 2019-11-04 12:41:04 +02:00
parent c26de4cf6a
commit 6b8fea8afc
4 changed files with 71 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
client/components/MessageList.vue
View file

@ -218,8 +218,6 @@ export default {
this.keepScrollPosition();
// Tell the server we're toggling so it remembers at page reload
// TODO Avoid sending many single events when using `/collapse` or `/expand`
// See https://github.com/thelounge/thelounge/issues/1377
socket.emit("msg:preview:toggle", {
target: this.channel.id,
msgId: message.id,

30
client/js/commands/collapse.js
View file

@ -1,8 +1,34 @@
"use strict";
const $ = require("jquery");
const socket = require("../socket");
const store = require("../store").default;
exports.input = function() {
$(".chan.active .toggle-button.toggle-preview.opened").click();
const messageIds = [];
for (const message of store.state.activeChannel.channel.messages) {
let toggled = false;
for (const preview of message.previews) {
if (preview.shown) {
preview.shown = false;
toggled = true;
}
}
if (toggled) {
messageIds.push(message.id);
}
}
// Tell the server we're toggling so it remembers at page reload
if (messageIds.length > 0) {
socket.emit("msg:preview:toggle", {
target: store.state.activeChannel.channel.id,
messageIds: messageIds,
shown: false,
});
}
return true;
};

30
client/js/commands/expand.js
View file

@ -1,8 +1,34 @@
"use strict";
const $ = require("jquery");
const socket = require("../socket");
const store = require("../store").default;
exports.input = function() {
$(".chan.active .toggle-button.toggle-preview:not(.opened)").click();
const messageIds = [];
for (const message of store.state.activeChannel.channel.messages) {
let toggled = false;
for (const preview of message.previews) {
if (!preview.shown) {
preview.shown = true;
toggled = true;
}
}
if (toggled) {
messageIds.push(message.id);
}
}
// Tell the server we're toggling so it remembers at page reload
if (messageIds.length > 0) {
socket.emit("msg:preview:toggle", {
target: store.state.activeChannel.channel.id,
messageIds: messageIds,
shown: true,
});
}
return true;
};

16
src/server.js
View file

@ -494,11 +494,25 @@ function initializeClient(socket, client, token, lastMessage, openChannel) {
}
const networkAndChan = client.find(data.target);
const newState = Boolean(data.shown);
if (!networkAndChan) {
return;
}
// Process multiple message at once for /collapse and /expand commands
if (Array.isArray(data.messageIds)) {
for (const msgId of data.messageIds) {
const message = networkAndChan.chan.findMessage(msgId);
for (const preview of message.previews) {
preview.shown = newState;
}
}
return;
}
const message = networkAndChan.chan.findMessage(data.msgId);
if (!message) {
@ -508,7 +522,7 @@ function initializeClient(socket, client, token, lastMessage, openChannel) {
const preview = message.findPreview(data.link);
if (preview) {
preview.shown = data.shown;
preview.shown = newState;
}
});