@lordbex/thelounge 4.4.3-blowfish → 4.5.0-blowfish-pre

package/dist/server/plugins/irc-events/message.js

@@ -1,33 +1,27 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const msg_1 = __importDefault(require("../../models/msg"));
-const link_1 = __importDefault(require("./link"));
-const irc_1 = require("../../../shared/irc");
-const helper_1 = __importDefault(require("../../helper"));
-const msg_2 = require("../../../shared/types/msg");
-const chan_1 = require("../../../shared/types/chan");
-const fish_1 = require("../../utils/fish");
+import Msg from "../../models/msg.js";
+import LinkPrefetch from "./link.js";
+import { cleanIrcMessage } from "../../../shared/irc.js";
+import Helper from "../../helper.js";
+import { MessageType } from "../../../shared/types/msg.js";
+import { ChanType } from "../../../shared/types/chan.js";
+import { tryDecryptFishLine } from "../../utils/fish";
 const nickRegExp = /(?:\x03[0-9]{1,2}(?:,[0-9]{1,2})?)?([\w[\]\\`^{|}-]+)/g;
 function convertForHandle(type, data) {
     return { ...data, type: type };
 }
-exports.default = (function (irc, network) {
-    const client = this;
-    irc.on("notice", function (data) {
-        handleMessage(convertForHandle(msg_2.MessageType.NOTICE, data));
+export default (function (irc, network) {
+    irc.on("notice", (data) => {
+        handleMessage.call(this, convertForHandle(MessageType.NOTICE, data));
     });
-    irc.on("action", function (data) {
-        handleMessage(convertForHandle(msg_2.MessageType.ACTION, data));
+    irc.on("action", (data) => {
+        handleMessage.call(this, convertForHandle(MessageType.ACTION, data));
     });
-    irc.on("privmsg", function (data) {
-        handleMessage(convertForHandle(msg_2.MessageType.MESSAGE, data));
+    irc.on("privmsg", (data) => {
+        handleMessage.call(this, convertForHandle(MessageType.MESSAGE, data));
     });
-    irc.on("wallops", function (data) {
+    irc.on("wallops", (data) => {
         data.from_server = true;
-        handleMessage(convertForHandle(msg_2.MessageType.WALLOPS, data));
+        handleMessage.call(this, convertForHandle(MessageType.WALLOPS, data));
     });
     function handleMessage(data) {
         let chan;
@@ -43,13 +37,13 @@ exports.default = (function (irc, network) {
         // Check if the sender is in our ignore list
         const shouldIgnore = !self &&
             network.ignoreList.some(function (entry) {
-                return helper_1.default.compareHostmask(entry, data);
+                return Helper.compareHostmask(entry, data);
             });
         // Server messages that aren't targeted at a channel go to the server window
         if (data.from_server &&
             (!data.target ||
                 !network.getChannel(data.target) ||
-                network.getChannel(data.target)?.type !== chan_1.ChanType.CHANNEL)) {
+                network.getChannel(data.target)?.type !== ChanType.CHANNEL)) {
             chan = network.getLobby();
             from = chan.getUser(data.nick);
         }
@@ -65,43 +59,43 @@ exports.default = (function (irc, network) {
             chan = network.getChannel(target);
             if (typeof chan === "undefined") {
                 // Send notices that are not targeted at us into the server window
-                if (data.type === msg_2.MessageType.NOTICE) {
+                if (data.type === MessageType.NOTICE) {
                     showInActive = true;
                     chan = network.getLobby();
                 }
                 else {
-                    chan = client.createChannel({
-                        type: chan_1.ChanType.QUERY,
+                    chan = this.createChannel({
+                        type: ChanType.QUERY,
                         name: target,
                     });
-                    client.emit("join", {
+                    this.emit("join", {
                         network: network.uuid,
                         chan: chan.getFilteredClone(true),
                         shouldOpen: false,
                         index: network.addChannel(chan),
                     });
-                    client.save();
-                    chan.loadMessages(client, network);
+                    this.save();
+                    chan.loadMessages(this, network);
                 }
             }
             from = chan.getUser(data.nick);
             // Attempt mIRC FiSH Blowfish decryption if applicable
             if (chan.blowfishKey) {
-                const decrypted = (0, fish_1.tryDecryptFishLine)(data.message, chan.blowfishKey);
+                const decrypted = tryDecryptFishLine(data.message, chan.blowfishKey);
                 if (decrypted !== null) {
                     data.message = decrypted;
                 }
             }
             // Query messages (unless self or muted) always highlight
-            if (chan.type === chan_1.ChanType.QUERY) {
+            if (chan.type === ChanType.QUERY) {
                 highlight = !self;
             }
-            else if (chan.type === chan_1.ChanType.CHANNEL) {
+            else if (chan.type === ChanType.CHANNEL) {
                 from.lastMessage = data.time || Date.now();
             }
         }
         // msg is constructed down here because `from` is being copied in the constructor
-        const msg = new msg_1.default({
+        const msg = new Msg({
             type: data.type,
             time: data.time ? new Date(data.time) : undefined,
             text: data.message,
@@ -114,19 +108,19 @@ exports.default = (function (irc, network) {
             msg.showInActive = true;
         }
         // remove IRC formatting for custom highlight testing
-        const cleanMessage = (0, irc_1.cleanIrcMessage)(data.message);
+        const cleanMessage = cleanIrcMessage(data.message);
         // Self messages in channels are never highlighted
         // Non-self messages are highlighted as soon as the nick is detected
         if (!msg.highlight && !msg.self) {
             msg.highlight = network.highlightRegex?.test(data.message);
             // If we still don't have a highlight, test against custom highlights if there's any
-            if (!msg.highlight && client.highlightRegex) {
-                msg.highlight = client.highlightRegex.test(cleanMessage);
+            if (!msg.highlight && this.highlightRegex) {
+                msg.highlight = this.highlightRegex.test(cleanMessage);
             }
         }
         // if highlight exceptions match, do not highlight at all
-        if (msg.highlight && client.highlightExceptionRegex) {
-            msg.highlight = !client.highlightExceptionRegex.test(cleanMessage);
+        if (msg.highlight && this.highlightExceptionRegex) {
+            msg.highlight = !this.highlightExceptionRegex.test(cleanMessage);
         }
         if (data.group) {
             msg.statusmsgGroup = data.group;
@@ -138,30 +132,30 @@ exports.default = (function (irc, network) {
             }
         }
         // No prefetch URLs unless are simple MESSAGE or ACTION types
-        if ([msg_2.MessageType.MESSAGE, msg_2.MessageType.ACTION].includes(data.type)) {
-            (0, link_1.default)(client, chan, msg, cleanMessage);
+        if ([MessageType.MESSAGE, MessageType.ACTION].includes(data.type)) {
+            LinkPrefetch(this, chan, msg, cleanMessage);
         }
-        chan.pushMessage(client, msg, !msg.self);
+        chan.pushMessage(this, msg, !msg.self);
         // Do not send notifications if the channel is muted or for messages older than 15 minutes (znc buffer for example)
         if (!chan.muted && msg.highlight && (!data.time || data.time > Date.now() - 900000)) {
             let title = chan.name;
             let body = cleanMessage;
-            if (msg.type === msg_2.MessageType.ACTION) {
+            if (msg.type === MessageType.ACTION) {
                 // For actions, do not include colon in the message
                 body = `${data.nick} ${body}`;
             }
-            else if (chan.type !== chan_1.ChanType.QUERY) {
+            else if (chan.type !== ChanType.QUERY) {
                 // In channels, prepend sender nickname to the message
                 body = `${data.nick}: ${body}`;
             }
-            // If a channel is active on any client, highlight won't increment and notification will say (0 mention)
+            // If a channel is active on any this, highlight won't increment and notification will say (0 mention)
             if (chan.highlight > 0) {
-                title += ` (${chan.highlight} ${chan.type === chan_1.ChanType.QUERY ? "new message" : "mention"}${chan.highlight > 1 ? "s" : ""})`;
+                title += ` (${chan.highlight} ${chan.type === ChanType.QUERY ? "new message" : "mention"}${chan.highlight > 1 ? "s" : ""})`;
             }
             if (chan.highlight > 1) {
                 body += `\n\n… and ${chan.highlight - 1} other message${chan.highlight > 2 ? "s" : ""}`;
             }
-            client.manager.webPush.push(client, {
+            this.manager.webPush.push(this, {
                 type: "notification",
                 chanId: chan.id,
                 timestamp: data.time || Date.now(),
@@ -169,9 +163,9 @@ exports.default = (function (irc, network) {
                 body: body,
             }, true);
         }
-        // Keep track of all mentions in channels for this client
-        if (msg.highlight && chan.type === chan_1.ChanType.CHANNEL) {
-            client.mentions.push({
+        // Keep track of all mentions in channels for this this
+        if (msg.highlight && chan.type === ChanType.CHANNEL) {
+            this.mentions.push({
                 chanId: chan.id,
                 msgId: msg.id,
                 type: msg.type,
@@ -179,8 +173,8 @@ exports.default = (function (irc, network) {
                 text: msg.text,
                 from: msg.from,
             });
-            if (client.mentions.length > 100) {
-                client.mentions.splice(0, client.mentions.length - 100);
+            if (this.mentions.length > 100) {
+                this.mentions.splice(0, this.mentions.length - 100);
             }
         }
     }

package/dist/server/plugins/irc-events/mode.js

@@ -1,18 +1,12 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const lodash_1 = __importDefault(require("lodash"));
-const msg_1 = __importDefault(require("../../models/msg"));
-const msg_2 = require("../../../shared/types/msg");
-exports.default = (function (irc, network) {
-    const client = this;
+import _ from "lodash";
+import Msg from "../../models/msg.js";
+import { MessageType } from "../../../shared/types/msg.js";
+export default (function (irc, network) {
     // The following saves the channel key based on channel mode instead of
     // extracting it from `/join #channel key`. This lets us not have to
     // temporarily store the key until successful join, but also saves the key
     // if a key is set or changed while being on the channel.
-    irc.on("channel info", function (data) {
+    irc.on("channel info", (data) => {
         if (!data.modes) {
             return;
         }
@@ -26,26 +20,26 @@ exports.default = (function (irc, network) {
             const char = text[1];
             if (char === "k") {
                 targetChan.key = add ? mode.param : "";
-                client.save();
+                this.save();
             }
         });
-        const msg = new msg_1.default({
-            type: msg_2.MessageType.MODE_CHANNEL,
+        const msg = new Msg({
+            type: MessageType.MODE_CHANNEL,
             text: `${data.raw_modes} ${data.raw_params.join(" ")}`,
         });
-        targetChan.pushMessage(client, msg);
+        targetChan.pushMessage(this, msg);
     });
-    irc.on("user info", function (data) {
+    irc.on("user info", (data) => {
         const serverChan = network.getLobby();
-        const msg = new msg_1.default({
-            type: msg_2.MessageType.MODE_USER,
+        const msg = new Msg({
+            type: MessageType.MODE_USER,
             raw_modes: data.raw_modes,
             self: false,
             showInActive: true,
         });
-        serverChan.pushMessage(client, msg);
+        serverChan.pushMessage(this, msg);
     });
-    irc.on("mode", function (data) {
+    irc.on("mode", (data) => {
         let targetChan;
         if (data.target === irc.user.nick) {
             targetChan = network.getLobby();
@@ -56,9 +50,9 @@ exports.default = (function (irc, network) {
                 return;
             }
         }
-        const msg = new msg_1.default({
+        const msg = new Msg({
             time: data.time,
-            type: msg_2.MessageType.MODE,
+            type: MessageType.MODE,
             from: targetChan.getUser(data.nick),
             text: `${data.raw_modes} ${data.raw_params.join(" ")}`,
             self: data.nick === irc.user.nick,
@@ -72,53 +66,62 @@ exports.default = (function (irc, network) {
         if (users.length > 0) {
             msg.users = users;
         }
-        targetChan.pushMessage(client, msg);
-        let usersUpdated = false;
-        const userModeSortPriority = {};
-        const supportsMultiPrefix = network.irc.network.cap.isEnabled("multi-prefix");
-        irc.network.options.PREFIX.forEach((prefix, index) => {
-            userModeSortPriority[prefix.symbol] = index;
-        });
-        data.modes.forEach((mode) => {
-            const add = mode.mode[0] === "+";
-            const char = mode.mode[1];
-            if (char === "k") {
-                targetChan.key = add ? mode.param : "";
-                client.save();
-            }
-            if (!mode.param) {
-                return;
-            }
-            const user = targetChan.findUser(mode.param);
-            if (!user) {
+        // Mode update logic - needs to run regardless of buffering
+        const updateModes = () => {
+            let usersUpdated = false;
+            const userModeSortPriority = {};
+            const supportsMultiPrefix = network.irc.network.cap.isEnabled("multi-prefix");
+            irc.network.options.PREFIX.forEach((prefix, index) => {
+                userModeSortPriority[prefix.symbol] = index;
+            });
+            data.modes.forEach((mode) => {
+                const add = mode.mode[0] === "+";
+                const char = mode.mode[1];
+                if (char === "k") {
+                    targetChan.key = add ? mode.param : "";
+                    this.save();
+                }
+                if (!mode.param) {
+                    return;
+                }
+                const user = targetChan.findUser(mode.param);
+                if (!user) {
+                    return;
+                }
+                usersUpdated = true;
+                if (!supportsMultiPrefix) {
+                    return;
+                }
+                const changedMode = network.serverOptions.PREFIX.modeToSymbol[char];
+                if (!add) {
+                    _.pull(user.modes, changedMode);
+                }
+                else if (!user.modes.includes(changedMode)) {
+                    user.modes.push(changedMode);
+                    user.modes.sort(function (a, b) {
+                        return userModeSortPriority[a] - userModeSortPriority[b];
+                    });
+                }
+            });
+            if (!usersUpdated) {
                 return;
             }
-            usersUpdated = true;
             if (!supportsMultiPrefix) {
-                return;
-            }
-            const changedMode = network.serverOptions.PREFIX.modeToSymbol[char];
-            if (!add) {
-                lodash_1.default.pull(user.modes, changedMode);
+                // TODO: This is horrible
+                irc.raw("NAMES", data.target);
             }
-            else if (!user.modes.includes(changedMode)) {
-                user.modes.push(changedMode);
-                user.modes.sort(function (a, b) {
-                    return userModeSortPriority[a] - userModeSortPriority[b];
+            else {
+                this.emit("users", {
+                    chan: targetChan.id,
                 });
             }
-        });
-        if (!usersUpdated) {
-            return;
-        }
-        if (!supportsMultiPrefix) {
-            // TODO: This is horrible
-            irc.raw("NAMES", data.target);
-        }
-        else {
-            client.emit("users", {
-                chan: targetChan.id,
-            });
+        };
+        // Try to process through mass event aggregator
+        const wasBuffered = this.massEventAggregator.processMessage(network, targetChan, msg, updateModes);
+        if (!wasBuffered) {
+            // Not in mass event mode - process normally
+            targetChan.pushMessage(this, msg);
+            updateModes();
         }
     });
 });

package/dist/server/plugins/irc-events/modelist.js

@@ -1,34 +1,12 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const msg_1 = __importDefault(require("../../models/msg"));
-const msg_2 = require("../../../shared/types/msg");
-const chan_1 = require("../../../shared/types/chan");
-exports.default = (function (irc, network) {
-    const client = this;
-    irc.on("banlist", (list) => {
-        const data = list.bans.map((ban) => ({
-            hostmask: ban.banned,
-            banned_by: ban.banned_by,
-            banned_at: ban.banned_at * 1000,
-        }));
-        handleList(chan_1.SpecialChanType.BANLIST, "Ban list", list.channel, data);
-    });
-    irc.on("inviteList", (list) => {
-        const data = list.invites.map((invite) => ({
-            hostmask: invite.invited,
-            invited_by: invite.invited_by,
-            invited_at: invite.invited_at * 1000,
-        }));
-        handleList(chan_1.SpecialChanType.INVITELIST, "Invite list", list.channel, data);
-    });
-    function handleList(type, name, channel, data) {
+import Msg from "../../models/msg.js";
+import { MessageType } from "../../../shared/types/msg.js";
+import { SpecialChanType, ChanType } from "../../../shared/types/chan.js";
+export default (function (irc, network) {
+    const handleList = (type, name, channel, data) => {
         if (data.length === 0) {
-            const msg = new msg_1.default({
+            const msg = new Msg({
                 time: new Date(),
-                type: msg_2.MessageType.ERROR,
+                type: MessageType.ERROR,
                 text: `${name} is empty`,
             });
             let chan = network.getChannel(channel);
@@ -37,19 +15,19 @@ exports.default = (function (irc, network) {
                 msg.showInActive = true;
                 chan = network.getLobby();
             }
-            chan.pushMessage(client, msg, true);
+            chan.pushMessage(this, msg, true);
             return;
         }
         const chanName = `${name} for ${channel}`;
         let chan = network.getChannel(chanName);
         if (typeof chan === "undefined") {
-            chan = client.createChannel({
-                type: chan_1.ChanType.SPECIAL,
+            chan = this.createChannel({
+                type: ChanType.SPECIAL,
                 special: type,
                 name: chanName,
                 data: data,
             });
-            client.emit("join", {
+            this.emit("join", {
                 network: network.uuid,
                 chan: chan.getFilteredClone(true),
                 shouldOpen: false,
@@ -58,10 +36,26 @@ exports.default = (function (irc, network) {
         }
         else {
             chan.data = data;
-            client.emit("msg:special", {
+            this.emit("msg:special", {
                 chan: chan.id,
                 data: data,
             });
         }
-    }
+    };
+    irc.on("banlist", (list) => {
+        const data = list.bans.map((ban) => ({
+            hostmask: ban.banned,
+            banned_by: ban.banned_by,
+            banned_at: ban.banned_at * 1000,
+        }));
+        handleList(SpecialChanType.BANLIST, "Ban list", list.channel, data);
+    });
+    irc.on("inviteList", (list) => {
+        const data = list.invites.map((invite) => ({
+            hostmask: invite.invited,
+            invited_by: invite.invited_by,
+            invited_at: invite.invited_at * 1000,
+        }));
+        handleList(SpecialChanType.INVITELIST, "Invite list", list.channel, data);
+    });
 });

package/dist/server/plugins/irc-events/motd.js

@@ -1,29 +1,23 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const msg_1 = __importDefault(require("../../models/msg"));
-const msg_2 = require("../../../shared/types/msg");
-exports.default = (function (irc, network) {
-    const client = this;
-    irc.on("motd", function (data) {
+import Msg from "../../models/msg.js";
+import { MessageType } from "../../../shared/types/msg.js";
+export default (function (irc, network) {
+    irc.on("motd", (data) => {
         const lobby = network.getLobby();
         if (data.motd) {
-            const msg = new msg_1.default({
-                type: msg_2.MessageType.MONOSPACE_BLOCK,
+            const msg = new Msg({
+                type: MessageType.MONOSPACE_BLOCK,
                 command: "motd",
                 text: data.motd,
             });
-            lobby.pushMessage(client, msg);
+            lobby.pushMessage(this, msg);
         }
         if (data.error) {
-            const msg = new msg_1.default({
-                type: msg_2.MessageType.MONOSPACE_BLOCK,
+            const msg = new Msg({
+                type: MessageType.MONOSPACE_BLOCK,
                 command: "motd",
                 text: data.error,
             });
-            lobby.pushMessage(client, msg);
+            lobby.pushMessage(this, msg);
         }
     });
 });

package/dist/server/plugins/irc-events/names.js

@@ -1,8 +1,5 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = (function (irc, network) {
-    const client = this;
-    irc.on("userlist", function (data) {
+export default (function (irc, network) {
+    irc.on("userlist", (data) => {
         const chan = network.getChannel(data.channel);
         if (typeof chan === "undefined") {
             return;
@@ -14,7 +11,7 @@ exports.default = (function (irc, network) {
             newUsers.set(user.nick.toLowerCase(), newUser);
         });
         chan.users = newUsers;
-        client.emit("users", {
+        this.emit("users", {
             chan: chan.id,
         });
     });

package/dist/server/plugins/irc-events/nick.js

@@ -1,23 +1,17 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const msg_1 = __importDefault(require("../../models/msg"));
-const msg_2 = require("../../../shared/types/msg");
-exports.default = (function (irc, network) {
-    const client = this;
-    irc.on("nick", function (data) {
+import Msg from "../../models/msg.js";
+import { MessageType } from "../../../shared/types/msg.js";
+export default (function (irc, network) {
+    irc.on("nick", (data) => {
         const self = data.nick === irc.user.nick;
         if (self) {
             network.setNick(data.new_nick);
             const lobby = network.getLobby();
-            const msg = new msg_1.default({
+            const msg = new Msg({
                 text: `You're now known as ${data.new_nick}`,
             });
-            lobby.pushMessage(client, msg, true);
-            client.save();
-            client.emit("nick", {
+            lobby.pushMessage(this, msg, true);
+            this.save();
+            this.emit("nick", {
                 network: network.uuid,
                 nick: data.new_nick,
             });
@@ -27,19 +21,28 @@ exports.default = (function (irc, network) {
             if (typeof user === "undefined") {
                 return;
             }
-            const msg = new msg_1.default({
+            const msg = new Msg({
                 time: data.time,
                 from: user,
-                type: msg_2.MessageType.NICK,
+                type: MessageType.NICK,
                 new_nick: data.new_nick,
             });
-            chan.pushMessage(client, msg);
-            chan.removeUser(user);
-            user.nick = data.new_nick;
-            chan.setUser(user);
-            client.emit("users", {
-                chan: chan.id,
-            });
+            // User list update callback - executed regardless of buffering
+            const updateUserList = () => {
+                chan.removeUser(user);
+                user.nick = data.new_nick;
+                chan.setUser(user);
+                this.emit("users", {
+                    chan: chan.id,
+                });
+            };
+            // Try to process through mass event aggregator
+            const wasBuffered = this.massEventAggregator.processMessage(network, chan, msg, updateUserList);
+            if (!wasBuffered) {
+                // Not in mass event mode - process normally
+                chan.pushMessage(this, msg);
+                updateUserList();
+            }
         });
     });
 });