From 9827eedb029e0fb988de488bab9e75539ff5ad73 Mon Sep 17 00:00:00 2001 From: Neil Alexander Date: Fri, 24 Apr 2020 15:13:08 +0100 Subject: [PATCH] Review comments --- roomserver/input/events.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/roomserver/input/events.go b/roomserver/input/events.go index 2529b7bfc..205035d98 100644 --- a/roomserver/input/events.go +++ b/roomserver/input/events.go @@ -18,7 +18,6 @@ package input import ( "context" - "errors" "fmt" "github.com/matrix-org/dendrite/common" @@ -206,7 +205,8 @@ func processInviteEvent( } } else { // There's no invite room state, so let's have a go at building it - // up from local data. If we know about the room then we can insert + // up from local data (which is most likely to be if the event came + // from the CS API). If we know about the room then we can insert // the invite room state, if we don't then we just fail quietly. if irs, ierr := buildInviteStrippedState(ctx, db, input); ierr == nil { if err = event.SetUnsignedField("invite_room_state", irs); err != nil { @@ -235,7 +235,7 @@ func buildInviteStrippedState( ) ([]gomatrixserverlib.InviteV2StrippedState, error) { roomNID, err := db.RoomNID(ctx, input.Event.RoomID()) if err != nil || roomNID == 0 { - return nil, errors.New("room unknown") + return nil, fmt.Errorf("room %q unknown", input.Event.RoomID()) } stateWanted := []gomatrixserverlib.StateKeyTuple{} for _, t := range []string{