Moving all schemas from rest-typings to a single source

CodeMatrix1 · CodeMatrix1 · commit 4cc4c14f145a · 2026-03-13T20:53:41.000+05:30
diff --git a/apps/meteor/app/api/server/v1/chat.ts b/apps/meteor/app/api/server/v1/chat.ts
@@ -1,5 +1,5 @@
 import { Message } from '@rocket.chat/core-services';
-import type { IMessage, IThreadMainMessage } from '@rocket.chat/core-typings';
+import type { IMessage, IRoom, IThreadMainMessage } from '@rocket.chat/core-typings';
 import { MessageTypes } from '@rocket.chat/message-types';
 import { Messages, Users, Rooms, Subscriptions } from '@rocket.chat/models';
 import {
@@ -12,7 +12,6 @@ import {
 	isChatSyncMessagesProps,
 	isChatGetMessageProps,
 	isChatPostMessageProps,
-	isChatSearchProps,
 	isChatSendMessageProps,
 	isChatIgnoreUserProps,
 	isChatGetPinnedMessagesProps,
@@ -26,6 +25,7 @@ import {
 	isChatGetDiscussionsProps,
 	validateBadRequestErrorResponse,
 	validateUnauthorizedErrorResponse,
+	type PaginatedRequest,
 } from '@rocket.chat/rest-typings';
 import { escapeRegExp } from '@rocket.chat/string-helpers';
 import { Meteor } from 'meteor/meteor';
@@ -119,6 +119,35 @@ const ChatUnfollowMessageLocalSchema = {
 	additionalProperties: false,
 };
 
+//chat.search starts
+type ChatSearch = PaginatedRequest<{
+	roomId: IRoom['_id'];
+	searchText: string;
+}>;
+
+const ChatSearchSchema = {
+	type: 'object',
+	properties: {
+		roomId: {
+			type: 'string',
+		},
+		searchText: {
+			type: 'string',
+		},
+		count: {
+			type: 'number',
+			nullable: true,
+		},
+		offset: {
+			type: 'number',
+			nullable: true,
+		},
+	},
+	required: ['roomId', 'searchText'],
+	additionalProperties: false,
+};
+//chat.search ends
+
 const isChatStarMessageLocalProps = ajv.compile<ChatStarMessageLocal>(ChatStarMessageLocalSchema);
 
 const isChatUnstarMessageLocalProps = ajv.compile<ChatUnstarMessageLocal>(ChatUnstarMessageLocalSchema);
@@ -127,6 +156,8 @@ const isChatFollowMessageLocalProps = ajv.compile<ChatFollowMessageLocal>(ChatFo
 
 const isChatUnfollowMessageLocalProps = ajv.compile<ChatUnfollowMessageLocal>(ChatUnfollowMessageLocalSchema);
 
+const isChatSearchLocalProps = ajv.compile<ChatSearch>(ChatSearchSchema);
+
 API.v1.addRoute(
 	'chat.delete',
 	{ authRequired: true, validateParams: isChatDeleteProps },
@@ -563,7 +594,7 @@ const chatEndpoints = API.v1
 		'chat.search',
 		{
 			authRequired: true,
-			query: isChatSearchProps,
+			query: isChatSearchLocalProps,
 			response: {
 				400: validateBadRequestErrorResponse,
 				401: validateUnauthorizedErrorResponse,
diff --git a/packages/rest-typings/src/v1/chat.ts b/packages/rest-typings/src/v1/chat.ts
@@ -323,35 +323,6 @@ const ChatIgnoreUserSchema = {
 
 export const isChatIgnoreUserProps = ajv.compile<ChatIgnoreUser>(ChatIgnoreUserSchema);
 
-type ChatSearch = PaginatedRequest<{
-	roomId: IRoom['_id'];
-	searchText: string;
-}>;
-
-const ChatSearchSchema = {
-	type: 'object',
-	properties: {
-		roomId: {
-			type: 'string',
-		},
-		searchText: {
-			type: 'string',
-		},
-		count: {
-			type: 'number',
-			nullable: true,
-		},
-		offset: {
-			type: 'number',
-			nullable: true,
-		},
-	},
-	required: ['roomId', 'searchText'],
-	additionalProperties: false,
-};
-
-export const isChatSearchProps = ajv.compile<ChatSearch>(ChatSearchSchema);
-
 interface IChatUpdate {
 	roomId: IRoom['_id'];
 	msgId: string;
@@ -933,11 +904,6 @@ export type ChatEndpoints = {
 	'/v1/chat.ignoreUser': {
 		GET: (params: ChatIgnoreUser) => void;
 	};
-	'/v1/chat.search': {
-		GET: (params: ChatSearch) => {
-			messages: IMessage[];
-		};
-	};
 	'/v1/chat.update': {
 		POST: (params: ChatUpdate) => {
 			message: IMessage;
