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

Review comments

Browse source
This commit is contained in:
Neil Alexander 2020-04-24 15:13:08 +01:00
parent 35845e4ea3
commit 9827eedb02
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
roomserver/input/events.go
View file

@ -18,7 +18,6 @@ package input
import ( import (
"context" "context"
"errors"
"fmt" "fmt"
"github.com/matrix-org/dendrite/common" "github.com/matrix-org/dendrite/common"
@ -206,7 +205,8 @@ func processInviteEvent(
} }
} else { } else {
// There's no invite room state, so let's have a go at building it // 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. // the invite room state, if we don't then we just fail quietly.
if irs, ierr := buildInviteStrippedState(ctx, db, input); ierr == nil { if irs, ierr := buildInviteStrippedState(ctx, db, input); ierr == nil {
if err = event.SetUnsignedField("invite_room_state", irs); err != nil { if err = event.SetUnsignedField("invite_room_state", irs); err != nil {
@ -235,7 +235,7 @@ func buildInviteStrippedState(
) ([]gomatrixserverlib.InviteV2StrippedState, error) { ) ([]gomatrixserverlib.InviteV2StrippedState, error) {
roomNID, err := db.RoomNID(ctx, input.Event.RoomID()) roomNID, err := db.RoomNID(ctx, input.Event.RoomID())
if err != nil || roomNID == 0 { if err != nil || roomNID == 0 {
return nil, errors.New("room unknown") return nil, fmt.Errorf("room %q unknown", input.Event.RoomID())
} }
stateWanted := []gomatrixserverlib.StateKeyTuple{} stateWanted := []gomatrixserverlib.StateKeyTuple{}
for _, t := range []string{ for _, t := range []string{