mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2026-01-21 13:03:09 -06:00
Code Issues Packages Projects Releases Wiki Activity

Log error about missing/unable to get m.room.guest_access event

Browse source
This commit is contained in:
Till Faelligen 2022-11-11 10:44:28 +01:00
parent 4b34c1bf0f
commit 88b3e0c158
No known key found for this signature in database
GPG key ID: ACCDC9606D472758
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -16,6 +16,7 @@ package perform
import ( import (
"context" "context"
"database/sql"
"errors" "errors"
"fmt" "fmt"
"strings" "strings"
@ -276,7 +277,10 @@ func (r *Joiner) performJoinRoomByID(
var guestAccessEvent *gomatrixserverlib.HeaderedEvent var guestAccessEvent *gomatrixserverlib.HeaderedEvent
guestAccess := "forbidden" guestAccess := "forbidden"
guestAccessEvent, err = r.DB.GetStateEvent(ctx, req.RoomIDOrAlias, gomatrixserverlib.MRoomGuestAccess, "") guestAccessEvent, err = r.DB.GetStateEvent(ctx, req.RoomIDOrAlias, gomatrixserverlib.MRoomGuestAccess, "")
if err == nil && guestAccessEvent != nil { if (err != nil && !errors.Is(err, sql.ErrNoRows)) || guestAccessEvent == nil {
logrus.WithError(err).Warn("unable to get m.room.guest_access event, defaulting to 'forbidden'")
}
if guestAccessEvent != nil {
guestAccess = gjson.GetBytes(guestAccessEvent.Content(), "guest_access").String() guestAccess = gjson.GetBytes(guestAccessEvent.Content(), "guest_access").String()
} }