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

fix 2 bugs

Browse source 
- CSAPI used wrong function to create pagination cache (which caused nil map errs)
- Copied an array wrong in room hierarchy impl, which caused a nil room list to return
This commit is contained in:
Sam Wedgwood 2023-07-17 13:17:57 +01:00
parent 14f8b30291
commit 19d420e3b2
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
clientapi/routing/routing.go
View file

@ -509,14 +509,14 @@ func Setup(
// Defined outside of handler to persist between calls // Defined outside of handler to persist between calls
// TODO: clear based on some criteria // TODO: clear based on some criteria
roomHierarchyPaginationCache := new(RoomHierarchyPaginationCache) roomHierarchyPaginationCache := NewRoomHierarchyPaginationCache()
v1mux.Handle("/rooms/{roomID}/hierarchy", v1mux.Handle("/rooms/{roomID}/hierarchy",
httputil.MakeAuthAPI("spaces", userAPI, func(req *http.Request, device *userapi.Device) util.JSONResponse { httputil.MakeAuthAPI("spaces", userAPI, func(req *http.Request, device *userapi.Device) util.JSONResponse {
vars, err := httputil.URLDecodeMapValues(mux.Vars(req)) vars, err := httputil.URLDecodeMapValues(mux.Vars(req))
if err != nil { if err != nil {
return util.ErrorResponse(err) return util.ErrorResponse(err)
} }
return QueryRoomHierarchy(req, device, vars["roomID"], rsAPI, roomHierarchyPaginationCache) return QueryRoomHierarchy(req, device, vars["roomID"], rsAPI, &roomHierarchyPaginationCache)
}, httputil.WithAllowGuests()), }, httputil.WithAllowGuests()),
).Methods(http.MethodGet, http.MethodOptions) ).Methods(http.MethodGet, http.MethodOptions)

6
roomserver/internal/query/query_room_hierarchy.go
View file

@ -43,10 +43,10 @@ func (querier *Queryer) QueryNextRoomHierarchyPage(ctx context.Context, walker r
return nil, nil, roomserver.ErrRoomUnknownOrNotAllowed{Err: fmt.Errorf("room is unknown/forbidden")} return nil, nil, roomserver.ErrRoomUnknownOrNotAllowed{Err: fmt.Errorf("room is unknown/forbidden")}
} }
var discoveredRooms []fclient.MSC2946Room discoveredRooms := []fclient.MSC2946Room{}
// Copy unvisited and processed to avoid modifying walker // Copy unvisited and processed to avoid modifying original walker (which is typically in cache)
unvisited := []roomserver.RoomHierarchyWalkerQueuedRoom{} unvisited := make([]roomserver.RoomHierarchyWalkerQueuedRoom, len(walker.Unvisited))
copy(unvisited, walker.Unvisited) copy(unvisited, walker.Unvisited)
processed := walker.Processed.Copy() processed := walker.Processed.Copy()