diff --git a/src/opcodes/Identify.ts b/src/opcodes/Identify.ts
index 0781afde..0ddc58d1 100644
--- a/src/opcodes/Identify.ts
+++ b/src/opcodes/Identify.ts
@@ -11,13 +11,13 @@ import {
UserModel,
toObject,
EVENTEnum,
+ Config,
} from "@fosscord/server-util";
import { setupListener } from "../listener/listener";
import { IdentifySchema } from "../schema/Identify";
import { Send } from "../util/Send";
import experiments from "./experiments.json";
import { check } from "./instanceOf";
-import * as Config from "../util/Config";
// TODO: bot sharding
// TODO: check priviliged intents
@@ -30,7 +30,7 @@ export async function onIdentify(this: WebSocket, data: Payload) {
const identify: IdentifySchema = data.d;
try {
- const { jwtSecret } = Config.gatewayConfig.getAll().security;
+ const { jwtSecret } = Config.get().security;
var decoded = await checkToken(identify.token, jwtSecret); // will throw an error if invalid
} catch (error) {
console.error("invalid token", error);
diff --git a/src/util/Config.ts b/src/util/Config.ts
index 8489888c..9ceb8cd5 100644
--- a/src/util/Config.ts
+++ b/src/util/Config.ts
@@ -1,3 +1,4 @@
+// @ts-nocheck
import { Config } from "@fosscord/server-util";
import { getConfigPathForFile } from "@fosscord/server-util/dist/util/Config";
import Ajv, { JSONSchemaType } from "ajv";
@@ -6,7 +7,7 @@ export interface DefaultOptions {
endpoint?: string;
security: {
jwtSecret: string;
- }
+ };
}
const schema: JSONSchemaType<DefaultOptions> = {
@@ -14,23 +15,27 @@ const schema: JSONSchemaType<DefaultOptions> = {
properties: {
endpoint: {
type: "string",
- nullable: true
+ nullable: true,
},
security: {
type: "object",
properties: {
jwtSecret: {
- type: "string"
- }
+ type: "string",
+ },
},
- required: ["jwtSecret"]
+ required: ["jwtSecret"],
},
},
- required: ["security"]
-}
+ required: ["security"],
+};
const ajv = new Ajv();
const validator = ajv.compile(schema);
-const configPath = getConfigPathForFile("fosscord", "gateway", ".json");
-export const gatewayConfig = new Config<DefaultOptions>({path: configPath, schemaValidator: validator, schema: schema})
\ No newline at end of file
+const configPath = getConfigPathForFile("fosscord", "gateway", ".json");
+export const gatewayConfig = new Config<DefaultOptions>({
+ path: configPath,
+ schemaValidator: validator,
+ schema: schema,
+});
|
