VDMDI/CT
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use chat Id as channel, remove primary channels and namespaces

Browse Source
This commit is contained in:
marlon-erler
2026-09-26 14:12:26 +02:00
parent 87760b66d2
commit b3cb919a7d
14 changed files with 453 additions and 1637 deletions
Download Patch File Download Diff File Expand all files Collapse all files
2.vim
+270 -1389
View File
File diff suppressed because it is too large Load Diff
dist/version.txt
Vendored
+1 -1
View File
@@ -1 +1 @@
2610 Beta 10.8
2610 Beta 10
src/Model/Chat/chatListModel.ts
+2 -2
View File
@@ -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
+150 -163
View File
@@ -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,211 +263,209 @@ 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 = () => {
// untrack
this.chatListModel.untrackChat(this);
// untrack
this.chatListModel.untrackChat(this);
// delete
const dirPath: string[] = this.getBasePath();
this.storageModel.removeRecursively(dirPath);
// delete
const dirPath: string[] = this.getBasePath();
this.storageModel.removeRecursively(dirPath);
};
// load
readonly loadInfo = (): void => {
const info: ChatInfo | null = this.storageModel.readStringifiable(
this.getInfoPath(),
ChatInfoReference,
);
if (info != null) {
this.info = info;
} else {
this.info = ChatModel.generateChatInfo("0");
}
const info: ChatInfo | null = this.storageModel.readStringifiable(
this.getInfoPath(),
ChatInfoReference,
);
if (info != null) {
this.info = info;
} else {
this.info = ChatModel.generateChatInfo("0", "0");
}
};
readonly loadColor = (): void => {
const path: string[] = this.getColorPath();
const color: string | null = this.storageModel.read(path);
if (!color) {
this.color = Colors.Standard;
} else {
this.color = color as any;
}
const path: string[] = this.getColorPath();
const color: string | null = this.storageModel.read(path);
if (!color) {
this.color = Colors.Standard;
} else {
this.color = color as any;
}
};
get messages(): ChatMessage[] {
const messageIds: string[] = this.storageModel.list(
this.getMessageDirPath(),
);
if (!Array.isArray(messageIds)) return [];
const messageIds: string[] = this.storageModel.list(
this.getMessageDirPath(),
);
if (!Array.isArray(messageIds)) return [];
const chatMessages: ChatMessage[] = [];
for (const messageId of messageIds) {
const messagePath: string[] = this.getMessagePath(messageId);
const chatMessage: ChatMessage | null =
this.storageModel.readStringifiable(
messagePath,
ChatMessageReference,
);
if (chatMessage == null) continue;
chatMessages.push(chatMessage);
}
const chatMessages: ChatMessage[] = [];
for (const messageId of messageIds) {
const messagePath: string[] = this.getMessagePath(messageId);
const chatMessage: ChatMessage | null =
this.storageModel.readStringifiable(
messagePath,
ChatMessageReference,
);
if (chatMessage == null) continue;
chatMessages.push(chatMessage);
}
const sorted = chatMessages.sort((a, b) =>
a.dateSent.localeCompare(b.dateSent),
);
return sorted;
const sorted = chatMessages.sort((a, b) =>
a.dateSent.localeCompare(b.dateSent),
);
return sorted;
}
get reactions(): ChatMessageReaction[] {
const reactionIds: string[] = this.storageModel.list(
this.getReactionDirPath(),
);
if (!Array.isArray(reactionIds)) return [];
const reactionIds: string[] = this.storageModel.list(
this.getReactionDirPath(),
);
if (!Array.isArray(reactionIds)) return [];
const reactions: ChatMessageReaction[] = [];
for (const reactionId of reactionIds) {
const reactionPath: string[] = this.getReactionPath(reactionId);
const reaction: ChatMessageReaction | null =
this.storageModel.readStringifiable(
reactionPath,
ChatMessageReactionReference,
);
if (reaction == null) continue;
reactions.push(reaction);
}
const reactions: ChatMessageReaction[] = [];
for (const reactionId of reactionIds) {
const reactionPath: string[] = this.getReactionPath(reactionId);
const reaction: ChatMessageReaction | null =
this.storageModel.readStringifiable(
reactionPath,
ChatMessageReactionReference,
);
if (reaction == null) continue;
reactions.push(reaction);
}
return reactions;
return reactions;
}
// init
constructor(
storageModel: StorageModel,
connectionModel: ConnectionModel,
settingsModel: SettingsModel,
chatListModel: ChatListModel,
chatId: string,
storageModel: StorageModel,
connectionModel: ConnectionModel,
settingsModel: SettingsModel,
chatListModel: ChatListModel,
chatId: string,
) {
this.id = chatId;
this.connectionModel = connectionModel;
this.settingsModel = settingsModel;
this.storageModel = storageModel;
this.chatListModel = chatListModel;
this.id = chatId;
this.connectionModel = connectionModel;
this.settingsModel = settingsModel;
this.storageModel = storageModel;
this.chatListModel = chatListModel;
this.loadInfo();
this.loadColor();
this.subscribe();
this.loadInfo();
this.loadColor();
this.subscribe();
this.fileModel = new FileModel(
this.storageModel,
this.settingsModel,
this,
);
this.fileModel = new FileModel(
this.storageModel,
this.settingsModel,
this,
);
}
// utility
static splitChannel(channelString: string): string[] {
return channelString.split("/");
return channelString.split("/");
}
static generateChatInfo = (primaryChannel: string): ChatInfo => {
return {
dataVersion: DATA_VERSION,
static generateChatInfo = (name: string, id: string): ChatInfo => {
return {
dataVersion: DATA_VERSION,
primaryChannel,
namespace: "",
secondaryChannels: [],
encryptionKey: "",
hasUnreadMessages: false,
};
name,
secondaryChannels: [],
encryptionKey: "",
hasUnreadMessages: false,
};
};
static createChatMessage = async (
channel: string,
sender: string,
encryptionKey: string,
body: string,
inlineReplyId?: string,
fileContent?: FileContent<string>,
channel: string,
sender: string,
encryptionKey: string,
body: string,
inlineReplyId?: string,
fileContent?: FileContent<string>,
): Promise<ChatMessage> => {
const chatMessage: ChatMessage = {
dataVersion: DATA_VERSION,
const chatMessage: ChatMessage = {
dataVersion: DATA_VERSION,
id: v4(),
id: v4(),
channel,
sender,
body,
dateSent: createTimestamp(),
inlineReplyId,
channel,
sender,
body,
dateSent: createTimestamp(),
inlineReplyId,
status: ChatMessageStatuses.Outbox,
stringifiedFile: "",
};
if (fileContent != undefined) {
const stringifiedFile: string = stringify(fileContent);
chatMessage.stringifiedFile = stringifiedFile;
}
status: ChatMessageStatuses.Outbox,
stringifiedFile: "",
};
if (fileContent != undefined) {
const stringifiedFile: string = stringify(fileContent);
chatMessage.stringifiedFile = stringifiedFile;
}
if (encryptionKey != "") {
chatMessage.body = await encryptString(
chatMessage.body,
encryptionKey,
);
chatMessage.stringifiedFile = await encryptString(
chatMessage.stringifiedFile,
encryptionKey,
);
}
if (encryptionKey != "") {
chatMessage.body = await encryptString(
chatMessage.body,
encryptionKey,
);
chatMessage.stringifiedFile = await encryptString(
chatMessage.stringifiedFile,
encryptionKey,
);
}
return chatMessage;
return chatMessage;
};
static createMessageReaction = (
messageId: string,
sender: string,
content: ReactionSymbols,
isDeleting: boolean,
messageId: string,
sender: string,
content: ReactionSymbols,
isDeleting: boolean,
): ChatMessageReaction => {
const fileContent: FileContent<"reaction"> =
FileModel.createFileContent(v4(), "reaction");
const reaction: ChatMessageReaction = {
...fileContent,
fileId: ChatModel.createMessageReactionId(messageId, sender),
const fileContent: FileContent<"reaction"> =
FileModel.createFileContent(v4(), "reaction");
const reaction: ChatMessageReaction = {
...fileContent,
fileId: ChatModel.createMessageReactionId(messageId, sender),
messageId,
sender,
content,
isDeleting,
};
return reaction;
messageId,
sender,
content,
isDeleting,
};
return reaction;
};
static createMessageReactionId = (
messageId: string,
sender: string,
messageId: string,
sender: string,
): string => {
return messageId + sender;
return messageId + sender;
};
}
// types
export enum ReactionSymbols {
ThumbsUp = "👍",
Check = "✅",
Stop = "🛑",
Attention = "❗️",
DoubleAttention = "‼️",
Question = "❓",
Check = "✅",
Stop = "🛑",
Attention = "❗️",
DoubleAttention = "‼️",
Question = "❓",
}
export interface ChatInfo extends ValidObject {
primaryChannel: string;
namespace: string;
name: string;
secondaryChannels: string[];
encryptionKey: string;
@@ -486,9 +474,9 @@ export interface ChatInfo extends ValidObject {
export enum ChatMessageStatuses {
Outbox = "outbox",
Sent = "sent",
Received = "received",
Other = "other",
Sent = "sent",
Received = "received",
Other = "other",
}
export interface ChatMessage extends ValidObject {
@@ -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
+1 -1
View File
@@ -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
+3 -41
View File
@@ -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
+2 -2
View File
@@ -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
+4 -4
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+3 -3
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+13 -27
View File
@@ -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();