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

Return affected user IDs

Browse source
This commit is contained in:
Neil Alexander 2022-04-28 13:17:25 +01:00
parent 3afb0a34dc
commit 26265ff906
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944
3 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
clientapi/routing/routing.go
View file

@ -152,6 +152,9 @@ func Setup(
} }
return util.JSONResponse{ return util.JSONResponse{
Code: 200, Code: 200,
JSON: map[string]interface{}{
"affected": res.Affected,
},
} }
}), }),
).Methods(http.MethodGet, http.MethodOptions) ).Methods(http.MethodGet, http.MethodOptions)

1
roomserver/api/perform.go
View file

@ -220,5 +220,6 @@ type PerformAdminEvacuateRoomRequest struct {
} }
type PerformAdminEvacuateRoomResponse struct { type PerformAdminEvacuateRoomResponse struct {
Affected []string `json:"affected"`
Error *PerformError Error *PerformError
} }

2
roomserver/internal/perform/perform_admin.go
View file

@ -77,6 +77,7 @@ func (r *Admin) PerformAdminEvacuateRoom(
} }
inputEvents := make([]api.InputRoomEvent, 0, len(memberEvents)) inputEvents := make([]api.InputRoomEvent, 0, len(memberEvents))
res.Affected = make([]string, 0, len(memberEvents))
latestReq := &api.QueryLatestEventsAndStateRequest{ latestReq := &api.QueryLatestEventsAndStateRequest{
RoomID: req.RoomID, RoomID: req.RoomID,
} }
@ -144,6 +145,7 @@ func (r *Admin) PerformAdminEvacuateRoom(
Origin: r.Cfg.Matrix.ServerName, Origin: r.Cfg.Matrix.ServerName,
SendAsServer: string(r.Cfg.Matrix.ServerName), SendAsServer: string(r.Cfg.Matrix.ServerName),
}) })
res.Affected = append(res.Affected, stateKey)
} }
inputReq := &api.InputRoomEventsRequest{ inputReq := &api.InputRoomEventsRequest{