:art: fix imports with new build script

7 files changed, 22 insertions, 29 deletions

diff --git a/gateway/src/Server.ts b/gateway/src/Server.ts
index b4e92a75..cf4f906c 100644
--- a/gateway/src/Server.ts
+++ b/gateway/src/Server.ts
@@ -2,12 +2,12 @@ import "missing-native-js-functions";
 import dotenv from "dotenv";
 dotenv.config();
 import { closeDatabase, Config, initDatabase, initEvent } from "@fosscord/util";
-import { Server as WebSocketServer } from "ws";
+import ws from "ws";
 import { Connection } from "./events/Connection";
 import http from "http";
 
 export class Server {
-	public ws: WebSocketServer;
+	public ws: ws.Server;
 	public port: number;
 	public server: http.Server;
 	public production: boolean;
@@ -39,7 +39,7 @@ export class Server {
 			});
 		});
 
-		this.ws = new WebSocketServer({
+		this.ws = new ws.Server({
 			maxPayload: 4096,
 			noServer: true,
 		});
diff --git a/gateway/src/events/Connection.ts b/gateway/src/events/Connection.ts
index f84f9d9b..c1a6b618 100644
--- a/gateway/src/events/Connection.ts
+++ b/gateway/src/events/Connection.ts
@@ -1,11 +1,8 @@
 import WS from "ws";
-import {
-	setHeartbeat,
-	Send,
-	CLOSECODES,
-	OPCODES,
-	WebSocket,
-} from "@fosscord/gateway";
+import { WebSocket } from "@fosscord/gateway";
+import { Send } from "../util/Send";
+import { CLOSECODES, OPCODES } from "../util/Constants";
+import { setHeartbeat } from "../util/Heartbeat";
 import { IncomingMessage } from "http";
 import { Close } from "./Close";
 import { Message } from "./Message";
diff --git a/gateway/src/events/Message.ts b/gateway/src/events/Message.ts
index 1f1c4f72..3648931d 100644
--- a/gateway/src/events/Message.ts
+++ b/gateway/src/events/Message.ts
@@ -1,4 +1,5 @@
-import { WebSocket, Payload, CLOSECODES, OPCODES } from "@fosscord/gateway";
+import { CLOSECODES, OPCODES } from "../util/Constants";
+import { WebSocket, Payload } from "@fosscord/gateway";
 var erlpack: any;
 try {
 	erlpack = require("@yukikaze-bot/erlpack");
diff --git a/gateway/src/listener/listener.ts b/gateway/src/listener/listener.ts
index 0fa6bb08..ee640f38 100644
--- a/gateway/src/listener/listener.ts
+++ b/gateway/src/listener/listener.ts
@@ -1,15 +1,15 @@
 import {
-	User,
 	getPermission,
 	Permissions,
-	Channel,
 	RabbitMQ,
 	listenEvent,
 	EventOpts,
 	ListenEventOpts,
 	Member,
 } from "@fosscord/util";
-import { OPCODES, WebSocket, Send } from "@fosscord/gateway";
+import { OPCODES } from "../util/Constants";
+import { Send } from "../util/Send";
+import { WebSocket } from "@fosscord/gateway";
 import "missing-native-js-functions";
 import { Channel as AMQChannel } from "amqplib";
 import { Recipient } from "@fosscord/util";
diff --git a/gateway/src/opcodes/Heartbeat.ts b/gateway/src/opcodes/Heartbeat.ts
index 46caee56..50394130 100644
--- a/gateway/src/opcodes/Heartbeat.ts
+++ b/gateway/src/opcodes/Heartbeat.ts
@@ -1,4 +1,6 @@
-import { Payload, Send, setHeartbeat, WebSocket } from "@fosscord/gateway";
+import { Payload, WebSocket } from "@fosscord/gateway";
+import { setHeartbeat } from "../util/Heartbeat";
+import { Send } from "../util/Send";
 
 export async function onHeartbeat(this: WebSocket, data: Payload) {
 	// TODO: validate payload
diff --git a/gateway/src/opcodes/Identify.ts b/gateway/src/opcodes/Identify.ts
index 8233aade..6decf21c 100644
--- a/gateway/src/opcodes/Identify.ts
+++ b/gateway/src/opcodes/Identify.ts
@@ -1,14 +1,6 @@
+import { WebSocket, Payload } from "@fosscord/gateway";
 import {
-	WebSocket,
-	CLOSECODES,
-	Payload,
-	OPCODES,
-	genSessionId,
-} from "@fosscord/gateway";
-import {
-	Channel,
 	checkToken,
-	Guild,
 	Intents,
 	Member,
 	ReadyEventData,
@@ -16,16 +8,15 @@ import {
 	Session,
 	EVENTEnum,
 	Config,
-	dbConnection,
-	PublicMemberProjection,
 	PublicMember,
-	ChannelType,
 	PublicUser,
 	PrivateUserProjection,
 } from "@fosscord/util";
+import { Send } from "../util/Send";
+import { CLOSECODES, OPCODES } from "../util/Constants";
+import { genSessionId } from "../util/SessionUtils";
 import { setupListener } from "../listener/listener";
 import { IdentifySchema } from "../schema/Identify";
-import { Send } from "@fosscord/gateway/util/Send";
 // import experiments from "./experiments.json";
 const experiments: any = [];
 import { check } from "./instanceOf";
diff --git a/gateway/src/opcodes/LazyRequest.ts b/gateway/src/opcodes/LazyRequest.ts
index 5b6ac444..d37e32da 100644
--- a/gateway/src/opcodes/LazyRequest.ts
+++ b/gateway/src/opcodes/LazyRequest.ts
@@ -5,7 +5,9 @@ import {
 	Role,
 } from "@fosscord/util";
 import { LazyRequest } from "../schema/LazyRequest";
-import { WebSocket, Send, OPCODES, Payload } from "@fosscord/gateway";
+import { Send } from "../util/Send";
+import { OPCODES } from "../util/Constants";
+import { WebSocket, Payload } from "@fosscord/gateway";
 import { check } from "./instanceOf";
 import "missing-native-js-functions";