diff options
| author | Neil Alexander <neilalexander@users.noreply.github.com> | 2022-01-31 14:36:59 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-31 14:36:59 +0000 |
| commit | d21f3eace0748e0b1385243be50c89d0d55c32d0 (patch) | |
| tree | dbbcb0949b4d8dc2b9211ca64f21791f6bed4943 /roomserver/internal/perform | |
| parent | 567fd0442868862c5499a64b8b100623d28fe4f6 (diff) | |
Roomserver fixes (#2133)
* Improve server selection somewhat
* Remove things from the map when we're done
* Be less panicky about auth event signatures in case they are not fatal after all
* Accept HasState in all cases
* Send join asynchronously
* Revert "Send join asynchronously"
This reverts commit 5b685bfcd0b1150a66c7b1e70fb3a3eda509efd1.
* Joins and leaves use background context
Diffstat (limited to 'roomserver/internal/perform')
| -rw-r--r-- | roomserver/internal/perform/perform_join.go | 2 | ||||
| -rw-r--r-- | roomserver/internal/perform/perform_leave.go | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/roomserver/internal/perform/perform_join.go b/roomserver/internal/perform/perform_join.go index 2b0bccda..dfa21bcb 100644 --- a/roomserver/internal/perform/perform_join.go +++ b/roomserver/internal/perform/perform_join.go @@ -51,7 +51,7 @@ func (r *Joiner) PerformJoin( req *rsAPI.PerformJoinRequest, res *rsAPI.PerformJoinResponse, ) { - roomID, joinedVia, err := r.performJoin(ctx, req) + roomID, joinedVia, err := r.performJoin(context.Background(), req) if err != nil { logrus.WithContext(ctx).WithFields(logrus.Fields{ "room_id": req.RoomIDOrAlias, diff --git a/roomserver/internal/perform/perform_leave.go b/roomserver/internal/perform/perform_leave.go index b1991649..3c46e657 100644 --- a/roomserver/internal/perform/perform_leave.go +++ b/roomserver/internal/perform/perform_leave.go @@ -52,7 +52,7 @@ func (r *Leaver) PerformLeave( return nil, fmt.Errorf("user %q does not belong to this homeserver", req.UserID) } if strings.HasPrefix(req.RoomID, "!") { - output, err := r.performLeaveRoomByID(ctx, req, res) + output, err := r.performLeaveRoomByID(context.Background(), req, res) if err != nil { logrus.WithContext(ctx).WithFields(logrus.Fields{ "room_id": req.RoomID, |