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

package/dist/server/models/chan.js

@@ -1,16 +1,11 @@
-"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 config_1 = __importDefault(require("../config"));
-const user_1 = __importDefault(require("./user"));
-const storage_1 = __importDefault(require("../plugins/storage"));
-const prefix_1 = __importDefault(require("./prefix"));
-const msg_1 = require("../../shared/types/msg");
-const chan_1 = require("../../shared/types/chan");
+import _ from "lodash";
+import log from "../log.js";
+import Config from "../config.js";
+import User from "./user.js";
+import storage from "../plugins/storage.js";
+import Prefix from "./prefix.js";
+import { MessageType } from "../../shared/types/msg.js";
+import { ChanType, ChanState } from "../../shared/types/chan.js";
 class Chan {
     // TODO: don't force existence, figure out how to make TS infer it.
     id;
@@ -25,6 +20,7 @@ class Chan {
     muted;
     type;
     state;
+    pinned;
     // mIRC FiSH Blowfish key, stored server-side only
     blowfishKey;
     userAway;
@@ -32,20 +28,22 @@ class Chan {
     data;
     closed;
     num_users;
+    groups;
     constructor(attr) {
-        lodash_1.default.defaults(this, attr, {
+        _.defaults(this, attr, {
             id: 0,
             messages: [],
             name: "",
             key: "",
             topic: "",
-            type: chan_1.ChanType.CHANNEL,
-            state: chan_1.ChanState.PARTED,
+            type: ChanType.CHANNEL,
+            state: ChanState.PARTED,
             firstUnread: 0,
             unread: 0,
             highlight: 0,
             users: new Map(),
             muted: false,
+            pinned: false,
         });
     }
     destroy() {
@@ -55,7 +53,7 @@ class Chan {
         const chanId = this.id;
         msg.id = client.idMsg++;
         // If this channel is open in any of the clients, do not increase unread counter
-        const isOpen = lodash_1.default.find(client.attachedClients, { openChannel: chanId }) !== undefined;
+        const isOpen = _.find(client.attachedClients, { openChannel: chanId }) !== undefined;
         if (msg.self) {
             // reset counters/markers when receiving self-/echo-message
             this.unread = 0;
@@ -76,7 +74,7 @@ class Chan {
         client.emit("msg", { chan: chanId, msg, unread: this.unread, highlight: this.highlight });
         // Never store messages in public mode as the session
         // is completely destroyed when the page gets closed
-        if (config_1.default.values.public) {
+        if (Config.values.public) {
             return;
         }
         // showInActive is only processed on "msg", don't need it on page reload
@@ -84,24 +82,24 @@ class Chan {
             delete msg.showInActive;
         }
         this.writeUserLog(client, msg);
-        if (config_1.default.values.maxHistory >= 0 && this.messages.length > config_1.default.values.maxHistory) {
-            const deleted = this.messages.splice(0, this.messages.length - config_1.default.values.maxHistory);
+        if (Config.values.maxHistory >= 0 && this.messages.length > Config.values.maxHistory) {
+            const deleted = this.messages.splice(0, this.messages.length - Config.values.maxHistory);
             // If maxHistory is 0, image would be dereferenced before client had a chance to retrieve it,
             // so for now, just don't implement dereferencing for this edge case.
-            if (config_1.default.values.maxHistory > 0) {
+            if (Config.values.maxHistory > 0) {
                 this.dereferencePreviews(deleted);
             }
         }
     }
     dereferencePreviews(messages) {
-        if (!config_1.default.values.prefetch || !config_1.default.values.prefetchStorage) {
+        if (!Config.values.prefetch || !Config.values.prefetchStorage) {
             return;
         }
         messages.forEach((message) => {
             if (message.previews) {
                 message.previews.forEach((preview) => {
                     if (preview.thumb) {
-                        storage_1.default.dereference(preview.thumb);
+                        storage.dereference(preview.thumb);
                         preview.thumb = "";
                     }
                 });
@@ -132,7 +130,7 @@ class Chan {
         return this.users.get(nick.toLowerCase());
     }
     getUser(nick) {
-        return this.findUser(nick) || new user_1.default({ nick }, new prefix_1.default([]));
+        return this.findUser(nick) || new User({ nick }, new Prefix([]));
     }
     setUser(user) {
         this.users.set(user.nick.toLowerCase(), user);
@@ -176,10 +174,12 @@ class Chan {
             muted: this.muted,
             type: this.type,
             state: this.state,
+            pinned: this.pinned,
             special: this.special,
             data: this.data,
             closed: this.closed,
             num_users: this.num_users,
+            groups: this.groups,
         };
         // TODO: funny array mutation below might need to be reproduced
         // static optionalProperties = ["userAway", "special", "data", "closed", "num_users"];
@@ -196,13 +196,12 @@ class Chan {
         if (client.messageStorage.length === 0) {
             return;
         }
-        const targetChannel = this;
         // Is this particular message or channel loggable
         if (!msg.isLoggable() || !this.isLoggable()) {
             // Because notices are nasty and can be shown in active channel on the client
             // if there is no open query, we want to always log notices in the sender's name
-            if (msg.type === msg_1.MessageType.NOTICE && msg.showInActive) {
-                targetChannel.name = msg.from.nick || ""; // TODO: check if || works
+            if (msg.type === MessageType.NOTICE && msg.showInActive) {
+                this.name = msg.from.nick || ""; // TODO: check if || works
             }
             else {
                 return;
@@ -214,7 +213,7 @@ class Chan {
             return;
         }
         for (const messageStorage of client.messageStorage) {
-            messageStorage.index(target.network, targetChannel, msg).catch((e) => log_1.default.error(e));
+            messageStorage.index(target.network, this, msg).catch((e) => log.error(e));
         }
     }
     loadMessages(client, network) {
@@ -223,7 +222,7 @@ class Chan {
         }
         if (!network.irc) {
             // Network created, but misconfigured
-            log_1.default.warn(`Failed to load messages for ${client.name}, network ${network.name} is not initialized.`);
+            log.warn(`Failed to load messages for ${client.name}, network ${network.name} is not initialized.`);
             return;
         }
         if (!client.messageProvider) {
@@ -247,9 +246,13 @@ class Chan {
             if (!this.firstUnread) {
                 this.firstUnread = messages[messages.length - 1].id;
             }
+            const enhancedSearch = Boolean(client.config.clientSettings.searchEnabled &&
+                client.config.clientSettings.enableEnhancedSearch);
+            // if enhancedSearchEnabled = true send all loaded messages to the client
+            // otherwise only send 100
             client.emit("more", {
                 chan: this.id,
-                messages: messages.slice(-100),
+                messages: enhancedSearch ? messages : messages.slice(-100),
                 totalMessages: messages.length,
             });
             if (network.irc.network.cap.isEnabled("znc.in/playback")) {
@@ -257,10 +260,10 @@ class Chan {
                 requestZncPlayback(this, network, from);
             }
         })
-            .catch((err) => log_1.default.error(`Failed to load messages for ${client.name}: ${err.toString()}`));
+            .catch((err) => log.error(`Failed to load messages for ${client.name}: ${err.toString()}`));
     }
     isLoggable() {
-        return this.type === chan_1.ChanType.CHANNEL || this.type === chan_1.ChanType.QUERY;
+        return this.type === ChanType.CHANNEL || this.type === ChanType.QUERY;
     }
     setMuteStatus(muted) {
         this.muted = !!muted;
@@ -272,4 +275,4 @@ function requestZncPlayback(channel, network, from) {
     }
     network.irc.raw("ZNC", "*playback", "PLAY", channel.name, from.toString());
 }
-exports.default = Chan;
+export default Chan;

package/dist/server/models/msg.js

@@ -1,10 +1,5 @@
-"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 = require("../../shared/types/msg");
+import _ from "lodash";
+import { MessageType, } from "../../shared/types/msg.js";
 class Msg {
     from;
     id;
@@ -39,6 +34,7 @@ class Msg {
     users;
     statusmsgGroup;
     params;
+    massEventSummary;
     constructor(attr) {
         // Some properties need to be copied in the Msg object instead of referenced
         if (attr) {
@@ -51,12 +47,12 @@ class Msg {
                 }
             });
         }
-        lodash_1.default.defaults(this, attr, {
+        _.defaults(this, attr, {
             from: {},
             id: 0,
             previews: [],
             text: "",
-            type: msg_1.MessageType.MESSAGE,
+            type: MessageType.MESSAGE,
             self: false,
         });
         if (this.time) {
@@ -70,23 +66,23 @@ class Msg {
         return this.previews.find((preview) => preview.link === link);
     }
     isLoggable() {
-        if (this.type === msg_1.MessageType.TOPIC) {
+        if (this.type === MessageType.TOPIC) {
             // Do not log topic that is sent on channel join
             return !!this.from.nick;
         }
         switch (this.type) {
-            case msg_1.MessageType.MONOSPACE_BLOCK:
-            case msg_1.MessageType.ERROR:
-            case msg_1.MessageType.TOPIC_SET_BY:
-            case msg_1.MessageType.MODE_CHANNEL:
-            case msg_1.MessageType.MODE_USER:
-            case msg_1.MessageType.RAW:
-            case msg_1.MessageType.WHOIS:
-            case msg_1.MessageType.PLUGIN:
+            case MessageType.MONOSPACE_BLOCK:
+            case MessageType.ERROR:
+            case MessageType.TOPIC_SET_BY:
+            case MessageType.MODE_CHANNEL:
+            case MessageType.MODE_USER:
+            case MessageType.RAW:
+            case MessageType.WHOIS:
+            case MessageType.PLUGIN:
                 return false;
             default:
                 return true;
         }
     }
 }
-exports.default = Msg;
+export default Msg;