Prevent from being temp forever

RocketChat · Aug 24, 2022 · 1c15862 · 1c15862
1 parent 76ed463
commit 1c15862
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/apps/meteor/app/models/client/models/ChatMessage.ts b/apps/meteor/app/models/client/models/ChatMessage.ts
@@ -25,7 +25,10 @@ class ChatMessageCollection extends Mongo.Collection<IMessage & { ignored?: bool
 }
 
 // TODO: check if we can dodge these missing typings from Meteor Collection Hooks
-export const ChatMessage = new ChatMessageCollection() as unknown as Mongo.Collection<IMessage & { ignored?: boolean }> & {
+export const ChatMessage = new ChatMessageCollection() as unknown as Mongo.Collection<
+	Omit<IMessage, '_id'> & { ignored?: boolean },
+	IMessage & { ignored?: boolean }
+> & {
 	direct: Mongo.Collection<Omit<IMessage, '_id'>, IMessage>;
 
 	queries: unknown[];

diff --git a/apps/meteor/app/threads/client/flextab/thread.ts b/apps/meteor/app/threads/client/flextab/thread.ts
@@ -27,7 +27,7 @@ type ThreadTemplateInstance = Blaze.TemplateInstance<{
 	mainMessage: IMessage;
 }> & {
 	firstNode: HTMLElement;
-	Threads: Mongo.Collection<IMessage> & {
+	Threads: Mongo.Collection<Omit<IMessage, '_id'>, IMessage> & {
 		direct: Mongo.Collection<Omit<IMessage, '_id'>, IMessage>;
 		queries: unknown[];
 	};
@@ -169,7 +169,7 @@ Template.thread.helpers({
 });
 
 Template.thread.onCreated(async function (this: ThreadTemplateInstance) {
-	this.Threads = new Mongo.Collection(null) as Mongo.Collection<IMessage> & {
+	this.Threads = new Mongo.Collection(null) as Mongo.Collection<Omit<IMessage, '_id'>, IMessage> & {
 		direct: Mongo.Collection<Omit<IMessage, '_id'>, IMessage>;
 		queries: unknown[];
 	};
@@ -304,10 +304,10 @@ Template.thread.onRendered(function (this: ThreadTemplateInstance) {
 			},
 		).observe({
 			added: ({ _id, ...message }: IMessage) => {
-				this.Threads.upsert({ _id }, { $set: message });
+				this.Threads.upsert({ _id }, message);
 			},
 			changed: ({ _id, ...message }: IMessage) => {
-				this.Threads.update({ _id }, { $set: message });
+				this.Threads.update({ _id }, message);
 			},
 			removed: ({ _id }: IMessage) => this.Threads.remove(_id),
 		});

diff --git a/apps/meteor/app/ui/client/lib/ChatMessages.ts b/apps/meteor/app/ui/client/lib/ChatMessages.ts
@@ -54,7 +54,7 @@ export class ChatMessages {
 	$input: JQuery<HTMLTextAreaElement> | undefined;
 
 	constructor(
-		public collection: Mongo.Collection<IMessage> & {
+		public collection: Mongo.Collection<Omit<IMessage, '_id'>, IMessage> & {
 			direct: Mongo.Collection<Omit<IMessage, '_id'>, IMessage>;
 			queries: unknown[];
 		} = ChatMessage,