Skip to content

Prevent rooms with one person in them #100

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
rcy merged 1 commit into from
Aug 2, 2025
Merged

Prevent rooms with one person in them #100

Show file tree
Hide file tree
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
3 changes: 3 additions & 0 deletions migrations/007_add_unique_constraint_room_users.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
alter table room_users add constraint unique_room_user unique (room_id, user_id);
---- create above / drop below ----
alter table room_users drop constraint unique_room_user;
13 changes: 10 additions & 3 deletions services/room/room.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,10 @@ import (
)

func FindOrCreateByUserIDs(ctx context.Context, conn *pgxpool.Pool, model *api.Queries, id1, id2 int64) (*api.Room, error) {
key := makeRoomKey(id1, id2)
key, err := makeRoomKey(id1, id2)
if err != nil {
return nil, fmt.Errorf("makeRoomKey: %w", err)
}

room, err := model.RoomByKey(ctx, key)
if err != nil {
Expand Down Expand Up @@ -56,9 +59,13 @@ func build(ctx context.Context, conn *pgxpool.Pool, model *api.Queries, key stri
}

// Generate a string to be used as a roomKey given 2 user IDs
func makeRoomKey(id1, id2 int64) string {
func makeRoomKey(id1, id2 int64) (string, error) {
if id1 == id2 {
return "", fmt.Errorf("id1 cannot equal id2")
}

min := int64(math.Min(float64(id1), float64(id2)))
max := int64(math.Max(float64(id1), float64(id2)))

return fmt.Sprintf("dm-%d-%d", min, max)
return fmt.Sprintf("dm-%d-%d", min, max), nil
}
Loading