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

Changes from 1 commit
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
5 changes: 3 additions & 2 deletions src/ps/handlers/interface.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,12 @@ 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(p => p.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);
}
if (game.spectators.includes(user)) {
if (game.spectators.includes(user) || (player && player.out)) {
Copy link
Owner

@PartMan7 PartMan7 Jul 1, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh oops

Issue here is that a player who's out won't be in spectators either. We might need to do something like:

  • Players are only sent HTML if player.out is not true
  • Players that should keep spectating even upon being out (eg: Chain Reaction) should be moved to game.spectators instead (and stuff like rejoin will have to be rechecked once to make sure player.out === true && spectators.includes(player) conditions are handled

Copy link
Owner

@PartMan7 PartMan7 Jul 1, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should be able to remove the line here now

Also need to disable auto-updates for players that are out

Copy link
Collaborator Author

@Audiino Audiino Jul 2, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Removed the line but not sure what you mean by the auto-updates? Since they become spectators shouldn't they also keep getting updates sent to them

Copy link
Owner

@PartMan7 PartMan7 Jul 3, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

image
(The second case is handled correctly but not the first, so if anything happens that tries to fire a rejoin, they'll be rendered as a full player)

game.spectators.remove(user);
message.reply(
game.$T('GAME.NO_LONGER_WATCHING', {
Expand Down