Skip to content

games: Stop sending pages to players who forfeited #70

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
PartMan7 merged 4 commits into from
Jul 7, 2025
Merged

games: Stop sending pages to players who forfeited #70

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d85c6e2
interface: Stop sending game pages to players who forfeited
Audiino Jul 1, 2025
bb68582
games: Removed players get added to spectator list
Audiino Jul 1, 2025
62fa7e3
remove the line
Audiino Jul 2, 2025
9b6743e
games: Update doesn't send removed players the full render anymore
Audiino Jul 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/ps/games/game.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,6 +294,7 @@ export class BaseGame<State extends BaseState> {
const forfeitPlayer = this.onForfeitPlayer?.(player, ctx);
if (forfeitPlayer?.success === false) return forfeitPlayer;
player.out = true;
this.spectators.push(player.id);
this.log.push({ action: staffAction ? 'dq' : 'forfeit', turn: player.turn, time: new Date(), ctx: null });
return {
success: true,
Expand Down Expand Up @@ -409,7 +410,7 @@ export class BaseGame<State extends BaseState> {
if (!this.started) return;
if (user) {
const asPlayer = Object.values(this.players).find(player => player.id === user);
if (asPlayer) return this.sendHTML(asPlayer.id, this.render(asPlayer.turn));
if (asPlayer && !asPlayer.out) return this.sendHTML(asPlayer.id, this.render(asPlayer.turn));
if (this.spectators.includes(user)) return this.sendHTML(user, this.render(null));
this.throw('GAME.NON_PLAYER_OR_SPEC');
}
Expand Down
3 changes: 2 additions & 1 deletion src/ps/handlers/interface.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,8 @@ export function interfaceHandler(message: PSMessage) {
if (!game) return; // Don't put any errors here! People should be able to close games that don't exist, like ones that ended

const user = message.author.id;
if (game.hasPlayer(user)) {
const player = Object.values(game.players).find(player => player.id === user);
if (game.hasPlayer(user) && player && !player.out) {
message.reply(game.$T('GAME.CANNOT_LEAVE', { prefix, game: game.meta.id }));
return game.update(user);
}
Expand Down