From 9c2337486729fb23c2c4874cd70db909d2f2ab41 Mon Sep 17 00:00:00 2001 From: Flam3rboy <34555296+Flam3rboy@users.noreply.github.com> Date: Fri, 1 Oct 2021 20:08:45 +0200 Subject: fix #406 --- util/src/entities/Config.ts | 2 ++ 1 file changed, 2 insertions(+) (limited to 'util/src/entities/Config.ts') diff --git a/util/src/entities/Config.ts b/util/src/entities/Config.ts index 6d9db470..bd3fc0df 100644 --- a/util/src/entities/Config.ts +++ b/util/src/entities/Config.ts @@ -125,6 +125,7 @@ export interface ConfigValue { required: boolean; minimum: number; // in years }; + disabled: boolean; requireCaptcha: boolean; requireInvite: boolean; allowNewRegistration: boolean; @@ -266,6 +267,7 @@ export const DefaultConfigOptions: ConfigValue = { required: false, minimum: 13, }, + disabled: true, requireInvite: false, requireCaptcha: true, allowNewRegistration: true, -- cgit 1.5.1 From 8e9b5d1cd2b7fd33260edaace0d76f955cd2c21c Mon Sep 17 00:00:00 2001 From: Flam3rboy <34555296+Flam3rboy@users.noreply.github.com> Date: Fri, 1 Oct 2021 20:52:50 +0200 Subject: :bug: fix disable register --- util/src/entities/Config.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'util/src/entities/Config.ts') diff --git a/util/src/entities/Config.ts b/util/src/entities/Config.ts index bd3fc0df..8efa853c 100644 --- a/util/src/entities/Config.ts +++ b/util/src/entities/Config.ts @@ -267,7 +267,7 @@ export const DefaultConfigOptions: ConfigValue = { required: false, minimum: 13, }, - disabled: true, + disabled: false, requireInvite: false, requireCaptcha: true, allowNewRegistration: true, -- cgit 1.5.1 From f3dcab6b54f7576edfdf4bd5501a59b24af0b413 Mon Sep 17 00:00:00 2001 From: The Arcane Brony Date: Fri, 1 Oct 2021 22:11:56 +0200 Subject: Add setting to show all guilds in discovery, fix query for guild discovery --- api/src/routes/discoverable-guilds.ts | 7 +++++-- util/src/entities/Config.ts | 8 ++++++++ 2 files changed, 13 insertions(+), 2 deletions(-) (limited to 'util/src/entities/Config.ts') diff --git a/api/src/routes/discoverable-guilds.ts b/api/src/routes/discoverable-guilds.ts index f667eb2a..509abc9e 100644 --- a/api/src/routes/discoverable-guilds.ts +++ b/api/src/routes/discoverable-guilds.ts @@ -1,16 +1,19 @@ -import { Guild } from "@fosscord/util"; +import { Guild, Config } from "@fosscord/util"; + import { Router, Request, Response } from "express"; import { route } from "@fosscord/api"; + const router = Router(); router.get("/", route({}), async (req: Request, res: Response) => { const { limit } = req.params; + var showAllGuilds = Config.get().guild.showAllGuildsInDiscovery; // ! this only works using SQL querys // 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" LIKE 'COMMUNITY'`, take: Math.abs(Number(limit)) }); + const guilds = showAllGuilds ? await Guild.find({take: Math.abs(Number(limit))}) : await Guild.find({ where: `"features" LIKE '%COMMUNITY%'`, take: Math.abs(Number(limit)) }); res.send({ guilds: guilds }); }); diff --git a/util/src/entities/Config.ts b/util/src/entities/Config.ts index 8efa853c..edce92a9 100644 --- a/util/src/entities/Config.ts +++ b/util/src/entities/Config.ts @@ -144,6 +144,10 @@ export interface ConfigValue { useDefaultAsOptimal: boolean; available: Region[]; }; + + guild: { + showAllGuildsInDiscovery: boolean; + }; rabbitmq: { host: string | null; }; @@ -295,6 +299,10 @@ export const DefaultConfigOptions: ConfigValue = { }, ], }, + + guild: { + showAllGuildsInDiscovery: false, + }, rabbitmq: { host: null, }, -- cgit 1.5.1