diff --git a/packages/core/src/structures/message.ts b/packages/core/src/structures/message.ts index 0459487..ab2f93a 100644 --- a/packages/core/src/structures/message.ts +++ b/packages/core/src/structures/message.ts @@ -449,10 +449,9 @@ export class Message implements Model { } /** deletes this message */ - async delete(reason?: string): Promise { + async delete(): Promise { await this.session.rest.delete( - CHANNEL_MESSAGE(this.channelId, this.id), - { headers: { 'X-Audit-Log-Reason': reason } } + CHANNEL_MESSAGE(this.channelId, this.id) ); return this; diff --git a/packages/rest/src/adapters/default-rest-adapter.ts b/packages/rest/src/adapters/default-rest-adapter.ts index c33990c..6718af4 100644 --- a/packages/rest/src/adapters/default-rest-adapter.ts +++ b/packages/rest/src/adapters/default-rest-adapter.ts @@ -266,7 +266,6 @@ export class DefaultRestAdapter implements RestAdapter { } ): Promise { const url = route[0] === '/' ? `${this.url}${route}` : route; - return new Promise((resolve, reject) => { this.processRequest( { @@ -279,7 +278,7 @@ export class DefaultRestAdapter implements RestAdapter { ); reject(restError); }, - resolve: (data: any) => resolve(JSON.parse(data.body)), + resolve: (data: any) => resolve(data.body ? JSON.parse(data.body) : {}), }, { bucketId: options?.bucketId, @@ -304,7 +303,6 @@ export class DefaultRestAdapter implements RestAdapter { body: options.payload?.body, }) ); - const bucketIdFromHeaders = this.processRequestHeaders( options.url, response.headers @@ -314,6 +312,15 @@ export class DefaultRestAdapter implements RestAdapter { options.bucketId = bucketIdFromHeaders; } + if (response.status === 204) { + options.resolve?.({ + ok: true, + status: 204, + }); + + return; + } + if (response.status < 200 || response.status >= 400) { let error = 'REQUEST_UNKNOWN_ERROR'; @@ -401,15 +408,6 @@ export class DefaultRestAdapter implements RestAdapter { } } - if (response.status === 204) { - options.resolve?.({ - ok: true, - status: 204, - }); - - return; - } - const json = JSON.stringify(await response.json()); options.resolve?.({ diff --git a/packages/rest/src/adapters/rest-adapter.ts b/packages/rest/src/adapters/rest-adapter.ts index dad1f15..95cedec 100644 --- a/packages/rest/src/adapters/rest-adapter.ts +++ b/packages/rest/src/adapters/rest-adapter.ts @@ -115,7 +115,7 @@ export interface RestAdapter { delete( router: string, - data: unknown, + data?: unknown, options?: { retryCount?: number; bucketId?: string;