From 493c21968b2758fe987e63a7b7750427c726068d Mon Sep 17 00:00:00 2001
From: Madeline <46743919+MaddyUnderStars@users.noreply.github.com>
Date: Fri, 16 Sep 2022 12:54:02 +1000
Subject: Probably broken merge from webrtc

---
 gateway/src/util/Constants.ts | 4 +++-
 gateway/src/util/WebSocket.ts | 2 ++
 gateway/tsconfig.json         | 4 ++--
 3 files changed, 7 insertions(+), 3 deletions(-)

(limited to 'gateway')

diff --git a/gateway/src/util/Constants.ts b/gateway/src/util/Constants.ts
index 692f9028..5441118b 100644
--- a/gateway/src/util/Constants.ts
+++ b/gateway/src/util/Constants.ts
@@ -1,3 +1,5 @@
+import { VoiceOPCodes } from "@fosscord/webrtc";
+
 export enum OPCODES {
 	Dispatch = 0,
 	Heartbeat = 1,
@@ -43,7 +45,7 @@ export enum CLOSECODES {
 }
 
 export interface Payload {
-	op: OPCODES;
+	op: OPCODES | VoiceOPCodes;
 	d?: any;
 	s?: number;
 	t?: string;
diff --git a/gateway/src/util/WebSocket.ts b/gateway/src/util/WebSocket.ts
index 7ac277a8..d549ec77 100644
--- a/gateway/src/util/WebSocket.ts
+++ b/gateway/src/util/WebSocket.ts
@@ -1,6 +1,7 @@
 import { Intents, Permissions } from "@fosscord/util";
 import WS from "ws";
 import { Deflate, Inflate } from "fast-zlib";
+import { Client } from "@fosscord/webrtc";
 
 export interface WebSocket extends WS {
 	version: number;
@@ -21,4 +22,5 @@ export interface WebSocket extends WS {
 	events: Record<string, Function>;
 	member_events: Record<string, Function>;
 	listen_options: any;
+	client?: Client;
 }
diff --git a/gateway/tsconfig.json b/gateway/tsconfig.json
index 32c65e90..cc694102 100644
--- a/gateway/tsconfig.json
+++ b/gateway/tsconfig.json
@@ -77,8 +77,8 @@
 		"baseUrl": ".",
 		"paths": {
 			"@fosscord/gateway": ["src/index.ts"],
-			"@fosscord/gateway/*": ["src/*"]
-			"@fosscord/util": ["../util/src"]
+			"@fosscord/util": ["../util/src/index"],
+			"@fosscord/webrtc": ["../webrtc/src/index"]
 		},
 		"plugins": [{ "transform": "@zerollup/ts-transform-paths" }]
 	}
-- 
cgit 1.5.1