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

Merge pull request #3453 from thelounge/xpaw/sync-users-reconnect

Browse Source 
Synchronize user list correctly on reconnection
This commit is contained in:
Pavel Djundik 2019-10-21 11:01:33 +03:00 committed by GitHub
commit ee91217d98
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
client/js/socket-events/init.js
View File

@ -163,7 +163,16 @@ function mergeChannelData(oldChannels, newChannels) {
// Server sends an empty users array, client requests it whenever needed // Server sends an empty users array, client requests it whenever needed
if (key === "users") { if (key === "users") {
if (channel.type === "channel") { if (channel.type === "channel") {
channel.usersOutdated = true; if (vueApp.activeChannel && vueApp.activeChannel.channel === currentChannel) {
// For currently open channel, request the user list straight away
socket.emit("names", {
target: channel.id,
});
} else {
// For all other channels, mark the user list as outdated
// so an update will be requested whenever user switches to these channels
currentChannel.usersOutdated = true;
}
} }
continue; continue;