Skip to content

入室しようとした部屋がちょうど終了したときに待ち続けてしまうのを修正 #95

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
makiuchi-d merged 1 commit into from
Apr 29, 2026
+8 −0
Merged

入室しようとした部屋がちょうど終了したときに待ち続けてしまうのを修正 #95

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 8 additions & 0 deletions server/game/repository.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,6 +252,10 @@ func (repo *Repository) joinRoom(ctx context.Context, id string, client *pb.Clie
return nil, WithCode(
xerrors.Errorf("context done: room=%v", room.Id),
codes.DeadlineExceeded)
case <-room.Done():
return nil, NormalWithCode(
xerrors.Errorf("room done: room=%v", room.Id),
codes.NotFound)
case room.msgCh <- msg:
}

Expand All @@ -261,6 +265,10 @@ func (repo *Repository) joinRoom(ctx context.Context, id string, client *pb.Clie
return nil, WithCode(
xerrors.Errorf("context done: room=%v", room.Id),
codes.DeadlineExceeded)
case <-room.Done():
return nil, NormalWithCode(
xerrors.Errorf("room done: room=%v", room.Id),
codes.NotFound)
case ewc := <-errch:
return nil, ewc
case joined = <-jch:
Expand Down
Loading