summary refs log tree commit diff
path: root/gateway/src/util
diff options
context:
space:
mode:
authorFlam3rboy <34555296+Flam3rboy@users.noreply.github.com>2021-08-13 13:03:18 +0200
committerFlam3rboy <34555296+Flam3rboy@users.noreply.github.com>2021-08-13 13:03:18 +0200
commitebff2f42417e0e579d59d296f5150024f8c850ee (patch)
tree707b264d239859853411adb5142b64727debd51b /gateway/src/util
parentFix naming (diff)
parentabstract Event emission (diff)
downloadserver-ebff2f42417e0e579d59d296f5150024f8c850ee.tar.xz
Merge branch 'master' into pr/darkhpp/261-2
Diffstat (limited to 'gateway/src/util')
-rw-r--r--gateway/src/util/Config.ts4
-rw-r--r--gateway/src/util/WebSocket.ts4
2 files changed, 4 insertions, 4 deletions
diff --git a/gateway/src/util/Config.ts b/gateway/src/util/Config.ts

index 9ceb8cd5..e99c89f7 100644 --- a/gateway/src/util/Config.ts +++ b/gateway/src/util/Config.ts
@@ -1,6 +1,6 @@ // @ts-nocheck -import { Config } from "@fosscord/server-util"; -import { getConfigPathForFile } from "@fosscord/server-util/dist/util/Config"; +import { Config } from "@fosscord/util"; +import { getConfigPathForFile } from "@fosscord/util/dist/util/Config"; import Ajv, { JSONSchemaType } from "ajv"; export interface DefaultOptions { diff --git a/gateway/src/util/WebSocket.ts b/gateway/src/util/WebSocket.ts
index 1bd0ff2f..d1e13555 100644 --- a/gateway/src/util/WebSocket.ts +++ b/gateway/src/util/WebSocket.ts
@@ -1,4 +1,4 @@ -import { Intents, Permissions } from "@fosscord/server-util"; +import { Intents, Permissions } from "@fosscord/util"; import WS, { Server, Data } from "ws"; import { Deflate } from "zlib"; import { Channel } from "amqplib"; @@ -15,8 +15,8 @@ interface WebSocket extends WS { readyTimeout: NodeJS.Timeout; intents: Intents; sequence: number; - rabbitCh?: Channel & { queues: Record<string, string> }; permissions: Record<string, Permissions>; + events: Record<string, Function>; } export default WebSocket;