move

apps/meteor/app/api/server/v1/custom-sounds.ts

@@ -0,0 +1,29 @@
+import { CustomSounds } from '../../../models/server/raw';
+import { API } from '../api';
+
+API.v1.addRoute(
+	'custom-sounds.list',
+	{ authRequired: true },
+	{
+		async get() {
+			const { offset, count } = this.getPaginationItems();
+			const { sort, query } = this.parseJsonQuery();
+			const cursor = await CustomSounds.find(query, {
+				sort: sort || { name: 1 },
+				skip: offset,
+				limit: count,
+			});
+
+			const total = await cursor.count();
+
+			const sounds = await cursor.toArray();
+
+			return API.v1.success({
+				sounds,
+				count: sounds.length,
+				offset,
+				total,
+			});
+		},
+	},
+);

apps/meteor/app/api/server/v1/custom-user-status.js → apps/meteor/app/api/server/v1/custom-user-status.ts

@@ -1,29 +1,27 @@
 import { Meteor } from 'meteor/meteor';
 import { Match, check } from 'meteor/check';
 
-import { CustomUserStatus } from '../../../models';
+import { CustomUserStatus } from '../../../models/server/raw';
 import { API } from '../api';
 import { findCustomUserStatus } from '../lib/custom-user-status';
 
 API.v1.addRoute(
 	'custom-user-status.list',
 	{ authRequired: true },
 	{
-		get() {
+		async get() {
 			const { offset, count } = this.getPaginationItems();
 			const { sort, query } = this.parseJsonQuery();
 
 			return API.v1.success(
-				Promise.await(
-					findCustomUserStatus({
-						query,
-						pagination: {
-							offset,
-							count,
-							sort,
-						},
-					}),
-				),
+				await findCustomUserStatus({
+					query,
+					pagination: {
+						offset,
+						count,
+						sort,
+					},
+				}),
 			);
 		},
 	},
@@ -33,7 +31,7 @@ API.v1.addRoute(
 	'custom-user-status.create',
 	{ authRequired: true },
 	{
-		post() {
+		async post() {
 			check(this.bodyParams, {
 				name: String,
 				statusType: Match.Maybe(String),
@@ -44,12 +42,15 @@ API.v1.addRoute(
 				statusType: this.bodyParams.statusType,
 			};
 
-			Meteor.runAsUser(this.userId, () => {
-				Meteor.call('insertOrUpdateUserStatus', userStatusData);
-			});
+			Meteor.call('insertOrUpdateUserStatus', userStatusData);
+
+			const customUserStatus = await CustomUserStatus.findOneByName(userStatusData.name);
+			if (!customUserStatus) {
+				throw new Meteor.Error('error-creating-custom-user-status', 'Error creating custom user status');
+			}
 
 			return API.v1.success({
-				customUserStatus: CustomUserStatus.findOneByName(userStatusData.name),
+				customUserStatus,
 			});
 		},
 	},
@@ -65,7 +66,7 @@ API.v1.addRoute(
 				return API.v1.failure('The "customUserStatusId" params is required!');
 			}
 
-			Meteor.runAsUser(this.userId, () => Meteor.call('deleteCustomUserStatus', customUserStatusId));
+			Meteor.call('deleteCustomUserStatus', customUserStatusId);
 
 			return API.v1.success();
 		},
@@ -76,7 +77,7 @@ API.v1.addRoute(
 	'custom-user-status.update',
 	{ authRequired: true },
 	{
-		post() {
+		async post() {
 			check(this.bodyParams, {
 				_id: String,
 				name: String,
@@ -89,19 +90,23 @@ API.v1.addRoute(
 				statusType: this.bodyParams.statusType,
 			};
 
-			const customUserStatus = CustomUserStatus.findOneById(userStatusData._id);
+			const customUserStatusToUpdate = await CustomUserStatus.findOneById(userStatusData._id);
 
 			// Ensure the message exists
-			if (!customUserStatus) {
+			if (!customUserStatusToUpdate) {
 				return API.v1.failure(`No custom user status found with the id of "${userStatusData._id}".`);
 			}
 
-			Meteor.runAsUser(this.userId, () => {
-				Meteor.call('insertOrUpdateUserStatus', userStatusData);
-			});
+			Meteor.call('insertOrUpdateUserStatus', userStatusData);
+
+			const customUserStatus = await CustomUserStatus.findOneById(userStatusData._id);
+
+			if (!customUserStatus) {
+				throw new Meteor.Error('error-updating-custom-user-status', 'Error updating custom user status');
+			}
 
 			return API.v1.success({
-				customUserStatus: CustomUserStatus.findOneById(userStatusData._id),
+				customUserStatus,
 			});
 		},
 	},

apps/meteor/app/models/server/raw/CustomUserStatus.ts

@@ -9,8 +9,11 @@ export class CustomUserStatusRaw extends BaseRaw<T> {
 	}
 
 	// find one by name
-	async findOneByName(name: string, options: WithoutProjection<FindOneOptions<T>>): Promise<T | null> {
-		return this.findOne({ name }, options);
+
+	async findOneByName(name: string, options?: undefined): Promise<T | null>;
+
+	async findOneByName(name: string, options?: WithoutProjection<FindOneOptions<T>>): Promise<T | null> {
+		return options ? this.findOne({ name }, options) : this.findOne({ name });
 	}
 
 	// find

packages/rest-typings/src/v1/customSounds.ts

@@ -1,14 +1,11 @@
+import type { ICustomSound } from '../../../core-typings/dist';
 import type { PaginatedRequest } from '../helpers/PaginatedRequest';
 import type { PaginatedResult } from '../helpers/PaginatedResult';
 
 export type CustomSoundEndpoint = {
 	'custom-sounds.list': {
 		GET: (params: PaginatedRequest<{ query: string }>) => PaginatedResult<{
-			sounds: {
-				_id: string;
-				name: string;
-				extension: string;
-			}[];
+			sounds: ICustomSound[];
 		}>;
 	};
 };

packages/rest-typings/src/v1/customUserStatus.ts

@@ -1,4 +1,4 @@
-import type { IUserStatus } from '@rocket.chat/core-typings';
+import type { ICustomUserStatus, IUserStatus } from '@rocket.chat/core-typings';
 
 import type { PaginatedRequest } from '../helpers/PaginatedRequest';
 import type { PaginatedResult } from '../helpers/PaginatedResult';
@@ -9,4 +9,17 @@ export type CustomUserStatusEndpoints = {
 			statuses: IUserStatus[];
 		}>;
 	};
+	'custom-user-status.create': {
+		POST: (params: { name: string; statusType?: string }) => {
+			customUserStatus: ICustomUserStatus;
+		};
+	};
+	'custom-user-status.delete': {
+		POST: (params: { customUserStatusId: string }) => void;
+	};
+	'custom-user-status.update': {
+		POST: (params: { id: string; name?: string; statusType?: string }) => {
+			customUserStatus: ICustomUserStatus;
+		};
+	};
 };