mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2025-12-07 15:03:09 -06:00
Code Issues Packages Projects Releases Wiki Activity

lint pass

Browse source
This commit is contained in:
Sam Wedgwood 2023-08-01 15:28:29 +01:00
parent 5046ebcdf4
commit 2c9ccd2025
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
roomserver/internal/perform/perform_join.go
View file

@ -201,8 +201,8 @@ func (r *Joiner) performJoinRoomByID(
if err == nil && info != nil { if err == nil && info != nil {
switch info.RoomVersion { switch info.RoomVersion {
case gomatrixserverlib.RoomVersionPseudoIDs: case gomatrixserverlib.RoomVersionPseudoIDs:
senderIDPtr, err := r.Queryer.QuerySenderIDForUser(ctx, *roomID, *userID) senderIDPtr, queryErr := r.Queryer.QuerySenderIDForUser(ctx, *roomID, *userID)
if err == nil { if queryErr == nil {
checkInvitePending = true checkInvitePending = true
} }
if senderIDPtr == nil { if senderIDPtr == nil {

1
roomserver/internal/perform/perform_leave.go
View file

@ -73,6 +73,7 @@ func (r *Leaver) PerformLeave(
return nil, fmt.Errorf("room ID %q is invalid", req.RoomID) return nil, fmt.Errorf("room ID %q is invalid", req.RoomID)
} }
// nolint:gocyclo
func (r *Leaver) performLeaveRoomByID( func (r *Leaver) performLeaveRoomByID(
ctx context.Context, ctx context.Context,
req *api.PerformLeaveRequest, req *api.PerformLeaveRequest,