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

Fix return error on m.room.tombstone handling in client API

Browse source
This commit is contained in:
Neil Alexander 2022-04-04 17:21:30 +01:00
parent 5d62b8f2cd
commit 38ed60c8db
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
clientapi/routing/sendevent.go
View file

@ -278,8 +278,10 @@ func generateSendEvent(
content := make(map[string]interface{}) content := make(map[string]interface{})
if err = json.Unmarshal(e.Content(), &content); err != nil { if err = json.Unmarshal(e.Content(), &content); err != nil {
util.GetLogger(ctx).WithError(err).Error("Cannot unmarshal the event content.") util.GetLogger(ctx).WithError(err).Error("Cannot unmarshal the event content.")
resErr := jsonerror.InternalServerError() return nil, &util.JSONResponse{
return nil, &resErr Code: http.StatusBadRequest,
JSON: jsonerror.BadJSON("Cannot unmarshal the event content."),
}
} }
if content["replacement_room"] == e.RoomID() { if content["replacement_room"] == e.RoomID() {
return nil, &util.JSONResponse{ return nil, &util.JSONResponse{