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

Allow invited in addition to joined to enable child walking

Browse source
This commit is contained in:
Kegan Dougal 2022-03-08 11:59:52 +00:00
parent 132ca1ae8d
commit 47ebc10a92
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
setup/mscs/msc2946/msc2946.go
View file

@ -299,7 +299,7 @@ func (w *walker) walk() util.JSONResponse {
// as these children may be rooms we do know about. // as these children may be rooms we do know about.
roomType = ConstCreateEventContentValueSpace roomType = ConstCreateEventContentValueSpace
} }
} else if authorised, isJoined := w.authorised(rv.roomID, rv.parentRoomID); authorised { } else if authorised, isJoinedOrInvited := w.authorised(rv.roomID, rv.parentRoomID); authorised {
// Get all `m.space.child` state events for this room // Get all `m.space.child` state events for this room
events, err := w.childReferences(rv.roomID) events, err := w.childReferences(rv.roomID)
if err != nil { if err != nil {
@ -315,8 +315,8 @@ func (w *walker) walk() util.JSONResponse {
RoomType: roomType, RoomType: roomType,
ChildrenState: events, ChildrenState: events,
}) })
// don't walk children if the user is not joined to the space // don't walk children if the user is not joined/invited to the space
if !isJoined { if !isJoinedOrInvited {
continue continue
} }
} else { } else {
@ -476,7 +476,7 @@ func (w *walker) roomExists(roomID string) bool {
} }
// authorised returns true iff the user is joined this room or the room is world_readable // authorised returns true iff the user is joined this room or the room is world_readable
func (w *walker) authorised(roomID, parentRoomID string) (authed, isJoined bool) { func (w *walker) authorised(roomID, parentRoomID string) (authed, isJoinedOrInvited bool) {
if w.caller != nil { if w.caller != nil {
return w.authorisedUser(roomID, parentRoomID) return w.authorisedUser(roomID, parentRoomID)
} }
@ -543,7 +543,7 @@ func (w *walker) authorisedServer(roomID string) bool {
// authorisedUser returns true iff the user is invited/joined this room or the room is world_readable. // authorisedUser returns true iff the user is invited/joined this room or the room is world_readable.
// Failing that, if the room has a restricted join rule and belongs to the space parent listed, it will return true. // Failing that, if the room has a restricted join rule and belongs to the space parent listed, it will return true.
func (w *walker) authorisedUser(roomID, parentRoomID string) (authed bool, isJoined bool) { func (w *walker) authorisedUser(roomID, parentRoomID string) (authed bool, isJoinedOrInvited bool) {
hisVisTuple := gomatrixserverlib.StateKeyTuple{ hisVisTuple := gomatrixserverlib.StateKeyTuple{
EventType: gomatrixserverlib.MRoomHistoryVisibility, EventType: gomatrixserverlib.MRoomHistoryVisibility,
StateKey: "", StateKey: "",
@ -571,7 +571,7 @@ func (w *walker) authorisedUser(roomID, parentRoomID string) (authed bool, isJoi
if memberEv != nil { if memberEv != nil {
membership, _ := memberEv.Membership() membership, _ := memberEv.Membership()
if membership == gomatrixserverlib.Join || membership == gomatrixserverlib.Invite { if membership == gomatrixserverlib.Join || membership == gomatrixserverlib.Invite {
return true, membership == gomatrixserverlib.Join return true, true
} }
} }
hisVisEv := queryRes.StateEvents[hisVisTuple] hisVisEv := queryRes.StateEvents[hisVisTuple]