diff --git a/denoImportMap.json b/denoImportMap.json index fd152d36e..93d032901 100644 --- a/denoImportMap.json +++ b/denoImportMap.json @@ -4,6 +4,7 @@ "node:fs": "https://deno.land/std@0.176.0/node/fs.ts", "node:events": "https://deno.land/std@0.176.0/node/events.ts", "tweetnacl": "npm:tweetnacl", + "node-fetch": "npm:node-fetch", "ws": "npm:ws", "mocha": "https://deno.land/std@0.168.0/testing/bdd.ts", "chai": "https://cdn.skypack.dev/chai@4.3.4?dts", diff --git a/packages/rest/package.json b/packages/rest/package.json index ea8272c29..c25d29706 100644 --- a/packages/rest/package.json +++ b/packages/rest/package.json @@ -26,7 +26,8 @@ "dependencies": { "@discordeno/types": "19.0.0-alpha.1", "@discordeno/utils": "19.0.0-alpha.1", - "dotenv": "^16.0.3" + "dotenv": "^16.0.3", + "node-fetch": "^3.3.1" }, "devDependencies": { "@swc/cli": "^0.1.57", diff --git a/packages/rest/src/manager.ts b/packages/rest/src/manager.ts index 7576f650f..41abeccfd 100644 --- a/packages/rest/src/manager.ts +++ b/packages/rest/src/manager.ts @@ -16,6 +16,7 @@ import { processReactionString, urlToBase64, } from '@discordeno/utils' +import fetch from 'node-fetch' import { createInvalidRequestBucket } from './invalidBucket.js' import { Queue } from './queue.js' @@ -672,8 +673,8 @@ export function createRestManager(options: CreateRestManagerOptions): RestManage } if (key === 'defaultMemberPermissions') { - newObj.default_member_permissions = calculateBits(obj[key]); - continue; + newObj.default_member_permissions = calculateBits(obj[key]) + continue } newObj[camelToSnakeCase(key)] = rest.changeToDiscordFormat(obj[key]) diff --git a/packages/utils/package.json b/packages/utils/package.json index 25c4a269d..9961d5bc7 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -24,6 +24,7 @@ }, "dependencies": { "@discordeno/types": "19.0.0-alpha.1", + "node-fetch": "^3.3.1", "tweetnacl": "^1.0.3" }, "devDependencies": { diff --git a/packages/utils/src/urlToBase64.ts b/packages/utils/src/urlToBase64.ts index 68c54bd31..ee7085d8c 100644 --- a/packages/utils/src/urlToBase64.ts +++ b/packages/utils/src/urlToBase64.ts @@ -1,3 +1,4 @@ +import fetch from 'node-fetch' import { encode } from './base64.js' /** Converts a url to base 64. Useful for example, uploading/creating server emojis. */ diff --git a/yarn.lock b/yarn.lock index 38ab1fa3d..488deeda4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -120,6 +120,7 @@ __metadata: eslint: ^8.0.1 eslint-config-discordeno: "*" mocha: ^10.1.0 + node-fetch: ^3.3.1 sinon: ^15.0.0 ts-node: ^10.9.1 tsconfig: "*" @@ -165,6 +166,7 @@ __metadata: eslint: ^8.0.1 eslint-config-discordeno: "*" mocha: ^10.1.0 + node-fetch: ^3.3.1 sinon: ^15.0.0 ts-node: ^10.9.1 tsconfig: "*" @@ -1494,6 +1496,13 @@ __metadata: languageName: node linkType: hard +"data-uri-to-buffer@npm:^4.0.0": + version: 4.0.1 + resolution: "data-uri-to-buffer@npm:4.0.1" + checksum: 0d0790b67ffec5302f204c2ccca4494f70b4e2d940fea3d36b09f0bb2b8539c2e86690429eb1f1dc4bcc9e4df0644193073e63d9ee48ac9fce79ec1506e4aa4c + languageName: node + linkType: hard + "debug@npm:4, debug@npm:4.3.4, debug@npm:^4.1.0, debug@npm:^4.1.1, debug@npm:^4.3.2, debug@npm:^4.3.3, debug@npm:^4.3.4": version: 4.3.4 resolution: "debug@npm:4.3.4" @@ -2340,6 +2349,16 @@ __metadata: languageName: node linkType: hard +"fetch-blob@npm:^3.1.2, fetch-blob@npm:^3.1.4": + version: 3.2.0 + resolution: "fetch-blob@npm:3.2.0" + dependencies: + node-domexception: ^1.0.0 + web-streams-polyfill: ^3.0.3 + checksum: f19bc28a2a0b9626e69fd7cf3a05798706db7f6c7548da657cbf5026a570945f5eeaedff52007ea35c8bcd3d237c58a20bf1543bc568ab2422411d762dd3d5bf + languageName: node + linkType: hard + "file-entry-cache@npm:^6.0.1": version: 6.0.1 resolution: "file-entry-cache@npm:6.0.1" @@ -2466,6 +2485,15 @@ __metadata: languageName: node linkType: hard +"formdata-polyfill@npm:^4.0.10": + version: 4.0.10 + resolution: "formdata-polyfill@npm:4.0.10" + dependencies: + fetch-blob: ^3.1.2 + checksum: 82a34df292afadd82b43d4a740ce387bc08541e0a534358425193017bf9fb3567875dc5f69564984b1da979979b70703aa73dee715a17b6c229752ae736dd9db + languageName: node + linkType: hard + "from2@npm:^2.1.1": version: 2.3.0 resolution: "from2@npm:2.3.0" @@ -3903,6 +3931,24 @@ __metadata: languageName: node linkType: hard +"node-domexception@npm:^1.0.0": + version: 1.0.0 + resolution: "node-domexception@npm:1.0.0" + checksum: ee1d37dd2a4eb26a8a92cd6b64dfc29caec72bff5e1ed9aba80c294f57a31ba4895a60fd48347cf17dd6e766da0ae87d75657dfd1f384ebfa60462c2283f5c7f + languageName: node + linkType: hard + +"node-fetch@npm:^3.3.1": + version: 3.3.1 + resolution: "node-fetch@npm:3.3.1" + dependencies: + data-uri-to-buffer: ^4.0.0 + fetch-blob: ^3.1.4 + formdata-polyfill: ^4.0.10 + checksum: 62145fd3ba4770a76110bc31fdc0054ab2f5442b5ce96e9c4b39fc9e94a3d305560eec76e1165d9259eab866e02a8eecf9301062bb5dfc9f08a4d08b69d223dd + languageName: node + linkType: hard + "node-gyp@npm:latest": version: 9.3.1 resolution: "node-gyp@npm:9.3.1" @@ -5489,6 +5535,13 @@ __metadata: languageName: node linkType: hard +"web-streams-polyfill@npm:^3.0.3": + version: 3.2.1 + resolution: "web-streams-polyfill@npm:3.2.1" + checksum: b119c78574b6d65935e35098c2afdcd752b84268e18746606af149e3c424e15621b6f1ff0b42b2676dc012fc4f0d313f964b41a4b5031e525faa03997457da02 + languageName: node + linkType: hard + "which-boxed-primitive@npm:^1.0.2": version: 1.0.2 resolution: "which-boxed-primitive@npm:1.0.2"