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

Fix error passing

Browse source
This commit is contained in:
Neil Alexander 2020-08-14 16:55:54 +01:00
parent 51c642b8ad
commit 372ff70906
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
roomserver/api/perform.go
View file

@ -105,7 +105,7 @@ type PerformInviteRequest struct {
} }
type PerformInviteResponse struct { type PerformInviteResponse struct {
Error *PerformError `json:"error"` Error *PerformError
} }
// PerformBackfillRequest is a request to PerformBackfill. // PerformBackfillRequest is a request to PerformBackfill.

6
roomserver/api/wrapper.go
View file

@ -112,11 +112,11 @@ func SendInvite(
} }
response := &PerformInviteResponse{} response := &PerformInviteResponse{}
if err := rsAPI.PerformInvite(ctx, request, response); err != nil { if err := rsAPI.PerformInvite(ctx, request, response); err != nil {
if response.Error != nil {
return response.Error
}
return fmt.Errorf("rsAPI.PerformInvite: %w", err) return fmt.Errorf("rsAPI.PerformInvite: %w", err)
} }
if response.Error != nil {
return response.Error
}
// Now send the invite event into the roomserver. If the room is known // Now send the invite event into the roomserver. If the room is known
// locally then this will succeed, notifying existing users in the room // locally then this will succeed, notifying existing users in the room