@lordbex/thelounge 4.4.4-blowfish → 4.5.1-blowfish

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

@@ -1,31 +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");
-const chan_1 = require("../../../shared/types/chan");
-exports.default = (function (irc, network) {
-    const client = this;
-    irc.on("away", (data) => handleAway(msg_2.MessageType.AWAY, data));
-    irc.on("back", (data) => handleAway(msg_2.MessageType.BACK, data));
-    function handleAway(type, data) {
+import Msg from "../../models/msg.js";
+import { MessageType } from "../../../shared/types/msg.js";
+import { ChanType } from "../../../shared/types/chan.js";
+export default (function (irc, network) {
+    const handleAway = (type, data) => {
         const away = data.message;
         if (data.self) {
-            const msg = new msg_1.default({
+            const msg = new Msg({
                 self: true,
                 type: type,
                 text: away,
                 time: data.time,
             });
-            network.getLobby().pushMessage(client, msg, true);
+            network.getLobby().pushMessage(this, msg, true);
             return;
         }
         network.channels.forEach((chan) => {
             let user;
             switch (chan.type) {
-                case chan_1.ChanType.QUERY: {
+                case ChanType.QUERY: {
                     if (data.nick.toLowerCase() !== chan.name.toLowerCase()) {
                         return;
                     }
@@ -36,16 +28,16 @@ exports.default = (function (irc, network) {
                     // because query windows have no users
                     chan.userAway = away;
                     user = chan.getUser(data.nick);
-                    const msg = new msg_1.default({
+                    const msg = new Msg({
                         type: type,
                         text: away || "",
                         time: data.time,
                         from: user,
                     });
-                    chan.pushMessage(client, msg);
+                    chan.pushMessage(this, msg);
                     break;
                 }
-                case chan_1.ChanType.CHANNEL: {
+                case ChanType.CHANNEL: {
                     user = chan.findUser(data.nick);
                     if (!user || user.away === away) {
                         return;
@@ -55,5 +47,7 @@ exports.default = (function (irc, network) {
                 }
             }
         });
-    }
+    };
+    irc.on("away", (data) => handleAway(MessageType.AWAY, data));
+    irc.on("back", (data) => handleAway(MessageType.BACK, data));
 });

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

@@ -1,19 +1,7 @@
-"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 sts_1 = __importDefault(require("../sts"));
-exports.default = (function (irc, network) {
-    const client = this;
-    irc.on("cap ls", (data) => {
-        handleSTS(data, true);
-    });
-    irc.on("cap new", (data) => {
-        handleSTS(data, false);
-    });
-    function handleSTS(data, shouldReconnect) {
+import Msg from "../../models/msg.js";
+import STSPolicies from "../sts.js";
+export default (function (irc, network) {
+    const handleSTS = (data, shouldReconnect) => {
         if (!Object.prototype.hasOwnProperty.call(data.capabilities, "sts")) {
             return;
         }
@@ -24,18 +12,18 @@ exports.default = (function (irc, network) {
             values[value[0]] = value[1];
         });
         if (isSecure) {
-            const duration = parseInt(values.duration, 10);
+            const duration = parseInt(values.duration ?? "", 10);
             if (isNaN(duration)) {
                 return;
             }
-            sts_1.default.update(network.host, network.port, duration);
+            STSPolicies.update(network.host, network.port, duration);
         }
         else {
-            const port = parseInt(values.port, 10);
+            const port = parseInt(values.port ?? "", 10);
             if (isNaN(port)) {
                 return;
             }
-            network.getLobby().pushMessage(client, new msg_1.default({
+            network.getLobby().pushMessage(this, new Msg({
                 text: `Server sent a strict transport security policy, reconnecting to ${network.host}:${port}…`,
             }), true);
             // Forcefully end the connection if STS is seen in CAP LS
@@ -56,7 +44,13 @@ exports.default = (function (irc, network) {
                 // Start a new connection
                 irc.connect();
             }
-            client.save();
+            this.save();
         }
-    }
+    };
+    irc.on("cap ls", (data) => {
+        handleSTS(data, true);
+    });
+    irc.on("cap new", (data) => {
+        handleSTS(data, false);
+    });
 });

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

@@ -1,29 +1,30 @@
-"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;
+import Msg from "../../models/msg.js";
+import { MessageType } from "../../../shared/types/msg.js";
+export default (function (irc, network) {
     // If server supports CHGHOST cap, then changing the hostname does not require
     // sending PART and JOIN, which means less work for us over all
-    irc.on("user updated", function (data) {
+    irc.on("user updated", (data) => {
         network.channels.forEach((chan) => {
             const user = chan.findUser(data.nick);
             if (typeof user === "undefined") {
                 return;
             }
-            const msg = new msg_1.default({
+            const msg = new Msg({
                 time: data.time,
-                type: msg_2.MessageType.CHGHOST,
+                type: MessageType.CHGHOST,
                 new_ident: data.ident !== data.new_ident ? data.new_ident : "",
                 new_host: data.hostname !== data.new_hostname ? data.new_hostname : "",
                 self: data.nick === irc.user.nick,
                 from: user,
             });
-            chan.pushMessage(client, msg);
+            // Try to process through mass event aggregator
+            // No user list update needed for chghost
+            const wasBuffered = this.massEventAggregator.processMessage(network, chan, msg, () => { } // No user list changes for chghost
+            );
+            if (!wasBuffered) {
+                // Not in mass event mode - process normally
+                chan.pushMessage(this, msg);
+            }
         });
     });
 });

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

@@ -1,23 +1,25 @@
-"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 log_1 = __importDefault(require("../../log"));
-const msg_1 = __importDefault(require("../../models/msg"));
-const helper_1 = __importDefault(require("../../helper"));
-const config_1 = __importDefault(require("../../config"));
-const msg_2 = require("../../../shared/types/msg");
-const chan_1 = require("../../../shared/types/chan");
-exports.default = (function (irc, network) {
-    const client = this;
-    network.getLobby().pushMessage(client, new msg_1.default({
+import _ from "lodash";
+import log from "../../log.js";
+import Msg from "../../models/msg.js";
+import Helper from "../../helper.js";
+import Config from "../../config.js";
+import { MessageType } from "../../../shared/types/msg.js";
+import { ChanType, ChanState } from "../../../shared/types/chan.js";
+export default (function (irc, network) {
+    const sendStatus = () => {
+        const status = network.getNetworkStatus();
+        const toSend = {
+            ...status,
+            network: network.uuid,
+        };
+        this.emit("network:status", toSend);
+    };
+    network.getLobby().pushMessage(this, new Msg({
         text: "Network created, connecting to " + network.host + ":" + network.port + "...",
     }), true);
-    irc.on("registered", function () {
+    irc.on("registered", () => {
         if (network.irc.network.cap.enabled.length > 0) {
-            network.getLobby().pushMessage(client, new msg_1.default({
+            network.getLobby().pushMessage(this, new Msg({
                 text: "Enabled capabilities: " + network.irc.network.cap.enabled.join(", "),
             }), true);
         }
@@ -26,14 +28,14 @@ exports.default = (function (irc, network) {
             irc.raw("AWAY", network.awayMessage);
             // Only set generic away message if there are no clients attached
         }
-        else if (client.awayMessage && lodash_1.default.size(client.attachedClients) === 0) {
-            irc.raw("AWAY", client.awayMessage);
+        else if (this.awayMessage && _.size(this.attachedClients) === 0) {
+            irc.raw("AWAY", this.awayMessage);
         }
         let delay = 1000;
         if (Array.isArray(network.commands)) {
             network.commands.forEach((cmd) => {
-                setTimeout(function () {
-                    client.input({
+                setTimeout(() => {
+                    this.input({
                         target: network.getLobby().id,
                         text: cmd,
                     });
@@ -42,50 +44,54 @@ exports.default = (function (irc, network) {
             });
         }
         network.channels.forEach((chan) => {
-            if (chan.type !== chan_1.ChanType.CHANNEL) {
+            if (chan.type !== ChanType.CHANNEL) {
                 return;
             }
-            setTimeout(function () {
+            setTimeout(() => {
                 network.irc.join(chan.name, chan.key);
             }, delay);
             delay += 1000;
         });
     });
-    irc.on("socket connected", function () {
+    irc.on("socket connected", () => {
         if (irc.network.options.PREFIX) {
             network.serverOptions.PREFIX.update(irc.network.options.PREFIX);
         }
-        network.getLobby().pushMessage(client, new msg_1.default({
+        network.getLobby().pushMessage(this, new Msg({
             text: "Connected to the network.",
         }), true);
         sendStatus();
     });
-    irc.on("close", function () {
-        network.getLobby().pushMessage(client, new msg_1.default({
+    irc.on("close", () => {
+        network.getLobby().pushMessage(this, new Msg({
             text: "Disconnected from the network, and will not reconnect. Use /connect to reconnect again.",
         }), true);
     });
     let identSocketId;
-    irc.on("raw socket connected", function (socket) {
-        let ident = client.name || network.username;
-        if (config_1.default.values.useHexIp) {
-            ident = helper_1.default.ip2hex(client.config.browser.ip);
+    irc.on("raw socket connected", (socket) => {
+        let ident = this.name || network.username;
+        if (Config.values.useHexIp) {
+            ident = Helper.ip2hex(this.config.browser.ip);
         }
-        identSocketId = client.manager.identHandler.addSocket(socket, ident);
+        identSocketId = this.manager.identHandler.addSocket(socket, ident);
     });
-    irc.on("socket close", function (error) {
+    irc.on("socket close", (error) => {
         if (identSocketId > 0) {
-            client.manager.identHandler.removeSocket(identSocketId);
+            this.manager.identHandler.removeSocket(identSocketId);
             identSocketId = 0;
         }
         network.channels.forEach((chan) => {
             chan.users = new Map();
-            chan.state = chan_1.ChanState.PARTED;
+            chan.state = ChanState.PARTED;
         });
         if (error) {
-            network.getLobby().pushMessage(client, new msg_1.default({
-                type: msg_2.MessageType.ERROR,
-                text: `Connection closed unexpectedly: ${String(error)}`,
+            network.getLobby().pushMessage(this, new Msg({
+                type: MessageType.ERROR,
+                text: `Connection closed unexpectedly: ${error instanceof Error
+                    ? error.message
+                    : typeof error === "string"
+                        ? error
+                        : "Unknown error"}`,
             }), true);
         }
         if (network.keepNick) {
@@ -93,60 +99,52 @@ exports.default = (function (irc, network) {
             irc.options.nick = irc.user.nick = network.keepNick;
             network.setNick(network.keepNick);
             network.keepNick = null;
-            client.emit("nick", {
+            this.emit("nick", {
                 network: network.uuid,
                 nick: network.nick,
             });
         }
         sendStatus();
     });
-    if (config_1.default.values.debug.ircFramework) {
-        irc.on("debug", function (message) {
-            log_1.default.debug(`[${client.name} (${client.id}) on ${network.name} (${network.uuid}]`, message);
+    if (Config.values.debug.ircFramework) {
+        irc.on("debug", (message) => {
+            log.debug(`[${this.name} (${this.id}) on ${network.name} (${network.uuid}]`, message);
         });
     }
-    if (config_1.default.values.debug.raw) {
-        irc.on("raw", function (message) {
-            network.getLobby().pushMessage(client, new msg_1.default({
+    if (Config.values.debug.raw) {
+        irc.on("raw", (message) => {
+            network.getLobby().pushMessage(this, new Msg({
                 self: !message.from_server,
-                type: msg_2.MessageType.RAW,
+                type: MessageType.RAW,
                 text: message.line,
             }), true);
         });
     }
-    irc.on("socket error", function (err) {
-        network.getLobby().pushMessage(client, new msg_1.default({
-            type: msg_2.MessageType.ERROR,
+    irc.on("socket error", (err) => {
+        network.getLobby().pushMessage(this, new Msg({
+            type: MessageType.ERROR,
             text: "Socket error: " + err,
         }), true);
     });
-    irc.on("reconnecting", function (data) {
-        network.getLobby().pushMessage(client, new msg_1.default({
+    irc.on("reconnecting", (data) => {
+        network.getLobby().pushMessage(this, new Msg({
             text: `Disconnected from the network. Reconnecting in ${Math.round(data.wait / 1000)} seconds… (Attempt ${Number(data.attempt)})`,
         }), true);
     });
-    irc.on("ping timeout", function () {
-        network.getLobby().pushMessage(client, new msg_1.default({
+    irc.on("ping timeout", () => {
+        network.getLobby().pushMessage(this, new Msg({
             text: "Ping timeout, disconnecting…",
         }), true);
     });
-    irc.on("server options", function (data) {
+    irc.on("server options", (data) => {
         network.serverOptions.PREFIX.update(data.options.PREFIX);
         if (data.options.CHANTYPES) {
             network.serverOptions.CHANTYPES = data.options.CHANTYPES;
         }
         network.serverOptions.NETWORK = data.options.NETWORK;
-        client.emit("network:options", {
+        this.emit("network:options", {
             network: network.uuid,
             serverOptions: network.serverOptions,
         });
     });
-    function sendStatus() {
-        const status = network.getNetworkStatus();
-        const toSend = {
-            ...status,
-            network: network.uuid,
-        };
-        client.emit("network:status", toSend);
-    }
 });

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

@@ -1,28 +1,22 @@
-"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 helper_1 = __importDefault(require("../../helper"));
-const msg_1 = __importDefault(require("../../models/msg"));
-const user_1 = __importDefault(require("../../models/user"));
-const package_json_1 = __importDefault(require("../../../package.json"));
-const msg_2 = require("../../../shared/types/msg");
+import _ from "lodash";
+import Helper from "../../helper.js";
+import Msg from "../../models/msg.js";
+import User from "../../models/user.js";
+import pkg from "../../../package.json" with { type: "json" };
+import { MessageType } from "../../../shared/types/msg.js";
 const ctcpResponses = {
     CLIENTINFO: () => Object.getOwnPropertyNames(ctcpResponses)
         .filter((key) => key !== "CLIENTINFO" && typeof ctcpResponses[key] === "function")
         .join(" "),
     PING: ({ message }) => message.substring(5),
-    SOURCE: () => package_json_1.default.repository.url,
-    VERSION: () => package_json_1.default.name + " -- " + package_json_1.default.homepage,
+    SOURCE: () => pkg.repository.url,
+    VERSION: () => pkg.name + " -- " + pkg.homepage,
 };
-exports.default = (function (irc, network) {
-    const client = this;
+export default (function (irc, network) {
     const lobby = network.getLobby();
-    irc.on("ctcp response", function (data) {
-        const shouldIgnore = network.ignoreList.some(function (entry) {
-            return helper_1.default.compareHostmask(entry, data);
+    irc.on("ctcp response", (data) => {
+        const shouldIgnore = network.ignoreList.some((entry) => {
+            return Helper.compareHostmask(entry, data);
         });
         if (shouldIgnore) {
             return;
@@ -31,16 +25,16 @@ exports.default = (function (irc, network) {
         if (typeof chan === "undefined") {
             chan = lobby;
         }
-        const msg = new msg_1.default({
-            type: msg_2.MessageType.CTCP,
+        const msg = new Msg({
+            type: MessageType.CTCP,
             time: data.time,
             from: chan.getUser(data.nick),
             ctcpMessage: data.message,
         });
-        chan.pushMessage(client, msg, true);
+        chan.pushMessage(this, msg, true);
     });
     // Limit requests to a rate of one per second max
-    irc.on("ctcp request", lodash_1.default.throttle((data) => {
+    irc.on("ctcp request", _.throttle((data) => {
         // Ignore echoed ctcp requests that aren't targeted at us
         // See https://github.com/kiwiirc/irc-framework/issues/225
         if (data.nick === irc.user.nick &&
@@ -48,8 +42,8 @@ exports.default = (function (irc, network) {
             network.irc.network.cap.isEnabled("echo-message")) {
             return;
         }
-        const shouldIgnore = network.ignoreList.some(function (entry) {
-            return helper_1.default.compareHostmask(entry, data);
+        const shouldIgnore = network.ignoreList.some((entry) => {
+            return Helper.compareHostmask(entry, data);
         });
         if (shouldIgnore) {
             return;
@@ -60,13 +54,13 @@ exports.default = (function (irc, network) {
             irc.ctcpResponse(target, data.type, response(data));
         }
         // Let user know someone is making a CTCP request against their nick
-        const msg = new msg_1.default({
-            type: msg_2.MessageType.CTCP_REQUEST,
+        const msg = new Msg({
+            type: MessageType.CTCP_REQUEST,
             time: data.time,
-            from: new user_1.default({ nick: target }),
+            from: new User({ nick: target }),
             hostmask: data.ident + "@" + data.hostname,
             ctcpMessage: data.message,
         });
-        lobby.pushMessage(client, msg, true);
+        lobby.pushMessage(this, msg, true);
     }, 1000, { trailing: false }));
 });

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

@@ -1,16 +1,10 @@
-"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 config_1 = __importDefault(require("../../config"));
-const msg_2 = require("../../../shared/types/msg");
-exports.default = (function (irc, network) {
-    const client = this;
-    irc.on("irc error", function (data) {
-        const msg = new msg_1.default({
-            type: msg_2.MessageType.ERROR,
+import Msg from "../../models/msg.js";
+import Config from "../../config.js";
+import { MessageType } from "../../../shared/types/msg.js";
+export default (function (irc, network) {
+    irc.on("irc error", (data) => {
+        const msg = new Msg({
+            type: MessageType.ERROR,
             error: data.error,
             showInActive: true,
             nick: data.nick,
@@ -28,11 +22,11 @@ exports.default = (function (irc, network) {
                 msg.showInActive = false;
             }
         }
-        target.pushMessage(client, msg, true);
+        target.pushMessage(this, msg, true);
     });
-    irc.on("nick in use", function (data) {
+    irc.on("nick in use", (data) => {
         let message = data.nick + ": " + (data.reason || "Nickname is already in use.");
-        if (irc.connection.registered === false && !config_1.default.values.public) {
+        if (irc.connection.registered === false && !Config.values.public) {
             message += " An attempt to use it will be made when this nick quits.";
             // Clients usually get nick in use on connect when reconnecting to a network
             // after a network failure (like ping timeout), and as a result of that,
@@ -41,12 +35,12 @@ exports.default = (function (irc, network) {
             network.keepNick = irc.user.nick;
         }
         const lobby = network.getLobby();
-        const msg = new msg_1.default({
-            type: msg_2.MessageType.ERROR,
+        const msg = new Msg({
+            type: MessageType.ERROR,
             text: message,
             showInActive: true,
         });
-        lobby.pushMessage(client, msg, true);
+        lobby.pushMessage(this, msg, true);
         if (irc.connection.registered === false) {
             const nickLen = parseInt(network.irc.network.options.NICKLEN, 10) || 16;
             const random = (data.nick || irc.user.nick) + Math.floor(Math.random() * 10);
@@ -56,23 +50,23 @@ exports.default = (function (irc, network) {
                 irc.changeNick(random);
             }
         }
-        client.emit("nick", {
+        this.emit("nick", {
             network: network.uuid,
             nick: irc.user.nick,
         });
     });
-    irc.on("nick invalid", function (data) {
+    irc.on("nick invalid", (data) => {
         const lobby = network.getLobby();
-        const msg = new msg_1.default({
-            type: msg_2.MessageType.ERROR,
+        const msg = new Msg({
+            type: MessageType.ERROR,
             text: data.nick + ": " + (data.reason || "Nickname is invalid."),
             showInActive: true,
         });
-        lobby.pushMessage(client, msg, true);
+        lobby.pushMessage(this, msg, true);
         if (irc.connection.registered === false) {
-            irc.changeNick(config_1.default.getDefaultNick());
+            irc.changeNick(Config.getDefaultNick());
         }
-        client.emit("nick", {
+        this.emit("nick", {
             network: network.uuid,
             nick: irc.user.nick,
         });

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

@@ -1,21 +1,15 @@
-"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("help", function (data) {
+import Msg from "../../models/msg.js";
+import { MessageType } from "../../../shared/types/msg.js";
+export default (function (irc, network) {
+    irc.on("help", (data) => {
         const lobby = network.getLobby();
         if (data.help) {
-            const msg = new msg_1.default({
-                type: msg_2.MessageType.MONOSPACE_BLOCK,
+            const msg = new Msg({
+                type: MessageType.MONOSPACE_BLOCK,
                 command: "help",
                 text: data.help,
             });
-            lobby.pushMessage(client, msg, true);
+            lobby.pushMessage(this, msg, true);
         }
     });
 });

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

@@ -1,21 +1,15 @@
-"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("info", function (data) {
+import Msg from "../../models/msg.js";
+import { MessageType } from "../../../shared/types/msg.js";
+export default (function (irc, network) {
+    irc.on("info", (data) => {
         const lobby = network.getLobby();
         if (data.info) {
-            const msg = new msg_1.default({
-                type: msg_2.MessageType.MONOSPACE_BLOCK,
+            const msg = new Msg({
+                type: MessageType.MONOSPACE_BLOCK,
                 command: "info",
                 text: data.info,
             });
-            lobby.pushMessage(client, msg, true);
+            lobby.pushMessage(this, msg, true);
         }
     });
 });