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

fix bugs with message hiding

Browse Source
This commit is contained in:
marlon-erler
2026-09-24 02:11:03 +02:00
parent 46f8c5c98c
commit 8a1a51e6fe
6 changed files with 348 additions and 669 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Model/Chat/chatModel.ts
+13 -1
View File
@@ -95,6 +95,10 @@ export default class ChatModel {
return [...this.getReactionDirPath(), id];
};
readonly getPreviousFilterPath = (): string[] => {
return [StorageModelSubPaths.Chat, ...filePaths.chat.previousFilter(this.id)];
}
// handlers
readonly handleMessage = (body: string): void => {
const chatMessage: ChatMessage | null = parseValidObject(
@@ -265,6 +269,14 @@ export default class ChatModel {
this.storageModel.write(this.getColorPath(), this.color);
};
readonly storeFilter = (filter: string): void => {
this.storageModel.write(this.getPreviousFilterPath(), filter);
}
readonly getFilter = (): string => {
return this.storageModel.read(this.getPreviousFilterPath());
}
readonly delete = () => {
// untrack
this.chatListModel.untrackChat(this);
@@ -541,4 +553,4 @@ export const ChatMessageReactionReference: ChatMessageReaction = {
content: "",
isDeleting: false,
};
}
src/Model/Files/fileModel.ts
+1
View File
@@ -200,6 +200,7 @@ export default class FileModel {
export enum FileModelSubPath {
Data = "data",
Model = "model",
Chat = "chat",
ModelView = "view",
ModelTask = "tasks",
ModelCalendar = "calendar",
src/Model/Global/storageModel.ts
+1
View File
@@ -254,6 +254,7 @@ export const filePaths = {
...filePaths.chat.chatBase(id),
"reactions",
],
previousFilter: (id: string) => [...filePaths.chat.chatBase(id), "previous-filter"],
lastUsedPage: (id: string) => [
...filePaths.chat.chatBase(id),
"last-used-page",
src/ViewModel/Chat/chatMessageViewModel.ts
+84 -86
View File
@@ -99,109 +99,107 @@ export default class ChatMessageViewModel {
this.isPresentingInfoModal.value = false;
};
toggleHiding = (): void => {
let hideForReactions: boolean = false;
let hideForReplyView: boolean = false;
// reactions
const reactionFilter = this.messagePageViewModel.reactionFilter.value;
if (reactionFilter == undefined) {
hideForReactions = false;
} else {
let count: number = 0;
switch (reactionFilter) {
case ReactionSymbols.ThumbsUp: {
count = this.reactionsThumbsUpCount.value;
break;
}
case ReactionSymbols.Check: {
count = this.reactionsCheckCount.value;
break;
}
case ReactionSymbols.Stop: {
count = this.reactionsStopCount.value;
break;
}
case ReactionSymbols.Attention: {
count = this.reactionsAttentionCount.value;
break;
}
case ReactionSymbols.DoubleAttention: {
count = this.reactionsDoubleAttentionCount.value;
break;
}
case ReactionSymbols.Question: {
count = this.reactionsQuestionCount.value;
break;
}
}
hideForReactions = count == 0;
}
// reply
const selectedMessage = this.messagePageViewModel.replyViewSelectedMessage.value;
if (selectedMessage == undefined) hideForReplyView = false;
else if (selectedMessage.chatMessage.id == this.chatMessage.id) hideForReplyView = false;
else if (this.inlineReply != undefined && selectedMessage.chatMessage.id == this.inlineReply.chatMessage.id) hideForReplyView = false;
else hideForReplyView = true;
this.isHidden.value = hideForReactions || hideForReplyView;
}
// reactions
handleReaction = (reaction: ChatMessageReaction): void => {
if (reaction.isDeleting) {
this.allReactions.remove(reaction.sender);
} else {
this.allReactions.set(reaction.sender, reaction);
}
if (reaction.isDeleting) {
this.allReactions.remove(reaction.sender);
} else {
this.allReactions.set(reaction.sender, reaction);
}
if (reaction.sender != this.coreViewModel.settingsModel.username)
return;
this.userReaction.value = reaction.isDeleting
? undefined
: reaction.content;
if (reaction.sender != this.coreViewModel.settingsModel.username)
return;
this.userReaction.value = reaction.isDeleting
? undefined
: reaction.content;
};
sendReaction = (content: ReactionSymbols, isDeleting: boolean): void => {
this.messagePageViewModel.sendReaction(
this.chatMessage.id,
content,
isDeleting,
);
this.messagePageViewModel.sendReaction(
this.chatMessage.id,
content,
isDeleting,
);
};
// load
loadData = (): void => {
this.channel = this.chatMessage.channel;
this.sender = this.chatMessage.sender;
this.dateSent = new Date(this.chatMessage.dateSent).toLocaleString();
this.body.value = this.chatMessage.body;
this.status.value = this.chatMessage.status;
this.channel = this.chatMessage.channel;
this.sender = this.chatMessage.sender;
this.dateSent = new Date(this.chatMessage.dateSent).toLocaleString();
this.body.value = this.chatMessage.body;
this.status.value = this.chatMessage.status;
if (this.chatMessage.inlineReplyId) {
this.inlineReply =
this.messagePageViewModel.chatMessageViewModels.value.get(
this.chatMessage.inlineReplyId,
);
if (this.chatMessage.inlineReplyId) {
this.inlineReply =
this.messagePageViewModel.chatMessageViewModels.value.get(
this.chatMessage.inlineReplyId,
);
this.inlineReply.replies.set(this.chatMessage.id, this);
}
}
};
// init
constructor(
public readonly coreViewModel: CoreViewModel,
public readonly messagePageViewModel: MessagePageViewModel,
chatMessage: ChatMessage,
sentByUser: boolean,
public readonly coreViewModel: CoreViewModel,
public readonly messagePageViewModel: MessagePageViewModel,
chatMessage: ChatMessage,
sentByUser: boolean,
) {
this.chatMessage = chatMessage;
this.sentByUser = sentByUser;
this.loadData();
this.chatMessage = chatMessage;
this.sentByUser = sentByUser;
this.loadData();
let hideForReactions: boolean = false;
let hideForReplyView: boolean = false;
const updateHiding = () => {
this.isHidden.value = hideForReactions || hideForReplyView;
}
this.messagePageViewModel.reactionFilter.subscribe((content) => {
if (content == undefined) {
hideForReactions = false;
updateHiding();
return;
}
let count: number = 0;
switch (content) {
case ReactionSymbols.ThumbsUp: {
count = this.reactionsThumbsUpCount.value;
break;
}
case ReactionSymbols.Check: {
count = this.reactionsCheckCount.value;
break;
}
case ReactionSymbols.Stop: {
count = this.reactionsStopCount.value;
break;
}
case ReactionSymbols.Attention: {
count = this.reactionsAttentionCount.value;
break;
}
case ReactionSymbols.DoubleAttention: {
count = this.reactionsDoubleAttentionCount.value;
break;
}
case ReactionSymbols.Question: {
count = this.reactionsQuestionCount.value;
break;
}
}
hideForReactions = count == 0;
updateHiding();
});
this.messagePageViewModel.replyViewSelectedMessage.subscribe(selectedMessage => {
if (selectedMessage == undefined) hideForReplyView = false;
else if (selectedMessage.chatMessage.id == this.chatMessage.id) hideForReplyView = false;
else if (this.inlineReply != undefined && selectedMessage.chatMessage.id == this.inlineReply.chatMessage.id) hideForReplyView = false;
else hideForReplyView = true;
updateHiding();
});
React.bulkSubscribe([this.messagePageViewModel.reactionFilter, this.messagePageViewModel.replyViewSelectedMessage, this.allReactions], this.toggleHiding);
this.toggleHiding();
}
}
src/ViewModel/Pages/messagePageViewModel.ts
+5
View File
@@ -127,10 +127,12 @@ export default class MessagePageViewModel extends Context {
revokeReactionFilter = (): void => {
this.reactionFilter.value = undefined;
this.chatViewModel.chatModel.storeFilter("");
};
setReactionFilter = (content: ReactionSymbols): void => {
this.reactionFilter.value = content;
this.chatViewModel.chatModel.storeFilter(content);
};
resetFilter = (): void => {
@@ -196,6 +198,9 @@ export default class MessagePageViewModel extends Context {
this.reactionFilter.value != undefined,
);
const previousFilter = this.chatViewModel.chatModel.getFilter() as any;
if (Object.values(ReactionSymbols).includes(previousFilter)) this.setReactionFilter(previousFilter);
// keystrokes
this.registerKeyStroke(CommonKeys.Filter, this.showFilterModal);
this.registerKeyStroke(CommonKeys.CloseOrCancel, () => {