fix bugs with marquee

dist/index.js

@@ -1298,7 +1298,7 @@
       this.connectionModel = connectionModel2;
       this.chatListModel = chatListModel2;
       this.fileTransferModel = fileTransferModel2;
-      this.BUILD = "Build 26.09.22.D";
+      this.BUILD = "Build 26.09.22.E";
       // CONTEXT
       this.contextStack = /* @__PURE__ */ new Map();
       this.closeContext = (contextId, fromHistoryEvent = false) => {
@@ -4683,18 +4683,19 @@
         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 */)
+        if (notification.fullChannel == currentChat && currentPage == "messages" /* Messages */)
           return;
         this.messagesInMarquee.push(notification);
         this.startLoop();
       };
       this.openNotification = () => {
         const notification = this.marquee.value;
+        console.log(notification);
         if (notification == void 0) return;
         const chat = [
           ...this.chatListViewModel.chatViewModels.value.values()
         ].find(
-          (chat2) => chat2.chatModel.unwrappedPrimaryChannel == notification.chat
+          (chat2) => chat2.chatModel.unwrappedPrimaryChannel == notification.fullChannel
         );
         if (!chat) return;
         chat.open();
@@ -4734,6 +4735,7 @@
       return {
         messageId: message.id,
         chat,
+        fullChannel,
         sender: message.sender,
         body: message.body
       };
@@ -4815,7 +4817,7 @@
       // utility
       this.stripNamespace = (fullChannel) => {
         for (const vm of this.chatViewModels.value) {
-          const fullReference = vm.chatModel.info.namespace + vm.chatModel.info.primaryChannel;
+          const fullReference = vm.chatModel.unwrappedPrimaryChannel;
           if (fullReference == fullChannel) return vm.chatModel.info.primaryChannel;
         }
         return fullChannel;

src/ViewModel/Chat/chatListViewModel.ts

@@ -106,7 +106,7 @@ export default class ChatListViewModel {
     // utility
     stripNamespace = (fullChannel: string): string => {
     	for (const vm of this.chatViewModels.value) {
-	    const fullReference = vm.chatModel.info.namespace + vm.chatModel.info.primaryChannel;
+	    const fullReference = vm.chatModel.unwrappedPrimaryChannel;
 	    if (fullReference == fullChannel) return vm.chatModel.info.primaryChannel;
 	}
 

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.D";
+    readonly BUILD = "Build 26.09.22.E";
 
     translations: Translations;
 

src/ViewModel/Global/notificationViewModel.ts

@@ -24,7 +24,7 @@ export default class NotificationViewModel {
         const currentPage =
             this.chatListViewModel.selectedChat.value.selectedPage.value;
         if (
-            notification.chat == currentChat &&
+            notification.fullChannel == currentChat &&
             currentPage == ChatPageTypes.Messages
         )
             return;
@@ -35,13 +35,14 @@ export default class NotificationViewModel {
 
     openNotification = () => {
         const notification: Notification | undefined = this.marquee.value;
+	console.log(notification);
         if (notification == undefined) return;
 
         const chat = [
             ...this.chatListViewModel.chatViewModels.value.values(),
         ].find(
             (chat) =>
-                chat.chatModel.unwrappedPrimaryChannel == notification.chat,
+                chat.chatModel.unwrappedPrimaryChannel == notification.fullChannel,
         );
         if (!chat) return;
         chat.open();
@@ -91,6 +92,7 @@ export default class NotificationViewModel {
         return {
             messageId: message.id,
             chat,
+	    fullChannel,
             sender: message.sender,
             body: message.body,
         };
@@ -100,6 +102,7 @@ export default class NotificationViewModel {
 export interface Notification {
     messageId: string;
     chat: string;
+    fullChannel: string;
     sender: string;
     body: string;
 }