diff --git a/src/bot.ts b/src/bot.ts index 87eb6c8bb..d11b84c54 100644 --- a/src/bot.ts +++ b/src/bot.ts @@ -41,9 +41,13 @@ export async function startBot(config: BotConfig) { proxyWSURL = botGatewayData.url; identifyPayload.token = config.token; identifyPayload.intents = config.intents.reduce( - (bits, next) => - (bits |= typeof next === "string" ? DiscordGatewayIntents[next] : next), - 0 + ( + bits, + next, + ) => (bits |= typeof next === "string" + ? DiscordGatewayIntents[next] + : next), + 0, ); lastShardId = botGatewayData.shards; identifyPayload.shard = [0, lastShardId]; @@ -90,9 +94,13 @@ export async function startBigBrainBot(data: BigBrainBotConfig) { } identifyPayload.intents = data.intents.reduce( - (bits, next) => - (bits |= typeof next === "string" ? DiscordGatewayIntents[next] : next), - 0 + ( + bits, + next, + ) => (bits |= typeof next === "string" + ? DiscordGatewayIntents[next] + : next), + 0, ); // PROXY DOESNT NEED US SPAWNING SHARDS diff --git a/src/helpers/messages/send_message.ts b/src/helpers/messages/send_message.ts index e80f5ff72..cb3c9a603 100644 --- a/src/helpers/messages/send_message.ts +++ b/src/helpers/messages/send_message.ts @@ -92,23 +92,21 @@ export async function sendMessage( } } - const result = - (await rest.runMethod( - "post", - endpoints.CHANNEL_MESSAGES(channelId), - camelKeysToSnakeCase({ - ...content, - ...(content.messageReference?.messageId - ? { - messageReference: { - ...content.messageReference, - failIfNotExists: - content.messageReference.failIfNotExists === true, - }, - } - : {}), - }), - )) as DiscordMessage; + const result = (await rest.runMethod( + "post", + endpoints.CHANNEL_MESSAGES(channelId), + camelKeysToSnakeCase({ + ...content, + ...(content.messageReference?.messageId + ? { + messageReference: { + ...content.messageReference, + failIfNotExists: content.messageReference.failIfNotExists === true, + }, + } + : {}), + }), + )) as DiscordMessage; return structures.createMessageStruct(result); } diff --git a/src/rest/process_queue.ts b/src/rest/process_queue.ts index b9539da1c..9404583cd 100644 --- a/src/rest/process_queue.ts +++ b/src/rest/process_queue.ts @@ -36,18 +36,19 @@ export async function processQueue(id: string) { // EXECUTE THE REQUEST // IF THIS IS A GET REQUEST, CHANGE THE BODY TO QUERY PARAMETERS - const query = - queuedRequest.request.method.toUpperCase() === "GET" && - queuedRequest.payload.body - ? Object.entries(queuedRequest.payload.body) - .map( - ([key, value]) => - `${encodeURIComponent(key)}=${encodeURIComponent( - value as string - )}` - ) - .join("&") - : ""; + const query = queuedRequest.request.method.toUpperCase() === "GET" && + queuedRequest.payload.body + ? Object.entries(queuedRequest.payload.body) + .map( + ([key, value]) => + `${encodeURIComponent(key)}=${ + encodeURIComponent( + value as string, + ) + }`, + ) + .join("&") + : ""; const urlToUse = queuedRequest.request.method.toUpperCase() === "GET" && query ? `${queuedRequest.request.url}?${query}` @@ -59,13 +60,13 @@ export async function processQueue(id: string) { try { const response = await fetch( urlToUse, - rest.createRequestBody(queuedRequest) + rest.createRequestBody(queuedRequest), ); rest.eventHandlers.fetched(queuedRequest.payload); const bucketIdFromHeaders = rest.processRequestHeaders( queuedRequest.request.url, - response.headers + response.headers, ); if (response.status < 200 || response.status >= 400) { @@ -123,7 +124,7 @@ export async function processQueue(id: string) { // IF IT HAS MAXED RETRIES SOMETHING SERIOUSLY WRONG. CANCEL OUT. if ( queuedRequest.payload.retryCount >= - queuedRequest.options.maxRetryCount + queuedRequest.options.maxRetryCount ) { rest.eventHandlers.retriesMaxed(queuedRequest.payload); queuedRequest.request.respond({ diff --git a/src/rest/process_request.ts b/src/rest/process_request.ts index a2a023ee0..83a2ae937 100644 --- a/src/rest/process_request.ts +++ b/src/rest/process_request.ts @@ -4,7 +4,7 @@ import { rest } from "./rest.ts"; /** Processes a request and assigns it to a queue or creates a queue if none exists for it. */ export function processRequest( request: ServerRequest, - payload: RunMethodOptions + payload: RunMethodOptions, ) { const route = request.url.substring(request.url.indexOf("api/")); const parts = route.split("/"); diff --git a/src/rest/run_method.ts b/src/rest/run_method.ts index b7571d69e..06249e300 100644 --- a/src/rest/run_method.ts +++ b/src/rest/run_method.ts @@ -140,7 +140,12 @@ export function runMethod( } }; - rest.processRequest({ url, method, respond: (data: { status: number, body?: string; }) => resolve(JSON.parse(data.body || "{}")) }, { + rest.processRequest({ + url, + method, + respond: (data: { status: number; body?: string }) => + resolve(JSON.parse(data.body || "{}")), + }, { callback, bucketId, url, diff --git a/src/ws/create_shard.ts b/src/ws/create_shard.ts index 8909efdcd..f7a348fcd 100644 --- a/src/ws/create_shard.ts +++ b/src/ws/create_shard.ts @@ -11,7 +11,8 @@ export async function createShard(shardId: number) { ws.log("ERROR", { shardId, error: errorEvent }); }; - socket.onmessage = ({ data: message }) => ws.handleOnMessage(message, shardId); + socket.onmessage = ({ data: message }) => + ws.handleOnMessage(message, shardId); socket.onclose = (event) => { ws.log("CLOSED", { shardId, payload: event }); diff --git a/src/ws/handle_on_message.ts b/src/ws/handle_on_message.ts index 1a202fd75..1263bbc31 100644 --- a/src/ws/handle_on_message.ts +++ b/src/ws/handle_on_message.ts @@ -15,8 +15,10 @@ export async function handleOnMessage(message: any, shardId: number) { } if (message instanceof Uint8Array) { - message = decompressWith(message, 0, (slice: Uint8Array) => - ws.utf8decoder.decode(slice) + message = decompressWith( + message, + 0, + (slice: Uint8Array) => ws.utf8decoder.decode(slice), ); } @@ -29,7 +31,7 @@ export async function handleOnMessage(message: any, shardId: number) { case DiscordGatewayOpcodes.Hello: ws.heartbeat( shardId, - (messageData.d as DiscordHeartbeat).heartbeat_interval + (messageData.d as DiscordHeartbeat).heartbeat_interval, ); break; case DiscordGatewayOpcodes.HeartbeatACK: diff --git a/src/ws/identify.ts b/src/ws/identify.ts index 46c5123e2..b3e32f599 100644 --- a/src/ws/identify.ts +++ b/src/ws/identify.ts @@ -31,7 +31,7 @@ export async function identify(shardId: number, maxShards: number) { JSON.stringify({ op: DiscordGatewayOpcodes.Identify, d: { ...ws.identifyPayload, shard: [shardId, maxShards] }, - }) + }), ); };