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

Merge pull request #1615 from dgw/mark-echoes-read

Browse Source 
Mark channels as read when receiving self-messages
This commit is contained in:
Pavel Djundik 2017-10-17 16:25:59 +03:00 committed by GitHub
commit a263c3eab9
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -61,6 +61,11 @@ function processReceivedMessage(data) {
.appendTo(container); .appendTo(container);
} }
// Clear unread/highlight counter if self-message
if (data.msg.self) {
sidebar.find("[data-target='" + target + "'] .badge").removeClass("highlight").empty();
}
// Message arrived in a non active channel, trim it to 100 messages // Message arrived in a non active channel, trim it to 100 messages
if (activeChannelId !== targetId && container.find(".msg").slice(0, -100).remove().length) { if (activeChannelId !== targetId && container.find(".msg").slice(0, -100).remove().length) {
channel.find(".show-more").addClass("show"); channel.find(".show-more").addClass("show");

6
src/models/chan.js
View File

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