mirror of
https://git.sr.ht/~emerson/reflectionircd
synced 2025-04-13 09:59:52 +00:00
fix error reporting and part command
This commit is contained in:
parent
12437a8250
commit
69f7ee2890
1 changed files with 33 additions and 39 deletions
|
@ -208,12 +208,12 @@ export class Client {
|
||||||
}
|
}
|
||||||
}).catch((error) => {
|
}).catch((error) => {
|
||||||
if (error.response) {
|
if (error.response) {
|
||||||
this.server.doLog(error.response.data);
|
this.server.doLog(error.response.data.toString());
|
||||||
} else if (error.request) {
|
} else if (error.request) {
|
||||||
this.server.doLog(error.request);
|
this.server.doLog(error.request.toString());
|
||||||
} else {
|
} else {
|
||||||
this.server.doLog(`Error: ${error.message}`);
|
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) => {
|
}).catch((error) => {
|
||||||
if (error.response) {
|
if (error.response) {
|
||||||
this.server.doLog(error.response.data);
|
this.server.doLog(error.response.data.toString());
|
||||||
} else if (error.request) {
|
} else if (error.request) {
|
||||||
this.server.doLog(error.request);
|
this.server.doLog(error.request.toString());
|
||||||
} else {
|
} else {
|
||||||
this.server.doLog(`Error: ${error.message}`);
|
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) => {
|
}).catch((error) => {
|
||||||
if (error.response) {
|
if (error.response) {
|
||||||
this.server.doLog(error.response.data);
|
this.server.doLog(error.response.data.toString());
|
||||||
} else if (error.request) {
|
} else if (error.request) {
|
||||||
this.server.doLog(error.request);
|
this.server.doLog(error.request.toString());
|
||||||
} else {
|
} else {
|
||||||
this.server.doLog(`Error: ${error.message}`);
|
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) => {
|
}).catch((error) => {
|
||||||
if (error.response) {
|
if (error.response) {
|
||||||
this.server.doLog(error.response.data);
|
this.server.doLog(error.response.data.toString());
|
||||||
} else if (error.request) {
|
} else if (error.request) {
|
||||||
this.server.doLog(error.request);
|
this.server.doLog(error.request.toString());
|
||||||
} else {
|
} else {
|
||||||
this.server.doLog(`Error: ${error.message}`);
|
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) => {
|
}).catch((error) => {
|
||||||
if (error.response) {
|
if (error.response) {
|
||||||
this.server.doLog(error.response.data);
|
this.server.doLog(error.response.data.toString());
|
||||||
} else if (error.request) {
|
} else if (error.request) {
|
||||||
this.server.doLog(error.request);
|
this.server.doLog(error.request.toString());
|
||||||
} else {
|
} else {
|
||||||
this.server.doLog(`Error: ${error.message}`);
|
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) => {
|
}).catch((error) => {
|
||||||
if (error.response) {
|
if (error.response) {
|
||||||
this.server.doLog(error.response.data);
|
this.server.doLog(error.response.data.toString());
|
||||||
} else if (error.request) {
|
} else if (error.request) {
|
||||||
this.server.doLog(error.request);
|
this.server.doLog(error.request.toString());
|
||||||
} else {
|
} else {
|
||||||
this.server.doLog(`Error: ${error.message}`);
|
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] : "";
|
const reason = (message.params.length === 2) ? message.params[1] : "";
|
||||||
this.apiCall.post(`/rooms/${targetChannel.roomId}/leave`, {"reason": reason}).then(response => {
|
this.apiCall.post(`/rooms/${targetChannel.roomId}/leave`, {"reason": reason}).then(response => {
|
||||||
if (response.status === 200) {
|
if (response.status === 200) {
|
||||||
//@ts-ignore
|
this.sendMessage(this.user.getMask(), "PART", [targetChannel.name, reason], message.tags);
|
||||||
this.user.getClients().forEach(c => {
|
this.user.channels.delete(targetChannel);
|
||||||
//@ts-ignore
|
this.server.roomIdToChannel.delete(targetChannel.roomId);
|
||||||
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);
|
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
//@ts-ignore
|
//@ts-ignore
|
||||||
|
@ -597,12 +591,12 @@ export class Client {
|
||||||
}
|
}
|
||||||
}).catch((error) => {
|
}).catch((error) => {
|
||||||
if (error.response) {
|
if (error.response) {
|
||||||
this.server.doLog(error.response.data);
|
this.server.doLog(error.response.data.toString());
|
||||||
} else if (error.request) {
|
} else if (error.request) {
|
||||||
this.server.doLog(error.request);
|
this.server.doLog(error.request.toString());
|
||||||
} else {
|
} else {
|
||||||
this.server.doLog(`Error: ${error.message}`);
|
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) => {
|
}).catch((error) => {
|
||||||
if (error.response) {
|
if (error.response) {
|
||||||
this.server.doLog(error.response.data);
|
this.server.doLog(error.response.data.toString());
|
||||||
} else if (error.request) {
|
} else if (error.request) {
|
||||||
this.server.doLog(error.request);
|
this.server.doLog(error.request.toString());
|
||||||
} else {
|
} else {
|
||||||
this.server.doLog(`Error: ${error.message}`);
|
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
|
// No response body for successful request
|
||||||
}).catch((error) => {
|
}).catch((error) => {
|
||||||
if (error.response) {
|
if (error.response) {
|
||||||
this.server.doLog(error.response.data);
|
this.server.doLog(error.response.data.toString());
|
||||||
} else if (error.request) {
|
} else if (error.request) {
|
||||||
this.server.doLog(error.request);
|
this.server.doLog(error.request.toString());
|
||||||
} else {
|
} else {
|
||||||
this.server.doLog(`Error: ${error.message}`);
|
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) => {
|
}).catch((error) => {
|
||||||
if (error.response) {
|
if (error.response) {
|
||||||
this.server.doLog(error.response.data);
|
this.server.doLog(error.response.data.toString());
|
||||||
} else if (error.request) {
|
} else if (error.request) {
|
||||||
this.server.doLog(error.request);
|
this.server.doLog(error.request.toString());
|
||||||
} else {
|
} else {
|
||||||
this.server.doLog(`Error: ${error.message}`);
|
this.server.doLog(`Error: ${error.message}`);
|
||||||
this.server.doLog(error.config);
|
this.server.doLog(error.config.toString());
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Reference in a new issue