daenamnu/discord-api-types
1
0
Fork 0
mirror of https://github.com/discordjs/discord-api-types.git synced 2026-05-28 14:30:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: skip encoded url parts from re-encoding

Browse Source 
DJS or other users may already do a sanity encoding, so we dont need to re-encode
This commit is contained in:
Vlad Frangu
2024-12-22 22:11:26 +02:00
parent a81f31178f
commit fc4e7bebc5
10 changed files with 170 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
deno/rest/v10/mod.ts
View File

@@ -1,4 +1,5 @@
import type { Snowflake } from '../../globals.ts';
import { urlSafeCharacters } from '../../utils/internals.ts';
export * from '../common.ts';
export * from './application.ts';
@@ -1056,7 +1057,18 @@ export const Routes = {
for (const [key, fn] of Object.entries(Routes)) {
Routes[key as keyof typeof Routes] = (...args: (boolean | number | string | undefined)[]) => {
const escaped = args.map((arg) => arg && encodeURIComponent(arg));
const escaped = args.map((arg) => {
if (arg) {
// Skip already "safe" urls
if (urlSafeCharacters.test(String(arg))) {
return arg;
}
return encodeURIComponent(arg);
}
return arg;
});
// eslint-disable-next-line no-useless-call
return fn.call(null, ...escaped);
};
@@ -1363,8 +1375,19 @@ export const CDNRoutes = {
};
for (const [key, fn] of Object.entries(CDNRoutes)) {
CDNRoutes[key as keyof typeof CDNRoutes] = (...args: (number | string | undefined)[]) => {
const escaped = args.map((arg) => arg && encodeURIComponent(arg));
CDNRoutes[key as keyof typeof CDNRoutes] = (...args: (boolean | number | string | undefined)[]) => {
const escaped = args.map((arg) => {
if (arg) {
// Skip already "safe" urls
if (urlSafeCharacters.test(String(arg))) {
return arg;
}
return encodeURIComponent(arg);
}
return arg;
});
// eslint-disable-next-line no-useless-call
return fn.call(null, ...escaped);
};

17
deno/rest/v6/mod.ts
View File

@@ -1,3 +1,5 @@
import { urlSafeCharacters } from '../../utils/internals.ts';
export * from '../common.ts';
export * from './auditLog.ts';
@@ -521,8 +523,19 @@ export const Routes = {
};
for (const [key, fn] of Object.entries(Routes)) {
Routes[key] = (...args: string[]) => {
const escaped = args.map((arg) => encodeURIComponent(arg));
Routes[key] = (...args: (boolean | number | string | undefined)[]) => {
const escaped = args.map((arg) => {
if (arg) {
// Skip already "safe" urls
if (urlSafeCharacters.test(String(arg))) {
return arg;
}
return encodeURIComponent(arg);
}
return arg;
});
// eslint-disable-next-line no-useless-call
return fn.call(null, ...escaped);
};

16
deno/rest/v8/mod.ts
View File

@@ -1,4 +1,5 @@
import type { Snowflake } from '../../globals.ts';
import { urlSafeCharacters } from '../../utils/internals.ts';
export * from '../common.ts';
@@ -778,8 +779,19 @@ export const Routes = {
};
for (const [key, fn] of Object.entries(Routes)) {
Routes[key] = (...args: string[]) => {
const escaped = args.map((arg) => encodeURIComponent(arg));
Routes[key] = (...args: (boolean | number | string | undefined)[]) => {
const escaped = args.map((arg) => {
if (arg) {
// Skip already "safe" urls
if (urlSafeCharacters.test(String(arg))) {
return arg;
}
return encodeURIComponent(arg);
}
return arg;
});
// eslint-disable-next-line no-useless-call
return fn.call(null, ...escaped);
};

32
deno/rest/v9/mod.ts
View File

@@ -1,4 +1,5 @@
import type { Snowflake } from '../../globals.ts';
import { urlSafeCharacters } from '../../utils/internals.ts';
export * from '../common.ts';
export * from './application.ts';
@@ -1065,7 +1066,18 @@ export const Routes = {
for (const [key, fn] of Object.entries(Routes)) {
Routes[key as keyof typeof Routes] = (...args: (boolean | number | string | undefined)[]) => {
const escaped = args.map((arg) => arg && encodeURIComponent(arg));
const escaped = args.map((arg) => {
if (arg) {
// Skip already "safe" urls
if (urlSafeCharacters.test(String(arg))) {
return arg;
}
return encodeURIComponent(arg);
}
return arg;
});
// eslint-disable-next-line no-useless-call
return fn.call(null, ...escaped);
};
@@ -1372,8 +1384,19 @@ export const CDNRoutes = {
};
for (const [key, fn] of Object.entries(CDNRoutes)) {
CDNRoutes[key as keyof typeof CDNRoutes] = (...args: (number | string | undefined)[]) => {
const escaped = args.map((arg) => arg && encodeURIComponent(arg));
CDNRoutes[key as keyof typeof CDNRoutes] = (...args: (boolean | number | string | undefined)[]) => {
const escaped = args.map((arg) => {
if (arg) {
// Skip already "safe" urls
if (urlSafeCharacters.test(String(arg))) {
return arg;
}
return encodeURIComponent(arg);
}
return arg;
});
// eslint-disable-next-line no-useless-call
return fn.call(null, ...escaped);
};
@@ -1398,8 +1421,8 @@ export type ApplicationCoverFormat = Exclude<ImageFormat, ImageFormat.GIF | Imag
export type ApplicationAssetFormat = Exclude<ImageFormat, ImageFormat.GIF | ImageFormat.Lottie>;
export type AchievementIconFormat = Exclude<ImageFormat, ImageFormat.GIF | ImageFormat.Lottie>;
export type StickerPackBannerFormat = Exclude<ImageFormat, ImageFormat.GIF | ImageFormat.Lottie>;
export type StorePageAssetFormat = Exclude<ImageFormat, ImageFormat.GIF | ImageFormat.Lottie>;
export type TeamIconFormat = Exclude<ImageFormat, ImageFormat.GIF | ImageFormat.Lottie>;
export type StorePageAssetFormat = Exclude<ImageFormat, ImageFormat.GIF | ImageFormat.Lottie>;
export type StickerFormat = Extract<ImageFormat, ImageFormat.GIF | ImageFormat.Lottie | ImageFormat.PNG>;
export type RoleIconFormat = Exclude<ImageFormat, ImageFormat.GIF | ImageFormat.Lottie>;
export type GuildScheduledEventCoverFormat = Exclude<ImageFormat, ImageFormat.GIF | ImageFormat.Lottie>;
@@ -1417,6 +1440,7 @@ export interface CDNQuery {
export const RouteBases = {
api: `https://discord.com/api/v${APIVersion}`,
cdn: 'https://cdn.discordapp.com',
media: 'https://media.discordapp.net',
invite: 'https://discord.gg',
template: 'https://discord.new',
gift: 'https://discord.gift',

2
deno/utils/internals.ts
View File

@@ -39,3 +39,5 @@ export type DistributiveOmit<T, K extends DistributiveKeys<T>> =
T extends unknown ? { [P in keyof Omit_<T, K>]: Omit_<T, K>[P] } : never;
type Omit_<T, K> = Omit<T, Extract<keyof T, K>>;
export const urlSafeCharacters = /^[\d%A-Za-z-]+$/g;

29
rest/v10/index.ts
View File

@@ -1,4 +1,5 @@
import type { Snowflake } from '../../globals';
import { urlSafeCharacters } from '../../utils/internals';
export * from '../common';
export * from './application';
@@ -1056,7 +1057,18 @@ export const Routes = {
for (const [key, fn] of Object.entries(Routes)) {
Routes[key as keyof typeof Routes] = (...args: (boolean | number | string | undefined)[]) => {
const escaped = args.map((arg) => arg && encodeURIComponent(arg));
const escaped = args.map((arg) => {
if (arg) {
// Skip already "safe" urls
if (urlSafeCharacters.test(String(arg))) {
return arg;
}
return encodeURIComponent(arg);
}
return arg;
});
// eslint-disable-next-line no-useless-call
return fn.call(null, ...escaped);
};
@@ -1363,8 +1375,19 @@ export const CDNRoutes = {
};
for (const [key, fn] of Object.entries(CDNRoutes)) {
CDNRoutes[key as keyof typeof CDNRoutes] = (...args: (number | string | undefined)[]) => {
const escaped = args.map((arg) => arg && encodeURIComponent(arg));
CDNRoutes[key as keyof typeof CDNRoutes] = (...args: (boolean | number | string | undefined)[]) => {
const escaped = args.map((arg) => {
if (arg) {
// Skip already "safe" urls
if (urlSafeCharacters.test(String(arg))) {
return arg;
}
return encodeURIComponent(arg);
}
return arg;
});
// eslint-disable-next-line no-useless-call
return fn.call(null, ...escaped);
};

17
rest/v6/index.ts
View File

@@ -1,3 +1,5 @@
import { urlSafeCharacters } from '../../utils/internals';
export * from '../common';
export * from './auditLog';
@@ -521,8 +523,19 @@ export const Routes = {
};
for (const [key, fn] of Object.entries(Routes)) {
Routes[key] = (...args: string[]) => {
const escaped = args.map((arg) => encodeURIComponent(arg));
Routes[key] = (...args: (boolean | number | string | undefined)[]) => {
const escaped = args.map((arg) => {
if (arg) {
// Skip already "safe" urls
if (urlSafeCharacters.test(String(arg))) {
return arg;
}
return encodeURIComponent(arg);
}
return arg;
});
// eslint-disable-next-line no-useless-call
return fn.call(null, ...escaped);
};

16
rest/v8/index.ts
View File

@@ -1,4 +1,5 @@
import type { Snowflake } from '../../globals';
import { urlSafeCharacters } from '../../utils/internals';
export * from '../common';
@@ -778,8 +779,19 @@ export const Routes = {
};
for (const [key, fn] of Object.entries(Routes)) {
Routes[key] = (...args: string[]) => {
const escaped = args.map((arg) => encodeURIComponent(arg));
Routes[key] = (...args: (boolean | number | string | undefined)[]) => {
const escaped = args.map((arg) => {
if (arg) {
// Skip already "safe" urls
if (urlSafeCharacters.test(String(arg))) {
return arg;
}
return encodeURIComponent(arg);
}
return arg;
});
// eslint-disable-next-line no-useless-call
return fn.call(null, ...escaped);
};

32
rest/v9/index.ts
View File

@@ -1,4 +1,5 @@
import type { Snowflake } from '../../globals';
import { urlSafeCharacters } from '../../utils/internals';
export * from '../common';
export * from './application';
@@ -1065,7 +1066,18 @@ export const Routes = {
for (const [key, fn] of Object.entries(Routes)) {
Routes[key as keyof typeof Routes] = (...args: (boolean | number | string | undefined)[]) => {
const escaped = args.map((arg) => arg && encodeURIComponent(arg));
const escaped = args.map((arg) => {
if (arg) {
// Skip already "safe" urls
if (urlSafeCharacters.test(String(arg))) {
return arg;
}
return encodeURIComponent(arg);
}
return arg;
});
// eslint-disable-next-line no-useless-call
return fn.call(null, ...escaped);
};
@@ -1372,8 +1384,19 @@ export const CDNRoutes = {
};
for (const [key, fn] of Object.entries(CDNRoutes)) {
CDNRoutes[key as keyof typeof CDNRoutes] = (...args: (number | string | undefined)[]) => {
const escaped = args.map((arg) => arg && encodeURIComponent(arg));
CDNRoutes[key as keyof typeof CDNRoutes] = (...args: (boolean | number | string | undefined)[]) => {
const escaped = args.map((arg) => {
if (arg) {
// Skip already "safe" urls
if (urlSafeCharacters.test(String(arg))) {
return arg;
}
return encodeURIComponent(arg);
}
return arg;
});
// eslint-disable-next-line no-useless-call
return fn.call(null, ...escaped);
};
@@ -1398,8 +1421,8 @@ export type ApplicationCoverFormat = Exclude<ImageFormat, ImageFormat.GIF | Imag
export type ApplicationAssetFormat = Exclude<ImageFormat, ImageFormat.GIF | ImageFormat.Lottie>;
export type AchievementIconFormat = Exclude<ImageFormat, ImageFormat.GIF | ImageFormat.Lottie>;
export type StickerPackBannerFormat = Exclude<ImageFormat, ImageFormat.GIF | ImageFormat.Lottie>;
export type StorePageAssetFormat = Exclude<ImageFormat, ImageFormat.GIF | ImageFormat.Lottie>;
export type TeamIconFormat = Exclude<ImageFormat, ImageFormat.GIF | ImageFormat.Lottie>;
export type StorePageAssetFormat = Exclude<ImageFormat, ImageFormat.GIF | ImageFormat.Lottie>;
export type StickerFormat = Extract<ImageFormat, ImageFormat.GIF | ImageFormat.Lottie | ImageFormat.PNG>;
export type RoleIconFormat = Exclude<ImageFormat, ImageFormat.GIF | ImageFormat.Lottie>;
export type GuildScheduledEventCoverFormat = Exclude<ImageFormat, ImageFormat.GIF | ImageFormat.Lottie>;
@@ -1417,6 +1440,7 @@ export interface CDNQuery {
export const RouteBases = {
api: `https://discord.com/api/v${APIVersion}`,
cdn: 'https://cdn.discordapp.com',
media: 'https://media.discordapp.net',
invite: 'https://discord.gg',
template: 'https://discord.new',
gift: 'https://discord.gift',

2
utils/internals.ts
View File

@@ -39,3 +39,5 @@ export type DistributiveOmit<T, K extends DistributiveKeys<T>> =
T extends unknown ? { [P in keyof Omit_<T, K>]: Omit_<T, K>[P] } : never;
type Omit_<T, K> = Omit<T, Extract<keyof T, K>>;
export const urlSafeCharacters = /^[\d%A-Za-z-]+$/g;