Leahnaya/pokemon-showdown
1
0
Fork 0
mirror of https://github.com/smogon/pokemon-showdown.git synced 2026-03-21 17:25:10 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Suspects: Fix loginserver error handling

Browse Source
This commit is contained in:
Mia 2024-10-24 08:49:28 -05:00
parent 8f91863968
commit 5bec49f7a0
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
server/chat-plugins/suspect-tests.ts
View File

@ -100,12 +100,14 @@ export const commands: Chat.ChatCommands = {
reqData[k] = val;
}
const [, error] = await LoginServer.request("suspects/add", {
const [out, error] = await LoginServer.request("suspects/add", {
format: format.id,
reqs: JSON.stringify(reqData),
url: urlActual,
});
if (error) throw new Chat.ErrorMessage("Error adding suspect test: " + error.message);
if (out?.actionerror || error) {
throw new Chat.ErrorMessage("Error adding suspect test: " + (out?.actionerror || error.message));
}
this.privateGlobalModAction(`${user.name} ${suspectTests.suspects[format.id] ? "edited the" : "added a"} ${format.name} suspect test.`);
this.globalModlog('SUSPECTTEST', null, `${suspectTests.suspects[format.id] ? "edited" : "added"} ${format.name}`);
@ -130,10 +132,12 @@ export const commands: Chat.ChatCommands = {
const test = suspectTests.suspects[format];
if (!test) return this.errorReply(`There is no suspect test for '${target}'. Check spelling?`);
const [, error] = await LoginServer.request('suspects/end', {
const [out, error] = await LoginServer.request('suspects/end', {
format,
});
if (error) throw new Chat.ErrorMessage(`Error ending suspect: ${error.message}`);
if (out?.actionerror || error) {
throw new Chat.ErrorMessage(`Error ending suspect: ${out?.actionerror || error?.message}`);
}
this.privateGlobalModAction(`${user.name} removed the ${test.tier} suspect test.`);
this.globalModlog('SUSPECTTEST', null, `removed ${test.tier}`);