From 54ebf97e7822b479b8953dddc73fe85e9a71ec39 Mon Sep 17 00:00:00 2001 From: uurgothat Date: Wed, 17 Nov 2021 22:28:22 +0300 Subject: Add instance route --- util/src/entities/Config.ts | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'util/src/entities/Config.ts') diff --git a/util/src/entities/Config.ts b/util/src/entities/Config.ts index cac5d4da..fd83bc5a 100644 --- a/util/src/entities/Config.ts +++ b/util/src/entities/Config.ts @@ -49,6 +49,9 @@ export interface ConfigValue { endpointPrivate: string | null; }; general: { + instanceName: string; + instanceDescription: string | null; + frontPage: string | null; instanceId: string; }; limits: { @@ -180,7 +183,10 @@ export const DefaultConfigOptions: ConfigValue = { endpointPublic: null, }, general: { + instanceName: "Fosscord Instance", + instanceDescription: "This is a Fosscord instance made in pre-relase days", instanceId: Snowflake.generate(), + frontPage: null }, limits: { user: { -- cgit 1.5.1 From 159c712c436a3e01166ed5912d69a17c0fee70e6 Mon Sep 17 00:00:00 2001 From: uurgothat Date: Wed, 17 Nov 2021 22:50:25 +0300 Subject: Add image field --- util/src/entities/Config.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'util/src/entities/Config.ts') diff --git a/util/src/entities/Config.ts b/util/src/entities/Config.ts index fd83bc5a..2d4ad252 100644 --- a/util/src/entities/Config.ts +++ b/util/src/entities/Config.ts @@ -52,6 +52,7 @@ export interface ConfigValue { instanceName: string; instanceDescription: string | null; frontPage: string | null; + image: string | null; instanceId: string; }; limits: { @@ -185,8 +186,9 @@ export const DefaultConfigOptions: ConfigValue = { general: { instanceName: "Fosscord Instance", instanceDescription: "This is a Fosscord instance made in pre-relase days", + frontPage: null, + image: null, instanceId: Snowflake.generate(), - frontPage: null }, limits: { user: { -- cgit 1.5.1 From 7681ea6d8ee7ce3af6a7287b22a60b214d9e0629 Mon Sep 17 00:00:00 2001 From: Thesourtimes Date: Thu, 18 Nov 2021 22:15:05 +0300 Subject: Fix the minor issues on route --- api/src/middlewares/Authentication.ts | 4 +++- api/src/routes/policies/instance/domains.ts | 14 ++++++++------ api/src/routes/policies/instance/index.ts | 12 ++++++++++++ api/src/routes/policies/instance/limits.ts | 4 ++-- api/src/routes/policies/instance/meta.ts | 12 ------------ util/src/entities/Config.ts | 2 ++ 6 files changed, 27 insertions(+), 21 deletions(-) create mode 100644 api/src/routes/policies/instance/index.ts delete mode 100644 api/src/routes/policies/instance/meta.ts (limited to 'util/src/entities/Config.ts') diff --git a/api/src/middlewares/Authentication.ts b/api/src/middlewares/Authentication.ts index e6df6eeb..8fbdd2b7 100644 --- a/api/src/middlewares/Authentication.ts +++ b/api/src/middlewares/Authentication.ts @@ -11,7 +11,9 @@ export const NO_AUTHORIZATION_ROUTES = [ "/experiments", "/-/readyz", "/-/healthz", - "/policies/instance/", + "/science", + "/track", + "/policies/instance", /\/guilds\/\d+\/widget\.(json|png)/ ]; diff --git a/api/src/routes/policies/instance/domains.ts b/api/src/routes/policies/instance/domains.ts index b68763cc..20cd07ba 100644 --- a/api/src/routes/policies/instance/domains.ts +++ b/api/src/routes/policies/instance/domains.ts @@ -3,14 +3,16 @@ import { route } from "@fosscord/api"; import { Config } from "@fosscord/util"; import { config } from "dotenv" const router = Router(); -const { cdn } = Config.get(); - -const IdentityForm = { - cdn: cdn.endpointPublic || process.env.CDN || "http://localhost:3001", -} router.get("/",route({}), async (req: Request, res: Response) => { - res.json(IdentityForm) + const { cdn, gateway } = Config.get(); + + const IdentityForm = { + cdn: cdn.endpointPublic || process.env.CDN || "http://localhost:3001", + gateway: gateway.endpointPublic || process.env.GATEWAY || "ws://localhost:3002" + }; + + res.json(IdentityForm); }); export default router; diff --git a/api/src/routes/policies/instance/index.ts b/api/src/routes/policies/instance/index.ts new file mode 100644 index 00000000..e3da014f --- /dev/null +++ b/api/src/routes/policies/instance/index.ts @@ -0,0 +1,12 @@ +import { Router, Request, Response } from "express"; +import { route } from "@fosscord/api"; +import { Config } from "@fosscord/util"; +const router = Router(); + + +router.get("/",route({}), async (req: Request, res: Response) => { + const { general } = Config.get(); + res.json(general); +}); + +export default router; diff --git a/api/src/routes/policies/instance/limits.ts b/api/src/routes/policies/instance/limits.ts index 912908b7..7de1476b 100644 --- a/api/src/routes/policies/instance/limits.ts +++ b/api/src/routes/policies/instance/limits.ts @@ -2,10 +2,10 @@ import { Router, Request, Response } from "express"; import { route } from "@fosscord/api"; import { Config } from "@fosscord/util"; const router = Router(); -const { limits } = Config.get(); router.get("/",route({}), async (req: Request, res: Response) => { - res.json(limits) + const { limits } = Config.get(); + res.json(limits); }); export default router; diff --git a/api/src/routes/policies/instance/meta.ts b/api/src/routes/policies/instance/meta.ts deleted file mode 100644 index 7a998487..00000000 --- a/api/src/routes/policies/instance/meta.ts +++ /dev/null @@ -1,12 +0,0 @@ -import { Router, Request, Response } from "express"; -import { route } from "@fosscord/api"; -import { Config } from "@fosscord/util"; - -const router = Router(); -const { general } = Config.get(); - -router.get("/",route({}), async (req: Request, res: Response) => { - res.json(general) -}); - -export default router; diff --git a/util/src/entities/Config.ts b/util/src/entities/Config.ts index 2d4ad252..d277c88c 100644 --- a/util/src/entities/Config.ts +++ b/util/src/entities/Config.ts @@ -52,6 +52,7 @@ export interface ConfigValue { instanceName: string; instanceDescription: string | null; frontPage: string | null; + tosPage: string | null; image: string | null; instanceId: string; }; @@ -187,6 +188,7 @@ export const DefaultConfigOptions: ConfigValue = { instanceName: "Fosscord Instance", instanceDescription: "This is a Fosscord instance made in pre-relase days", frontPage: null, + tosPage: null, image: null, instanceId: Snowflake.generate(), }, -- cgit 1.5.1 From 2c93f1f121750e54f7f2c34feaed62b8491f5979 Mon Sep 17 00:00:00 2001 From: Kuna <65683493+Thesourtimes@users.noreply.github.com> Date: Sun, 21 Nov 2021 15:35:51 +0000 Subject: Update util/src/entities/Config.ts MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Erkin Alp Güney --- 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 d277c88c..56f6b741 100644 --- a/util/src/entities/Config.ts +++ b/util/src/entities/Config.ts @@ -53,6 +53,8 @@ export interface ConfigValue { instanceDescription: string | null; frontPage: string | null; tosPage: string | null; + correspondenceEmail: string | null; + correspondenceUserID: string | null; image: string | null; instanceId: string; }; -- cgit 1.5.1 From 5d2f92427db34ef47fc5042676deab15ef596ce1 Mon Sep 17 00:00:00 2001 From: Kuna <65683493+Thesourtimes@users.noreply.github.com> Date: Sun, 21 Nov 2021 15:35:59 +0000 Subject: Update util/src/entities/Config.ts MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Erkin Alp Güney --- 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 56f6b741..492baa4c 100644 --- a/util/src/entities/Config.ts +++ b/util/src/entities/Config.ts @@ -191,6 +191,8 @@ export const DefaultConfigOptions: ConfigValue = { instanceDescription: "This is a Fosscord instance made in pre-relase days", frontPage: null, tosPage: null, + correspondenceEmail: "noreply@localhost.local", + correspondenceUserID: null, image: null, instanceId: Snowflake.generate(), }, -- cgit 1.5.1