Skip to content

Fix panic caused by setting publishing on nonexistent participants. #5

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

Open
Lwrless wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix panic caused by setting publishing on nonexistent participants. #5

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
16 changes: 11 additions & 5 deletions main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,17 +71,17 @@ func (v *Room) Add(p *Participant) error {
return nil
}

func (v *Room) Get(display string) *Participant {
func (v *Room) Get(display string) (*Participant, error) {
v.lock.RLock()
defer v.lock.RUnlock()

for _, r := range v.Participants {
if r.Display == display {
return r
return r, nil
}
}

return nil
return nil, errors.Errorf("Participant %v does not exist in room %v", display, v.Name)
}

func (v *Room) Remove(p *Participant) {
Expand Down Expand Up @@ -279,7 +279,10 @@ func main() {
}

r, _ := rooms.LoadOrStore(obj.Message.Room, &Room{Name: obj.Message.Room})
p := r.(*Room).Get(obj.Message.Display)
p, err := r.(*Room).Get(obj.Message.Display)
if err != nil {
return errors.Wrapf(err, "publish")
}

// Now, the peer is publishing.
p.Publishing = true
Expand All @@ -299,7 +302,10 @@ func main() {
}

r, _ := rooms.LoadOrStore(obj.Message.Room, &Room{Name: obj.Message.Room})
p := r.(*Room).Get(obj.Message.Display)
p, err := r.(*Room).Get(obj.Message.Display)
if err != nil {
return errors.Wrapf(err, "control")
}

go r.(*Room).Notify(ctx, p, action.Message.Action, obj.Message.Call, obj.Message.Data)
} else {
Expand Down