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

Refactor getTriviaGame for Chat.ErrorMessage

Browse Source
This commit is contained in:
Guangcong Luo 2020-07-02 20:10:15 -07:00
parent 7d0209f8b9
commit 4ea11ca50d
1 changed files with 20 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
server/chat-plugins/trivia.ts
View File

@ -130,17 +130,16 @@ function isTriviaRoom(room: Room) {
return false;
}
function getTriviaGame(context: CommandContext) {
const room = context.room;
if (!room) return false;
function getTriviaGame(room: Room | null) {
if (!room) {
throw new Chat.ErrorMessage(`This command can only be used in the Trivia room.`);
}
const game = room.game;
if (!game) {
context.errorReply(`There is no game in progress.`);
return false;
throw new Chat.ErrorMessage(`There is no game in progress.`);
}
if (!game.constructor.name.endsWith('Trivia')) {
context.errorReply(`The currently running game is not Trivia, it's ${game.title}.`);
return false;
throw new Chat.ErrorMessage(`The currently running game is not Trivia, it's ${game.title}.`);
}
return game as Trivia;
}
@ -1131,9 +1130,8 @@ const commands: ChatCommands = {
join(target, room, user) {
if (!room) return this.requiresRoom();
if (!isTriviaRoom(room)) return this.errorReply("This command can only be used in Trivia.");
const game = getTriviaGame(this);
if (!game) return;
const game = getTriviaGame(room);
const res = game.addTriviaPlayer(user);
if (res) return this.errorReply(res);
this.sendReply('You are now signed up for this game!');
@ -1142,11 +1140,9 @@ const commands: ChatCommands = {
kick(target, room, user) {
if (!room) return this.requiresRoom();
if (!isTriviaRoom(room)) return this.errorReply("This command can only be used in Trivia.");
if (!this.can('mute', null, room)) return false;
if (!this.canTalk()) return;
const game = getTriviaGame(this);
if (!game) return;
const game = getTriviaGame(room);
if (!this.can('mute', null, room)) return false;
this.splitTarget(target);
const targetUser = this.targetUser;
@ -1158,23 +1154,20 @@ const commands: ChatCommands = {
kickhelp: [`/trivia kick [username] - Kick players from a trivia game by username. Requires: % @ # &`],
leave(target, room, user) {
if (!room) return this.requiresRoom();
if (!isTriviaRoom(room)) return this.errorReply("This command can only be used in Trivia.");
const game = getTriviaGame(this);
if (!game) return;
const game = getTriviaGame(room);
const res = game.leave(user);
if (res) return this.errorReply(res);
this.sendReply("You have left the current game of trivia.");
this.sendReply("You have left the current game of Trivia.");
},
leavehelp: [`/trivia leave - Makes the player leave the game.`],
start(target, room) {
if (!room) return this.requiresRoom();
if (!isTriviaRoom(room)) return this.errorReply("This command can only be used in Trivia.");
if (!this.can('show', null, room)) return false;
if (!this.canTalk()) return;
const game = getTriviaGame(this);
if (!game) return;
const game = getTriviaGame(room);
const res = game.start();
if (res) return this.errorReply(res);
// ...
@ -1183,9 +1176,7 @@ const commands: ChatCommands = {
answer(target, room, user) {
if (!room) return this.requiresRoom();
if (!isTriviaRoom(room)) return this.errorReply("This command can only be used in Trivia.");
const game = getTriviaGame(this);
if (!game) return;
const game = getTriviaGame(room);
const answer = toID(target);
if (!answer) return this.errorReply("No valid answer was entered.");
@ -1202,11 +1193,10 @@ const commands: ChatCommands = {
end(target, room, user) {
if (!room) return this.requiresRoom();
if (!isTriviaRoom(room)) return this.errorReply("This command can only be used in Trivia.");
if (!this.can('show', null, room)) return false;
if (!this.canTalk()) return;
const game = getTriviaGame(this);
if (!game) return;
const game = getTriviaGame(room);
game.end(user);
},
endhelp: [`/trivia end - Forcibly end a trivia game. Requires: + % @ # &`],
@ -1215,10 +1205,9 @@ const commands: ChatCommands = {
players: 'status',
status(target, room, user) {
if (!room) return this.requiresRoom();
if (!isTriviaRoom(room)) return this.errorReply("This command can only be used in Trivia.");
if (!this.runBroadcast()) return false;
const game = getTriviaGame(this);
if (!game) return;
const game = getTriviaGame(room);
let tarUser;
if (target) {
this.splitTarget(target);