@discordeno/rest 19.0.0-next.f41fe4d → 19.0.0-next.f5abd83

package/dist/manager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"manager.d.ts","sourceRoot":"","sources":["../src/manager.ts"],"names":[],"mappings":"AAmEA,OAAO,KAAK,EAA4B,wBAAwB,EAAE,WAAW,EAAsB,MAAM,YAAY,CAAA;AAKrH,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,wBAAwB,GAAG,WAAW,CA2rDhF"}
+{"version":3,"file":"manager.d.ts","sourceRoot":"","sources":["../src/manager.ts"],"names":[],"mappings":"AAmEA,OAAO,KAAK,EAA4B,wBAAwB,EAAE,WAAW,EAAsB,MAAM,YAAY,CAAA;AAKrH,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,wBAAwB,GAAG,WAAW,CAmsDhF"}

package/dist/manager.js

@@ -545,46 +545,47 @@ export function createRestManager(options) {
             if (typeof obj === 'bigint') return obj.toString();
             return obj;
         },
-        createRequest (options) {
+        createRequestBody (method, options) {
             const headers = {
                 'user-agent': `DiscordBot (https://github.com/discordeno/discordeno, v${version})`
             };
-            if (!options.unauthorized) headers.authorization = `Bot ${rest.token}`;
+            if (!options?.unauthorized) headers.authorization = `Bot ${rest.token}`;
             // IF A REASON IS PROVIDED ENCODE IT IN HEADERS
-            if (options.reason !== undefined) {
-                headers['x-audit-log-reason'] = encodeURIComponent(options.reason);
+            if (options?.reason !== undefined) {
+                headers['x-audit-log-reason'] = encodeURIComponent(options?.reason);
             }
             let body;
             // TODO: check if we need to add specific check for GET method
             // Since GET does not allow bodies
             // Have to check for attachments first, since body then has to be send in a different way.
-            if (options.attachments !== undefined) {
+            if (options?.files !== undefined) {
                 const form = new FormData();
-                for(let i = 0; i < options.attachments.length; ++i){
-                    form.append(`file${i}`, options.attachments[i].blob, options.attachments[i].name);
+                for(let i = 0; i < options.files.length; ++i){
+                    form.append(`file${i}`, options.files[i].blob, options.files[i].name);
                 }
-                form.append('payload_json', JSON.stringify(options.body));
+                form.append('payload_json', JSON.stringify({
+                    ...options.body,
+                    files: undefined
+                }));
                 body = form;
-                // TODO: boundary?
-                // `multipart/form-data; boundary=${form.getBoundary()}`
-                headers['content-type'] = `multipart/form-data`;
-            } else if (options.body !== undefined) {
+            // No need to set the `content-type` header since `fetch` does that automatically for us when we use a `FormData` object.
+            } else if (options?.body !== undefined) {
                 if (options.body instanceof FormData) {
                     body = options.body;
-                    headers['content-type'] = `multipart/form-data`;
+                // No need to set the `content-type` header since `fetch` does that automatically for us when we use a `FormData` object.
                 } else {
-                    body = JSON.stringify(options.body);
+                    body = JSON.stringify(rest.changeToDiscordFormat(options.body));
                     headers['content-type'] = `application/json`;
                 }
             }
             // SOMETIMES SPECIAL HEADERS (E.G. CUSTOM AUTHORIZATION) NEED TO BE USED
-            if (options.headers) {
+            if (options?.headers) {
                 Object.assign(headers, options.headers);
             }
             return {
                 body,
                 headers,
-                method: options.method
+                method
             };
         },
         processRateLimitedPaths () {
@@ -679,12 +680,7 @@ export function createRestManager(options) {
         },
         async sendRequest (options) {
             const url = options.url.startsWith('https://') ? options.url : `${rest.baseUrl}/v${rest.version}${options.url}`;
-            const payload = rest.createRequest({
-                method: options.method,
-                url: options.url,
-                body: options.options?.body,
-                ...options.options
-            });
+            const payload = rest.createRequestBody(options.method, options.requestBodyOptions);
             logger.debug(`sending request to ${url}`, 'with payload:', {
                 ...payload,
                 headers: {
@@ -825,7 +821,7 @@ export function createRestManager(options) {
                 const payload = {
                     url,
                     method,
-                    options,
+                    requestBodyOptions: options,
                     retryCount: 0,
                     retryRequest: async function(payload) {
                         rest.processRequest(payload);
@@ -838,30 +834,20 @@ export function createRestManager(options) {
                 rest.processRequest(payload);
             });
         },
-        async get (url, body) {
-            return camelize(await rest.makeRequest('GET', url, {
-                body
-            }));
+        async get (url, options) {
+            return camelize(await rest.makeRequest('GET', url, options));
         },
-        async post (url, body) {
-            return camelize(await rest.makeRequest('POST', url, {
-                body
-            }));
+        async post (url, options) {
+            return camelize(await rest.makeRequest('POST', url, options));
         },
-        async delete (url, body) {
-            camelize(await rest.makeRequest('DELETE', url, {
-                body
-            }));
+        async delete (url, options) {
+            camelize(await rest.makeRequest('DELETE', url, options));
         },
-        async patch (url, body) {
-            return camelize(await rest.makeRequest('PATCH', url, {
-                body
-            }));
+        async patch (url, options) {
+            return camelize(await rest.makeRequest('PATCH', url, options));
         },
-        async put (url, body) {
-            return camelize(await rest.makeRequest('PUT', url, {
-                body
-            }));
+        async put (url, options) {
+            return camelize(await rest.makeRequest('PUT', url, options));
         },
         async addReaction (channelId, messageId, reaction) {
             reaction = processReactionString(reaction);
@@ -941,7 +927,8 @@ export function createRestManager(options) {
         },
         async createForumThread (channelId, body) {
             return await rest.post(rest.routes.channels.forum(channelId), {
-                body
+                body,
+                files: body.files
             });
         },
         async createInvite (channelId, body = {}) {
@@ -1121,7 +1108,8 @@ export function createRestManager(options) {
         },
         async editFollowupMessage (token, messageId, body) {
             return await rest.patch(rest.routes.interactions.responses.message(rest.applicationId, token, messageId), {
-                body
+                body,
+                files: body.files
             });
         },
         async editGlobalApplicationCommand (commandId, body) {
@@ -1164,7 +1152,8 @@ export function createRestManager(options) {
         },
         async editOriginalInteractionResponse (token, body) {
             return await rest.patch(rest.routes.interactions.responses.original(rest.applicationId, token), {
-                body
+                body,
+                files: body.files
             });
         },
         async editOriginalWebhookMessage (webhookId, token, options) {
@@ -1172,7 +1161,8 @@ export function createRestManager(options) {
                 body: {
                     type: InteractionResponseTypes.UpdateMessage,
                     data: options
-                }
+                },
+                files: options.files
             });
         },
         async editOwnVoiceState (guildId, options) {
@@ -1218,7 +1208,8 @@ export function createRestManager(options) {
         },
         async editWebhookMessage (webhookId, token, messageId, options) {
             return await rest.patch(rest.routes.webhooks.message(webhookId, token, messageId, options), {
-                body: options
+                body: options,
+                files: options.files
             });
         },
         async editWebhookWithToken (webhookId, token, body) {
@@ -1463,8 +1454,9 @@ export function createRestManager(options) {
                 rest.sendRequest({
                     url: rest.routes.webhooks.webhook(rest.applicationId, token),
                     method: 'POST',
-                    options: {
-                        body: options
+                    requestBodyOptions: {
+                        body: options,
+                        files: options.files
                     },
                     retryCount: 0,
                     retryRequest: async function(options) {
@@ -1484,7 +1476,7 @@ export function createRestManager(options) {
                 rest.sendRequest({
                     url: rest.routes.interactions.responses.callback(interactionId, token),
                     method: 'POST',
-                    options: {
+                    requestBodyOptions: {
                         body: options
                     },
                     retryCount: 0,
@@ -1501,7 +1493,8 @@ export function createRestManager(options) {
         },
         async sendMessage (channelId, body) {
             return await rest.post(rest.routes.channels.messages(channelId), {
-                body
+                body,
+                files: body.files
             });
         },
         async startThreadWithMessage (channelId, messageId, body) {