use chat Id as channel, remove primary channels and namespaces

dist/version.txt

@@ -1 +1 @@
-2610 Beta 10.8
+2610 Beta 10

src/Model/Chat/chatListModel.ts

@@ -34,7 +34,7 @@ export default class ChatListModel {
             this,
             id,
         );
-        chatModel.setPrimaryChannel(primaryChannel);
+        chatModel.setName(primaryChannel);
 
         this.addChatModel(chatModel);
         return chatModel;
@@ -73,7 +73,7 @@ export default class ChatListModel {
 
         for (const chatModel of this.chatModels) {
             for (const channel of allChannels) {
-                if (channel != chatModel.unwrappedPrimaryChannel) continue;
+                if (channel != chatModel.id) continue;
                 fn(chatModel);
                 break;
             }

src/Model/Chat/chatModel.ts

@@ -37,10 +37,6 @@ export default class ChatModel {
     info: ChatInfo; /* load function called in constructor */
     color: Colors = Colors.Standard;
 
-    get unwrappedPrimaryChannel(): string {
-        return this.info.namespace + this.info.primaryChannel;
-    }
-
     get secondaryChannels(): string[] {
         return this.info.secondaryChannels.sort(localeCompare);
     }
@@ -136,14 +132,8 @@ export default class ChatModel {
     };
 
     // settings
-    readonly setPrimaryChannel = (primaryChannel: string): void => {
-        this.info.primaryChannel = primaryChannel;
-        this.storeInfo();
-        this.subscribe();
-    };
-
-    readonly setNamespace = (namespace: string): void => {
-        this.info.namespace = namespace;
+    readonly setName = (name: string): void => {
+        this.info.name = name;
         this.storeInfo();
         this.subscribe();
     };
@@ -184,7 +174,7 @@ export default class ChatModel {
         const senderName: string = this.settingsModel.username;
         if (senderName == "") return false;
 
-        const allChannels: string[] = [this.unwrappedPrimaryChannel];
+        const allChannels: string[] = [this.id];
         for (const secondaryChannel of this.info.secondaryChannels) {
             allChannels.push(secondaryChannel);
         }
@@ -252,7 +242,7 @@ export default class ChatModel {
     };
 
     readonly subscribe = (): void => {
-        this.connectionModel.addChannel(this.unwrappedPrimaryChannel);
+        this.connectionModel.addChannel(this.id);
     };
 
     readonly setReadStatus = (hasUnreadMessages: boolean): void => {
@@ -273,8 +263,8 @@ export default class ChatModel {
 	this.storageModel.write(this.getPreviousFilterPath(), filter);
     }
     
-    readonly getFilter = (): string => {
-	return this.storageModel.read(this.getPreviousFilterPath());
+    readonly getFilter = (): string=> {
+	return this.storageModel.read(this.getPreviousFilterPath()) || "";
     }
 
     readonly delete = () => {
@@ -295,7 +285,7 @@ export default class ChatModel {
 	if (info != null) {
 	    this.info = info;
 	} else {
-            this.info = ChatModel.generateChatInfo("0");
+	    this.info = ChatModel.generateChatInfo("0", "0");
 	}
     };
 
@@ -384,12 +374,11 @@ export default class ChatModel {
 	return channelString.split("/");
     }
 
-    static generateChatInfo = (primaryChannel: string): ChatInfo => {
+    static generateChatInfo = (name: string, id: string): ChatInfo => {
 	return {
 	    dataVersion: DATA_VERSION,
 
-            primaryChannel,
-            namespace: "",
+	    name,
 	    secondaryChannels: [],
 	    encryptionKey: "",
 	    hasUnreadMessages: false,
@@ -476,8 +465,7 @@ export enum ReactionSymbols {
 }
 
 export interface ChatInfo extends ValidObject {
-    primaryChannel: string;
-    namespace: string;
+    name: string;
     secondaryChannels: string[];
     encryptionKey: string;
 
@@ -506,7 +494,7 @@ export interface ChatMessage extends ValidObject {
 }
 
 export interface ChatMessageReaction
-    extends ValidObject, FileContent<"reaction"> {
+extends ValidObject, FileContent<"reaction"> {
     readonly messageId: string;
     readonly sender: string;
     readonly content: ReactionSymbols | string;
@@ -517,8 +505,7 @@ export interface ChatMessageReaction
 export const ChatInfoReference: ChatInfo = {
     dataVersion: DATA_VERSION,
 
-    primaryChannel: "",
-    namespace: "",
+    name: "",
     secondaryChannels: [""],
     encryptionKey: "",
 

src/View/ChatPages/messagePage.tsx

@@ -78,7 +78,7 @@ messagePageViewModel.focusSetter.subscribeSilent(() => {
 
 const isInReplyView = React.createProxyState([messagePageViewModel.replyViewSelectedMessage], ()=>messagePageViewModel.replyViewSelectedMessage.value != undefined);
 
-const title = React.createProxyState([messagePageViewModel.isReplyViewActive], ()=>messagePageViewModel.isReplyViewActive.value ? coreViewModel.translations.chatPage.message.replyHeaderLabel(messagePageViewModel.replyViewSelectedMessage.value.body.value) : coreViewModel.translations.chatPage.message.messagesHeadline);
+const title = React.createProxyState([messagePageViewModel.isReplyViewActive], ()=>messagePageViewModel.isReplyViewActive.value ? coreViewModel.translations.chatPage.message.replyHeaderLabel((messagePageViewModel.replyViewSelectedMessage.value!).body.value) : coreViewModel.translations.chatPage.message.messagesHeadline);
 
 return (
     <div id="message-page" toggle:reply-view={isInReplyView}>

src/View/ChatPages/settingsPage.tsx

@@ -48,10 +48,10 @@ export function SettingsPage(
                                 </span>
                                 <input
                                     bind:value={
-                                        settingsPageViewModel.primaryChannelInput
+                                        settingsPageViewModel.nameInput
                                     }
                                     on:enter={
-                                        settingsPageViewModel.setPrimaryChannel
+                                        settingsPageViewModel.setName
                                     }
                                 ></input>
                             </div>
@@ -64,7 +64,7 @@ export function SettingsPage(
                                         .setPrimaryChannelButtonAudioLabel
                                 }
                                 on:click={
-                                    settingsPageViewModel.setPrimaryChannel
+                                    settingsPageViewModel.setName
                                 }
                                 toggle:disabled={
                                     settingsPageViewModel.cannotSetPrimaryChannel
@@ -77,44 +77,6 @@ export function SettingsPage(
 
                         <hr></hr>
 
-                        <label class="tile flex-no">
-                            <span class="icon">category</span>
-                            <div>
-                                <span>
-                                    {
-                                        coreViewModel.translations.chatPage
-                                            .settings.namespaceLabel
-                                    }
-                                </span>
-                                <input
-                                    bind:value={
-                                        settingsPageViewModel.namespaceInput
-                                    }
-                                    on:enter={
-                                        settingsPageViewModel.setNamespace
-                                    }
-                                ></input>
-                            </div>
-                        </label>
-                        <div class="flex-row justify-end width-input">
-                            <button
-                                class="width-50"
-                                aria-label={
-                                    coreViewModel.translations.chatPage.settings
-                                        .setNamespaceButtonAudioLabel
-                                }
-                                on:click={settingsPageViewModel.setNamespace}
-                                toggle:disabled={
-                                    settingsPageViewModel.cannotSetNamespace
-                                }
-                            >
-                                {coreViewModel.translations.general.setButton}
-                                <span class="icon">check</span>
-                            </button>
-                        </div>
-
-                        <hr></hr>
-
                         <div class="flex-row width-input margin-bottom">
                             <input
                                 aria-label={

src/View/Components/chatEntry.tsx

@@ -13,12 +13,12 @@ export function ChatEntry(chatViewModel: ChatViewModel) {
             <span
                 class="shadow"
                 subscribe:innerText={
-                    chatViewModel.settingsPageViewModel.primaryChannel
+                    chatViewModel.settingsPageViewModel.name
                 }
             ></span>
             <h2
                 subscribe:innerText={
-                    chatViewModel.settingsPageViewModel.primaryChannel
+                    chatViewModel.settingsPageViewModel.name
                 }
             ></h2>
         </button>

src/ViewModel/Chat/chatListViewModel.ts

@@ -13,7 +13,7 @@ export default class ChatListViewModel {
     // data
     readonly chatIndexManager = new IndexManager<ChatViewModel>(
         (chatViewModel: ChatViewModel) =>
-            chatViewModel.settingsPageViewModel.primaryChannel.value,
+            chatViewModel.settingsPageViewModel.name.value,
     );
 
     // state
@@ -104,10 +104,10 @@ export default class ChatListViewModel {
     }
 
     // utility
-    stripNamespace = (fullChannel: string): string => {
+    getDisplayName = (fullChannel: string): string => {
     	for (const vm of this.chatViewModels.value) {
-	    const fullReference = vm.chatModel.unwrappedPrimaryChannel;
-	    if (fullReference == fullChannel) return vm.chatModel.info.primaryChannel;
+	    const fullReference = vm.chatModel.id;
+	    if (fullReference == fullChannel) return vm.chatModel.info.name;
 	}
 
 	return fullChannel;

src/ViewModel/Chat/chatMessageViewModel.ts

@@ -184,7 +184,7 @@ export default class ChatMessageViewModel {
 		this.messagePageViewModel.chatMessageViewModels.value.get(
 		    this.chatMessage.inlineReplyId,
 		);
-	    this.inlineReply.replies.set(this.chatMessage.id, this);
+	    this.inlineReply?.replies.set(this.chatMessage.id, this);
 	}
     };
 

src/ViewModel/Global/fileTransferViewModel.ts

@@ -128,7 +128,7 @@ export default class FileTransferViewModel extends Context {
             this.coreViewModel.chatListModel.chatModels;
         for (const chatModel of chatModels) {
             this.chatFileOptions.add({
-                label: chatModel.unwrappedPrimaryChannel,
+                label: chatModel.info.name,
                 path: chatModel.getBasePath(),
             });
         }

src/ViewModel/Global/notificationViewModel.ts

@@ -20,7 +20,7 @@ export default class NotificationViewModel {
             this.createNotification(message);
         const currentChat =
             this.chatListViewModel.selectedChat.value.chatModel
-                .unwrappedPrimaryChannel;
+                .id;
         const currentPage =
             this.chatListViewModel.selectedChat.value.selectedPage.value;
         if (
@@ -41,7 +41,7 @@ export default class NotificationViewModel {
             ...this.chatListViewModel.chatViewModels.value.values(),
         ].find(
             (chat) =>
-                chat.chatModel.unwrappedPrimaryChannel == notification.fullChannel,
+                chat.chatModel.id == notification.fullChannel,
         );
         if (!chat) return;
         chat.open();
@@ -87,7 +87,7 @@ export default class NotificationViewModel {
     // util
     createNotification(message: ChatMessage): Notification {
 	const fullChannel = ChatModel.splitChannel(message.channel)[0];
-	const chat = this.chatListViewModel.stripNamespace(fullChannel);
+	const chat = this.chatListViewModel.getDisplayName(fullChannel);
         return {
             messageId: message.id,
             chat,

src/ViewModel/Pages/calendarPageViewModel.ts

@@ -40,7 +40,7 @@ export default class CalendarPageViewModel extends TaskContainingPageViewModel {
         MonthGrid<React.MapState<TaskViewModel>> | undefined
     > = new React.State<any>(undefined);
     
-    nextTask: React.State<TaskViewModel|undefined> = new React.State(undefined);
+    nextTask = new React.State<TaskViewModel|undefined>(undefined);
 
     // methods
     createEvent = (): void => {

src/ViewModel/Pages/messagePageViewModel.ts

@@ -16,7 +16,7 @@ export default class MessagePageViewModel extends Context {
         new React.MapState();
     filteredMessageViewModels: React.ListState<ChatMessageViewModel> =
         new React.ListState();
-    replyViewSelectedMessage: React.State<ChatMessageViewModel|undefined> = new React.State(undefined);
+    replyViewSelectedMessage = new React.State<ChatMessageViewModel|undefined>(undefined);
     isReplyViewActive: React.State<boolean> = React.createProxyState([this.replyViewSelectedMessage], ()=>this.replyViewSelectedMessage.value != undefined);
     isReplyViewInactive = React.createProxyState([this.isReplyViewActive], ()=>!this.isReplyViewActive.value);
     searchViewModel: SearchViewModel<ChatMessageViewModel>;

src/ViewModel/Pages/settingsPageViewModel.ts

@@ -5,11 +5,8 @@ import { Colors } from "../../colors";
 
 export default class SettingsPageViewModel extends Context {
     // state
-    primaryChannel: React.State<string> = new React.State("");
-    primaryChannelInput: React.State<string> = new React.State("");
-
-    namespace: React.State<string> = new React.State("");
-    namespaceInput: React.State<string> = new React.State("");
+    name: React.State<string> = new React.State("");
+    nameInput: React.State<string> = new React.State("");
 
     secondaryChannels: React.ListState<string> = new React.ListState();
     newSecondaryChannelInput: React.State<string> = new React.State("");
@@ -25,14 +22,10 @@ export default class SettingsPageViewModel extends Context {
 
     // guards
     cannotSetPrimaryChannel: React.State<boolean> = React.createProxyState(
-        [this.primaryChannel, this.primaryChannelInput],
+        [this.name, this.nameInput],
         () =>
-            this.primaryChannelInput.value == "" ||
-            this.primaryChannelInput.value == this.primaryChannel.value,
-    );
-    cannotSetNamespace: React.State<boolean> = React.createProxyState(
-        [this.namespace, this.namespaceInput],
-        () => this.namespaceInput.value == this.namespace.value,
+            this.nameInput.value == "" ||
+            this.nameInput.value == this.name.value,
     );
     cannotAddSecondaryChannel: React.State<boolean> = React.createProxyState(
         [this.newSecondaryChannelInput],
@@ -41,21 +34,16 @@ export default class SettingsPageViewModel extends Context {
     cannotSetEncryptionKey: React.State<boolean>;
 
     // methods
-    setPrimaryChannel = (): void => {
-        this.chatViewModel.chatModel.setPrimaryChannel(
-            this.primaryChannelInput.value,
+    setName = (): void => {
+        this.chatViewModel.chatModel.setName(
+            this.nameInput.value,
         );
-        this.primaryChannel.value =
-            this.chatViewModel.chatModel.info.primaryChannel;
+        this.name.value =
+            this.chatViewModel.chatModel.info.name;
 
         this.chatViewModel.chatListViewModel.updateIndices();
     };
 
-    setNamespace = (): void => {
-        this.chatViewModel.chatModel.setNamespace(this.namespaceInput.value);
-        this.namespace.value = this.chatViewModel.chatModel.info.namespace;
-    };
-
     addSecondaryChannel = (): void => {
         this.secondaryChannels.add(this.newSecondaryChannelInput.value);
         this.newSecondaryChannelInput.value = "";
@@ -95,16 +83,14 @@ export default class SettingsPageViewModel extends Context {
 
     // load
     preloadData = (): void => {
-        this.primaryChannel.value =
-            this.chatViewModel.chatModel.info.primaryChannel;
-        this.namespace.value = this.chatViewModel.chatModel.info.namespace;
+        this.name.value =
+            this.chatViewModel.chatModel.info.name;
 
         this.color.value = this.chatViewModel.chatModel.color;
     };
 
     loadData = (): void => {
-        this.primaryChannelInput.value = this.primaryChannel.value;
-        this.namespaceInput.value = this.namespace.value;
+        this.nameInput.value = this.name.value;
 
         this.loadSecondaryChannels();