From 66448c6152e398e402feac4f8141012f10842315 Mon Sep 17 00:00:00 2001 From: marlon-erler Date: Wed, 23 Sep 2026 00:40:03 +0200 Subject: [PATCH] build --- dist/index.js | 20 +++++++++++++----- src/ViewModel/Global/.coreViewModel.ts.swp | Bin 0 -> 16384 bytes .../Global/.notificationViewModel.ts.swp | Bin 12288 -> 0 bytes src/ViewModel/Global/coreViewModel.ts | 2 +- 4 files changed, 16 insertions(+), 6 deletions(-) create mode 100644 src/ViewModel/Global/.coreViewModel.ts.swp delete mode 100644 src/ViewModel/Global/.notificationViewModel.ts.swp diff --git a/dist/index.js b/dist/index.js index 1d8ea4ed..65303970 100644 --- a/dist/index.js +++ b/dist/index.js @@ -1298,7 +1298,7 @@ this.connectionModel = connectionModel2; this.chatListModel = chatListModel2; this.fileTransferModel = fileTransferModel2; - this.BUILD = "Build 26.09.22.C"; + this.BUILD = "Build 26.09.22.D"; // CONTEXT this.contextStack = /* @__PURE__ */ new Map(); this.closeContext = (contextId, fromHistoryEvent = false) => { @@ -4666,7 +4666,7 @@ }; // src/ViewModel/Global/notificationViewModel.ts - var NotificationViewModel = class _NotificationViewModel { + var NotificationViewModel = class { // init constructor(chatListViewModel2) { this.chatListViewModel = chatListViewModel2; @@ -4678,9 +4678,9 @@ this.interval = void 0; // main this.showNotification = (message) => { - const notification = _NotificationViewModel.createNotification(message); if (this.seenMessageIds.has(message.id)) return; if (this.chatListViewModel.selectedChat.value == void 0) return; + const notification = this.createNotification(message); const currentChat = this.chatListViewModel.selectedChat.value.chatModel.unwrappedPrimaryChannel; const currentPage = this.chatListViewModel.selectedChat.value.selectedPage.value; if (notification.chat == currentChat && currentPage == "messages" /* Messages */) @@ -4728,10 +4728,12 @@ }; } // util - static createNotification(message) { + createNotification(message) { + const fullChannel = ChatModel.splitChannel(message.channel)[0]; + const chat = this.chatListViewModel.stripNamespace(fullChannel); return { messageId: message.id, - chat: ChatModel.splitChannel(message.channel)[0], + chat, sender: message.sender, body: message.body }; @@ -4810,6 +4812,14 @@ } this.updateIndices(); }; + // utility + this.stripNamespace = (fullChannel) => { + for (const vm of this.chatViewModels.value) { + const fullReference = vm.chatModel.info.namespace + vm.chatModel.info.primaryChannel; + if (fullReference == fullChannel) return vm.chatModel.info.primaryChannel; + } + return fullChannel; + }; this.notificationViewModel = new NotificationViewModel(this); this.loadChats(); } diff --git a/src/ViewModel/Global/.coreViewModel.ts.swp b/src/ViewModel/Global/.coreViewModel.ts.swp new file mode 100644 index 0000000000000000000000000000000000000000..812005ee7d35288bbda547532c070cd9cf1aca50 GIT binary patch literal 16384 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 diff --git a/src/ViewModel/Global/coreViewModel.ts b/src/ViewModel/Global/coreViewModel.ts index 6c50ff2b..d75f1358 100644 --- a/src/ViewModel/Global/coreViewModel.ts +++ b/src/ViewModel/Global/coreViewModel.ts @@ -9,7 +9,7 @@ import ConnectionModel from "../../Model/Global/connectionModel"; import ChatListModel from "../../Model/Chat/chatListModel"; export default class CoreViewModel { - readonly BUILD = "Build 26.09.22.C"; + readonly BUILD = "Build 26.09.22.D"; translations: Translations;