Regression: Fix sort field files.list (#25687)

Co-authored-by: Fábio Albuquerque <albuquerquefabio@icloud.com>
RocketChat · May 31, 2022 · 51845b1 · 51845b1
1 parent 713120e
commit 51845b1
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 27 deletions.
diff --git a/apps/meteor/app/api/server/helpers/insertUserObject.ts b/apps/meteor/app/api/server/helpers/insertUserObject.ts
@@ -1,11 +1,12 @@
+import { Meteor } from 'meteor/meteor';
+
 import { Users } from '../../../models/server';
 import { API } from '../api';
 
 API.helperMethods.set(
 	'insertUserObject',
-	function _addUserToObject({ object, userId }: { object: { [key: string]: unknown }; userId: string }) {
+	Meteor.bindEnvironment(function _addUserToObject({ object, userId }: { object: { [key: string]: unknown }; userId: string }) {
 		// Maybe `object: { [key: string]: Meteor.User }`?
-
 		const user = Users.findOneById(userId);
 		if (user) {
 			object.user = {
@@ -16,5 +17,5 @@ API.helperMethods.set(
 		}
 
 		return object;
-	},
+	}),
 );
diff --git a/apps/meteor/app/api/server/v1/im.ts b/apps/meteor/app/api/server/v1/im.ts
@@ -210,22 +210,23 @@ API.v1.addRoute(
 
 			const ourQuery = query ? { rid: room._id, ...query } : { rid: room._id };
 
-			const files = await Uploads.find<IUpload & { userId: string }>(ourQuery, {
-				sort: sort || { name: 1 },
-				skip: offset,
-				limit: count,
-				projection: fields,
-			})
-				.map((file): IImFilesObject | (IImFilesObject & { user: Pick<IUser, '_id' | 'name' | 'username'> }) => {
-					if (file.userId) {
-						return this.insertUserObject<IImFilesObject & { user: Pick<IUser, '_id' | 'name' | 'username'> }>({
-							object: { ...file },
-							userId: file.userId,
-						});
-					}
-					return file;
-				})
-				.toArray();
+			const files = (
+				await Uploads.find<IUpload & { userId: string }>(ourQuery, {
+					sort: sort || { name: 1 },
+					skip: offset,
+					limit: count,
+					projection: fields,
+				}).toArray()
+			).map((file): IImFilesObject | (IImFilesObject & { user: Pick<IUser, '_id' | 'name' | 'username'> }) => {
+				if (file.userId) {
+					return this.insertUserObject<IImFilesObject & { user: Pick<IUser, '_id' | 'name' | 'username'> }>({
+						object: { ...file },
+						userId: file.userId,
+					});
+				}
+				return file;
+			});
+
 			const total = await Uploads.find(ourQuery).count();
 			return API.v1.success({
 				files,
@@ -252,14 +253,15 @@ API.v1.addRoute(
 
 			const objectParams = {
 				rid: room._id,
-				latest: latest ? new Date(latest).toISOString() : new Date().toISOString(),
-				oldest: oldest && new Date(oldest).toISOString(),
+				latest: latest ? new Date(latest) : new Date(),
+				oldest: oldest && new Date(oldest),
 				inclusive: inclusive === 'true',
 				offset,
 				count,
 				unreads: unreads === 'true',
 				showThreadMessages: showThreadMessages === 'true',
 			};
+
 			const result = Meteor.call('getChannelHistory', objectParams);
 
 			if (!result) {

diff --git a/packages/rest-typings/src/v1/dm/DmFileProps.ts b/packages/rest-typings/src/v1/dm/DmFileProps.ts
@@ -27,7 +27,7 @@ export const isDmFileProps = ajv.compile<DmFileProps>({
 					type: 'string',
 				},
 				sort: {
-					type: 'number',
+					type: 'string',
 				},
 				count: {
 					type: 'number',
@@ -49,7 +49,7 @@ export const isDmFileProps = ajv.compile<DmFileProps>({
 					type: 'string',
 				},
 				sort: {
-					type: 'number',
+					type: 'string',
 				},
 				count: {
 					type: 'number',

diff --git a/packages/rest-typings/src/v1/dm/DmMembersProps.ts b/packages/rest-typings/src/v1/dm/DmMembersProps.ts
@@ -39,7 +39,7 @@ export const isDmMemberProps = ajv.compile<DmMemberProps>({
 					type: 'string',
 				},
 				sort: {
-					type: 'number',
+					type: 'string',
 				},
 				count: {
 					type: 'number',
@@ -70,7 +70,7 @@ export const isDmMemberProps = ajv.compile<DmMemberProps>({
 					type: 'string',
 				},
 				sort: {
-					type: 'number',
+					type: 'string',
 				},
 				count: {
 					type: 'number',

diff --git a/packages/rest-typings/src/v1/dm/DmMessagesProps.ts b/packages/rest-typings/src/v1/dm/DmMessagesProps.ts
@@ -32,7 +32,7 @@ export const isDmMessagesProps = ajv.compile<DmMessagesProps>({
 					type: 'string',
 				},
 				sort: {
-					type: 'number',
+					type: 'string',
 				},
 				count: {
 					type: 'number',
@@ -57,7 +57,7 @@ export const isDmMessagesProps = ajv.compile<DmMessagesProps>({
 					type: 'string',
 				},
 				sort: {
-					type: 'number',
+					type: 'string',
 				},
 				count: {
 					type: 'number',