From 181a93996c71b3ff810e4f00c46ec4212405fc2d Mon Sep 17 00:00:00 2001
From: Julian Lam <julian@nodebb.org>
Date: Wed, 8 Nov 2023 14:03:56 -0500
Subject: [PATCH] chore: minor re-order of routes/controllers in admin api v3
 router/controller

---
 src/controllers/write/admin.js | 38 +++++++++++++++++-----------------
 src/routes/write/admin.js      |  4 ++--
 2 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/src/controllers/write/admin.js b/src/controllers/write/admin.js
index 4ffeb4df54..0e5669c2e6 100644
--- a/src/controllers/write/admin.js
+++ b/src/controllers/write/admin.js
@@ -31,25 +31,6 @@ Admin.getAnalyticsData = async (req, res) => {
 	}));
 };
 
-Admin.chats = {};
-
-Admin.chats.deleteRoom = async (req, res) => {
-	const roomData = await messaging.getRoomData(req.params.roomId);
-	if (!roomData) {
-		throw new Error('[[error:no-room]]');
-	}
-	await messaging.deleteRooms([req.params.roomId]);
-
-	events.log({
-		type: 'chat-room-deleted',
-		roomId: req.params.roomId,
-		roomName: roomData.roomName ? roomData.roomName : `No room name`,
-		uid: req.uid,
-		ip: req.ip,
-	});
-	helpers.formatApiResponse(200, res);
-};
-
 Admin.generateToken = async (req, res) => {
 	const { uid, description } = req.body;
 	const token = await api.utils.tokens.generate({ uid, description });
@@ -78,3 +59,22 @@ Admin.deleteToken = async (req, res) => {
 	const { token } = req.params;
 	helpers.formatApiResponse(200, res, await api.utils.tokens.delete(token));
 };
+
+Admin.chats = {};
+
+Admin.chats.deleteRoom = async (req, res) => {
+	const roomData = await messaging.getRoomData(req.params.roomId);
+	if (!roomData) {
+		throw new Error('[[error:no-room]]');
+	}
+	await messaging.deleteRooms([req.params.roomId]);
+
+	events.log({
+		type: 'chat-room-deleted',
+		roomId: req.params.roomId,
+		roomName: roomData.roomName ? roomData.roomName : `No room name`,
+		uid: req.uid,
+		ip: req.ip,
+	});
+	helpers.formatApiResponse(200, res);
+};
diff --git a/src/routes/write/admin.js b/src/routes/write/admin.js
index 593e9ce123..8aaf27fc5d 100644
--- a/src/routes/write/admin.js
+++ b/src/routes/write/admin.js
@@ -15,13 +15,13 @@ module.exports = function () {
 	setupApiRoute(router, 'get', '/analytics', [...middlewares], controllers.write.admin.getAnalyticsKeys);
 	setupApiRoute(router, 'get', '/analytics/:set', [...middlewares], controllers.write.admin.getAnalyticsData);
 
-	setupApiRoute(router, 'delete', '/chats/:roomId', [...middlewares, middleware.assert.room], controllers.write.admin.chats.deleteRoom);
-
 	setupApiRoute(router, 'post', '/tokens', [...middlewares], controllers.write.admin.generateToken);
 	setupApiRoute(router, 'get', '/tokens/:token', [...middlewares], controllers.write.admin.getToken);
 	setupApiRoute(router, 'put', '/tokens/:token', [...middlewares], controllers.write.admin.updateToken);
 	setupApiRoute(router, 'delete', '/tokens/:token', [...middlewares], controllers.write.admin.deleteToken);
 	setupApiRoute(router, 'post', '/tokens/:token/roll', [...middlewares], controllers.write.admin.rollToken);
 
+	setupApiRoute(router, 'delete', '/chats/:roomId', [...middlewares, middleware.assert.room], controllers.write.admin.chats.deleteRoom);
+
 	return router;
 };