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

Implement message trimming

Browse Source
This commit is contained in:
Pavel Djundik 2018-07-09 22:06:06 +03:00 committed by Pavel Djundik
parent f9d255b678
commit 084e01cf46
1 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,8 +6,6 @@ const utils = require("../utils");
const options = require("../options"); const options = require("../options");
const cleanIrcMessage = require("../libs/handlebars/ircmessageparser/cleanIrcMessage"); const cleanIrcMessage = require("../libs/handlebars/ircmessageparser/cleanIrcMessage");
const webpush = require("../webpush"); const webpush = require("../webpush");
const chat = $("#chat");
const sidebar = $("#sidebar");
const {vueApp, findChannel} = require("../vue"); const {vueApp, findChannel} = require("../vue");
let pop; let pop;
@ -33,7 +31,7 @@ socket.on("msg", function(data) {
function processReceivedMessage(data) { function processReceivedMessage(data) {
let targetId = data.chan; let targetId = data.chan;
let target = "#chan-" + targetId; let target = "#chan-" + targetId;
let channelContainer = chat.find(target); let channelContainer = $("#chat").find(target);
let channel = findChannel(data.chan); let channel = findChannel(data.chan);
channel.channel.highlight = data.highlight; channel.channel.highlight = data.highlight;
@ -52,7 +50,7 @@ function processReceivedMessage(data) {
targetId = data.chan = vueApp.activeChannel.channel.id; targetId = data.chan = vueApp.activeChannel.channel.id;
target = "#chan-" + targetId; target = "#chan-" + targetId;
channelContainer = chat.find(target); channelContainer = $("#chat").find(target);
} }
const scrollContainer = channelContainer.find(".chat"); const scrollContainer = channelContainer.find(".chat");
@ -91,6 +89,24 @@ function processReceivedMessage(data) {
.appendTo(container); .appendTo(container);
} }
let messageLimit = 0;
if (!vueApp.activeChannel || vueApp.activeChannel.channel !== channel.channel) {
// If message arrives in non active channel, keep only 100 messages
messageLimit = 100;
} else {
const el = scrollContainer.get(0);
// If message arrives in active channel, keep 500 messages if scroll is currently at the bottom
if (el.scrollHeight - el.scrollTop - el.offsetHeight <= 30) {
messageLimit = 500;
}
}
if (messageLimit > 0) {
channel.channel.messages.splice(0, channel.channel.messages.length - messageLimit);
}
if ((data.msg.type === "message" || data.msg.type === "action") && channel.channel.type === "channel") { if ((data.msg.type === "message" || data.msg.type === "action") && channel.channel.type === "channel") {
const user = channel.channel.users.find((u) => u.nick === data.msg.from.nick); const user = channel.channel.users.find((u) => u.nick === data.msg.from.nick);
@ -110,7 +126,7 @@ function notifyMessage(targetId, channel, msg) {
return; return;
} }
const button = sidebar.find(".chan[data-id='" + targetId + "']"); const button = $("#sidebar .chan[data-id='" + targetId + "']");
if (msg.highlight || (options.settings.notifyAllMessages && msg.type === "message")) { if (msg.highlight || (options.settings.notifyAllMessages && msg.type === "message")) {
if (!document.hasFocus() || !channel.hasClass("active")) { if (!document.hasFocus() || !channel.hasClass("active")) {