Skip to content

Node.js based forum software built for the modern web

refactor: use write api instead of sockets

Barış Soner Uşaklıc6e8cd8e7ee5
diff --git a/public/src/client/chats/message-search.js b/public/src/client/chats/message-search.js
index 24da351a76..da77f1e064 100644
--- a/public/src/client/chats/message-search.js
+++ b/public/src/client/chats/message-search.js
@@ -2,8 +2,8 @@
define('forum/chats/message-search', [
- 'components', 'alerts', 'forum/chats/messages',
-], function (components, alerts, messages) {
+ 'components', 'alerts', 'forum/chats/messages', 'api',
+], function (components, alerts, messages, api) {
const messageSearch = {};
let roomId = 0;
let searchInputEl;
@@ -63,10 +63,8 @@ define('forum/chats/message-search', [
return;
}
clearEl.removeClass('hidden');
- socket.emit('modules.chats.searchMessages', {
- content: query,
- roomId: roomId,
- }).then(displayResults)
+ api.get(`/search/chats/${roomId}/messages`, { query })
+ .then(displayResults)
.catch(alerts.error);
}
diff --git a/src/socket.io/modules.js b/src/socket.io/modules.js
index ea4291c493..b5624cca43 100644
--- a/src/socket.io/modules.js
+++ b/src/socket.io/modules.js
@@ -151,19 +151,6 @@ SocketModules.chats.sortPublicRooms = async function (socket, data) {
await api.chats.sortPublicRooms(socket, data);
};
-SocketModules.chats.searchMembers = async function (socket, data) {
- sockets.warnDeprecated(socket, 'GET /api/v3/search/chats/:roomId/users?query=');
-
- if (!data || !utils.isNumber(data.roomId)) {
- throw new Error('[[error:invalid-data]]');
- }
-
- // parameter renamed; backwards compatibility
- data.query = data.username;
- delete data.username;
- return await api.search.roomUsers(socket, data);
-};
-
SocketModules.chats.toggleOwner = async (socket, data) => {
sockets.warnDeprecated(socket, 'PUT/DELETE /api/v3/chats/:roomId/owners/:uid');
@@ -184,19 +171,6 @@ SocketModules.chats.setNotificationSetting = async (socket, data) => {
await api.chats.watch(socket, data);
};
-SocketModules.chats.searchMessages = async (socket, data) => {
- sockets.warnDeprecated(socket, 'GET /api/v3/search/chats/:roomId/messages');
-
- if (!data || !utils.isNumber(data.roomId) || !data.content) {
- throw new Error('[[error:invalid-data]]');
- }
-
- // parameter renamed; backwards compatibility
- data.query = data.content;
- delete data.content;
- return await api.search.roomMessages(socket, data);
-};
-
SocketModules.chats.loadPinnedMessages = async (socket, data) => {
sockets.warnDeprecated(socket, 'GET /api/v3/chats/:roomId/messages/pinned');