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

Fix unread marker being off by one on the server

Browse Source
This commit is contained in:
Pavel Djundik 2018-07-17 11:41:12 +03:00 committed by Pavel Djundik
parent 0e7880a049
commit c70b4d4c80
4 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/js/socket-events/msg.js
View File

@ -47,7 +47,7 @@ socket.on("msg", function(data) {
channel.messages.push(data.msg); channel.messages.push(data.msg);
if (data.msg.self) { if (data.msg.self) {
channel.firstUnread = channel.messages[channel.messages.length - 1].id; channel.firstUnread = data.msg.id;
} else { } else {
notifyMessage(targetId, channel, vueApp.activeChannel, data.msg); notifyMessage(targetId, channel, vueApp.activeChannel, data.msg);
} }

5
client/js/socket-events/open.js
View File

@ -21,7 +21,10 @@ socket.on("open", function(id) {
if (channel) { if (channel) {
channel.channel.highlight = 0; channel.channel.highlight = 0;
channel.channel.unread = 0; channel.channel.unread = 0;
channel.channel.firstUnread = channel.channel.messages[channel.channel.messages.length - 1].id;
if (channel.channel.messages.length > 0) {
channel.channel.firstUnread = channel.channel.messages[channel.channel.messages.length - 1].id;
}
} }
utils.updateTitle(); utils.updateTitle();

5
src/client.js
View File

@ -422,10 +422,13 @@ Client.prototype.open = function(socketId, target) {
return; return;
} }
target.chan.firstUnread = 0;
target.chan.unread = 0; target.chan.unread = 0;
target.chan.highlight = 0; target.chan.highlight = 0;
if (target.chan.messages.length > 0) {
target.chan.firstUnread = target.chan.messages[target.chan.messages.length - 1].id;
}
attachedClient.openChannel = target.chan.id; attachedClient.openChannel = target.chan.id;
this.lastActiveChannel = target.chan.id; this.lastActiveChannel = target.chan.id;

2
src/models/chan.js
View File

@ -59,7 +59,7 @@ Chan.prototype.pushMessage = function(client, msg, increasesUnread) {
if (msg.self) { if (msg.self) {
// reset counters/markers when receiving self-/echo-message // reset counters/markers when receiving self-/echo-message
this.unread = 0; this.unread = 0;
this.firstUnread = 0; this.firstUnread = msg.id;
this.highlight = 0; this.highlight = 0;
} else if (!isOpen) { } else if (!isOpen) {
if (!this.firstUnread) { if (!this.firstUnread) {