fix merge conflict in chat.ts

Dnouv · Apr 12, 2023 · 3810441 · 3810441
1 parent 11555d3
commit 3810441
Showing 1 changed file with 0 additions and 11 deletions.
diff --git a/apps/meteor/app/api/server/v1/chat.ts b/apps/meteor/app/api/server/v1/chat.ts
@@ -33,13 +33,7 @@ API.v1.addRoute(
 				}),
 			);
 
-<<<<<<< HEAD
 			const msg = await Messages.findOneById(this.bodyParams.msgId, { projection: { u: 1, rid: 1 } });
-=======
-			const { userId } = this;
-
-			const msg = await Messages.findOneById(this.bodyParams.msgId, { fields: { u: 1, rid: 1 } });
->>>>>>> 50a90d704c (temp fix chat endpoint)
 
 			if (!msg) {
 				return API.v1.failure(`No message found with the id of "${this.bodyParams.msgId}".`);
@@ -60,11 +54,6 @@ API.v1.addRoute(
 			await Meteor.runAsUser(this.bodyParams.asUser ? msg.u._id : this.userId, async () => {
 				await Meteor.callAsync('deleteMessage', { _id: msg._id });
 			});
-<<<<<<< HEAD
-=======
-
-			// await deleteMessage(msg, this.bodyParams.asUser ? msg.u._id : this.userId);
->>>>>>> 50a90d704c (temp fix chat endpoint)
 
 			return API.v1.success({
 				_id: msg._id,