Merge branch 'develop' into activitypub

This commit is contained in:
Barış Soner Uşaklı
2024-04-25 11:16:42 -04:00
270 changed files with 2429 additions and 1668 deletions

View File

@@ -34,6 +34,9 @@ groupsController.list = async function (req, res) {
groupsController.get = async function (req, res, next) {
const slug = slugify(req.params.name);
const groupName = await groups.getGroupNameByGroupSlug(slug);
if (!groupName) {
return next();
}
const [groupNames, group] = await Promise.all([
getGroupNames(),
groups.get(groupName, { uid: req.uid, truncateUserList: true, userListCount: 20 }),
@@ -59,14 +62,13 @@ groupsController.get = async function (req, res, next) {
};
async function getGroupNames() {
const groupNames = await db.getSortedSetRange('groups:createtime', 0, -1);
const groupNames = Object.values(await db.getObject('groupslug:groupname'));
return groupNames.filter(name => (
name !== 'registered-users' &&
name !== 'verified-users' &&
name !== 'unverified-users' &&
name !== groups.BANNED_USERS &&
!groups.isPrivilegeGroup(name)
));
name !== groups.BANNED_USERS
)).sort((a, b) => a.toLowerCase().localeCompare(b.toLowerCase()));
}
groupsController.getCSV = async function (req, res) {