Node.js based forum software built for the modern web
fix: move socket.io group search to use api
Barış Soner Uşaklıb15b28f768d9
diff --git a/src/api/groups.js b/src/api/groups.jsindex 6705089799..460a5e7b44 100644--- a/src/api/groups.js+++ b/src/api/groups.js@@ -20,6 +20,14 @@ groupsAPI.list = async (caller, data) => {const groupsPerPage = 15;const start = Math.max(0, page - 1) * groupsPerPage;const stop = start + groupsPerPage - 1;++ if (data.query) {+ data.options = data.options || {};+ data.options.filterHidden = data.options.filterHidden || !await user.isAdministrator(caller.uid);+ const groupData = await groups.search(data.query, data.options);+ return { groups: groupData.slice(start, stop + 1), nextStart: stop + 1 };+ }+const groupData = await groups.getGroupsBySort(data.sort, start, stop);return { groups: groupData, nextStart: stop + 1 };diff --git a/src/socket.io/groups.js b/src/socket.io/groups.jsindex 789ac9941a..f25ae87a19 100644--- a/src/socket.io/groups.js+++ b/src/socket.io/groups.js@@ -23,15 +23,10 @@ SocketGroups.before = async (socket, method, data) => {};SocketGroups.search = async (socket, data) => {- data.options = data.options || {};+ sockets.warnDeprecated(socket, 'GET /api/v3/groups');- if (!data.query) {- const groupsPerPage = 15;- const groupData = await groups.getGroupsBySort(data.options.sort, 0, groupsPerPage - 1);- return groupData;- }- data.options.filterHidden = data.options.filterHidden || !await user.isAdministrator(socket.uid);- return await groups.search(data.query, data.options);+ const { groups } = await api.groups.list(socket, data);+ return groups;};SocketGroups.loadMore = async (socket, data) => {