From 69f7ee289050f16f310e0af65634aad40851fbb1 Mon Sep 17 00:00:00 2001 From: emerson Date: Tue, 11 Jul 2023 15:41:17 +0000 Subject: [PATCH] fix error reporting and part command --- src/Client.ts | 72 +++++++++++++++++++++++---------------------------- 1 file changed, 33 insertions(+), 39 deletions(-) diff --git a/src/Client.ts b/src/Client.ts index 596af5c..07c5750 100644 --- a/src/Client.ts +++ b/src/Client.ts @@ -208,12 +208,12 @@ export class Client { } }).catch((error) => { if (error.response) { - this.server.doLog(error.response.data); + this.server.doLog(error.response.data.toString()); } else if (error.request) { - this.server.doLog(error.request); + this.server.doLog(error.request.toString()); } else { this.server.doLog(`Error: ${error.message}`); - this.server.doLog(error.config); + this.server.doLog(error.config.toString()); } }) } @@ -296,12 +296,12 @@ export class Client { } }).catch((error) => { if (error.response) { - this.server.doLog(error.response.data); + this.server.doLog(error.response.data.toString()); } else if (error.request) { - this.server.doLog(error.request); + this.server.doLog(error.request.toString()); } else { this.server.doLog(`Error: ${error.message}`); - this.server.doLog(error.config); + this.server.doLog(error.config.toString()); } }) } @@ -333,12 +333,12 @@ export class Client { } }).catch((error) => { if (error.response) { - this.server.doLog(error.response.data); + this.server.doLog(error.response.data.toString()); } else if (error.request) { - this.server.doLog(error.request); + this.server.doLog(error.request.toString()); } else { this.server.doLog(`Error: ${error.message}`); - this.server.doLog(error.config); + this.server.doLog(error.config.toString()); } }) } @@ -375,12 +375,12 @@ export class Client { } }).catch((error) => { if (error.response) { - this.server.doLog(error.response.data); + this.server.doLog(error.response.data.toString()); } else if (error.request) { - this.server.doLog(error.request); + this.server.doLog(error.request.toString()); } else { this.server.doLog(`Error: ${error.message}`); - this.server.doLog(error.config); + this.server.doLog(error.config.toString()); } }) } @@ -456,12 +456,12 @@ export class Client { } }).catch((error) => { if (error.response) { - this.server.doLog(error.response.data); + this.server.doLog(error.response.data.toString()); } else if (error.request) { - this.server.doLog(error.request); + this.server.doLog(error.request.toString()); } else { this.server.doLog(`Error: ${error.message}`); - this.server.doLog(error.config); + this.server.doLog(error.config.toString()); } }); } @@ -517,12 +517,12 @@ export class Client { } }).catch((error) => { if (error.response) { - this.server.doLog(error.response.data); + this.server.doLog(error.response.data.toString()); } else if (error.request) { - this.server.doLog(error.request); + this.server.doLog(error.request.toString()); } else { this.server.doLog(`Error: ${error.message}`); - this.server.doLog(error.config); + this.server.doLog(error.config.toString()); } }); } @@ -581,15 +581,9 @@ export class Client { const reason = (message.params.length === 2) ? message.params[1] : ""; this.apiCall.post(`/rooms/${targetChannel.roomId}/leave`, {"reason": reason}).then(response => { if (response.status === 200) { - //@ts-ignore - this.user.getClients().forEach(c => { - //@ts-ignore - c.sendMessage(this.user.getMask(), "PART", [targetChannel.name, reason], message.tags); - }) - //@ts-ignore - this.user.channels.delete(targetChannel.name); - //@ts-ignore - this.user.roomIdToChannel.delete(targetChannel.roomId); + this.sendMessage(this.user.getMask(), "PART", [targetChannel.name, reason], message.tags); + this.user.channels.delete(targetChannel); + this.server.roomIdToChannel.delete(targetChannel.roomId); } else { //@ts-ignore @@ -597,12 +591,12 @@ export class Client { } }).catch((error) => { if (error.response) { - this.server.doLog(error.response.data); + this.server.doLog(error.response.data.toString()); } else if (error.request) { - this.server.doLog(error.request); + this.server.doLog(error.request.toString()); } else { this.server.doLog(`Error: ${error.message}`); - this.server.doLog(error.config); + this.server.doLog(error.config.toString()); } }) } @@ -633,12 +627,12 @@ export class Client { } }).catch((error) => { if (error.response) { - this.server.doLog(error.response.data); + this.server.doLog(error.response.data.toString()); } else if (error.request) { - this.server.doLog(error.request); + this.server.doLog(error.request.toString()); } else { this.server.doLog(`Error: ${error.message}`); - this.server.doLog(error.config); + this.server.doLog(error.config.toString()); } }); } @@ -653,12 +647,12 @@ export class Client { // No response body for successful request }).catch((error) => { if (error.response) { - this.server.doLog(error.response.data); + this.server.doLog(error.response.data.toString()); } else if (error.request) { - this.server.doLog(error.request); + this.server.doLog(error.request.toString()); } else { this.server.doLog(`Error: ${error.message}`); - this.server.doLog(error.config); + this.server.doLog(error.config.toString()); } }); } @@ -712,12 +706,12 @@ export class Client { } }).catch((error) => { if (error.response) { - this.server.doLog(error.response.data); + this.server.doLog(error.response.data.toString()); } else if (error.request) { - this.server.doLog(error.request); + this.server.doLog(error.request.toString()); } else { this.server.doLog(`Error: ${error.message}`); - this.server.doLog(error.config); + this.server.doLog(error.config.toString()); } }) }