This commit is contained in:
Brendan Abolivier 2017-09-21 19:22:19 +02:00
parent 0dccc03cd0
commit dbd52ef982
No known key found for this signature in database
GPG key ID: 8EF1500759F70623
2 changed files with 15 additions and 3 deletions

View file

@ -162,6 +162,9 @@ func (d *SyncServerDatabase) GetStateEvent(
return d.roomstate.selectStateEvent(ctx, evType, roomID, stateKey) return d.roomstate.selectStateEvent(ctx, evType, roomID, stateKey)
} }
// GetStateEventsForRoom fetches the state events for a given room.
// Returns an empty slice if no state events could be found for this room.
// Returns an error if there was an issue with the retrieval.
func (d *SyncServerDatabase) GetStateEventsForRoom( func (d *SyncServerDatabase) GetStateEventsForRoom(
ctx context.Context, roomID string, ctx context.Context, roomID string,
) (stateEvents []gomatrixserverlib.Event, err error) { ) (stateEvents []gomatrixserverlib.Event, err error) {

View file

@ -107,22 +107,31 @@ func (rp *RequestPool) OnIncomingSyncRequest(req *http.Request, device *authtype
} }
} }
type stateEventInResp struct { type stateEventInStateResp struct {
gomatrixserverlib.ClientEvent gomatrixserverlib.ClientEvent
PrevContent json.RawMessage `json:"prev_content,omitempty"` PrevContent json.RawMessage `json:"prev_content,omitempty"`
ReplacesState string `json:"replaces_state,omitempty"` ReplacesState string `json:"replaces_state,omitempty"`
} }
// OnIncomingStateRequest is called when a client makes a /rooms/{roomID}/state
// request. It will fetch all the state events from the specified room and will
// append the necessary keys to them if applicable before returning them.
// Returns an error if something went wrong in the process.
// TODO: Check if the user is in the room. If not, check if the room's history
// is publicly visible. Current behaviour is returning an empty array if the
// user cannot see the room's history.
func (rp *RequestPool) OnIncomingStateRequest(req *http.Request, roomID string) util.JSONResponse { func (rp *RequestPool) OnIncomingStateRequest(req *http.Request, roomID string) util.JSONResponse {
stateEvents, err := rp.db.GetStateEventsForRoom(req.Context(), roomID) stateEvents, err := rp.db.GetStateEventsForRoom(req.Context(), roomID)
if err != nil { if err != nil {
return httputil.LogThenError(req, err) return httputil.LogThenError(req, err)
} }
resp := []stateEventInResp{} resp := []stateEventInStateResp{}
// Fill the prev_content and replaces_state keys if necessary // Fill the prev_content and replaces_state keys if necessary
for _, event := range stateEvents { for _, event := range stateEvents {
stateEvent := stateEventInResp{ClientEvent: gomatrixserverlib.ToClientEvent(event, gomatrixserverlib.FormatAll)} stateEvent := stateEventInStateResp{
ClientEvent: gomatrixserverlib.ToClientEvent(event, gomatrixserverlib.FormatAll)
}
var prevEventRef types.PrevEventRef var prevEventRef types.PrevEventRef
fmt.Println(len(event.Unsigned())) fmt.Println(len(event.Unsigned()))
if len(event.Unsigned()) > 0 { if len(event.Unsigned()) > 0 {