Dekescordes/spacebar
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #410 from TheArcaneBrony/master

Browse Source
This commit is contained in:
Flam3rboy 2021-10-01 23:01:08 +02:00 committed by GitHub
commit 66e2db8d88
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
api/src/routes/discoverable-guilds.ts
View File

@ -1,16 +1,18 @@
import { Guild } from "@fosscord/util"; import { Guild, Config } from "@fosscord/util";
import { Router, Request, Response } from "express"; import { Router, Request, Response } from "express";
import { route } from "@fosscord/api"; import { route } from "@fosscord/api";
const router = Router(); const router = Router();
router.get("/", route({}), async (req: Request, res: Response) => { router.get("/", route({}), async (req: Request, res: Response) => {
const { limit } = req.params; const { limit } = req.params;
var showAllGuilds = Config.get().guild.showAllGuildsInDiscovery;
// ! this only works using SQL querys // ! this only works using SQL querys
// TODO: implement this with default typeorm query // TODO: implement this with default typeorm query
// const guilds = await Guild.find({ where: { features: "DISCOVERABLE" } }); //, take: Math.abs(Number(limit)) }); // const guilds = await Guild.find({ where: { features: "DISCOVERABLE" } }); //, take: Math.abs(Number(limit)) });
const guilds = await Guild.find({ where: `"features" LIKE 'COMMUNITY'`, take: Math.abs(Number(limit)) }); const guilds = showAllGuilds ? await Guild.find({take: Math.abs(Number(limit || 20))}) : await Guild.find({ where: `"features" LIKE '%COMMUNITY%'`, take: Math.abs(Number(limit || 20)) });
res.send({ guilds: guilds }); res.send({ guilds: guilds });
}); });

8
util/src/entities/Config.ts
View File

@ -144,6 +144,10 @@ export interface ConfigValue {
useDefaultAsOptimal: boolean; useDefaultAsOptimal: boolean;
available: Region[]; available: Region[];
}; };
guild: {
showAllGuildsInDiscovery: boolean;
};
rabbitmq: { rabbitmq: {
host: string | null; host: string | null;
}; };
@ -295,6 +299,10 @@ export const DefaultConfigOptions: ConfigValue = {
}, },
], ],
}, },
guild: {
showAllGuildsInDiscovery: false,
},
rabbitmq: { rabbitmq: {
host: null, host: null,
}, },