From adcab9b0231ca2ff42f824d36ef0d483e2674595 Mon Sep 17 00:00:00 2001 From: Neil Alexander Date: Fri, 4 Dec 2020 09:32:00 +0000 Subject: [PATCH] Update to NewEventFromTrustedJSONWithEventID --- go.mod | 4 +++- go.sum | 2 -- roomserver/storage/shared/storage.go | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index 4ac5acc7f..0a14d170a 100644 --- a/go.mod +++ b/go.mod @@ -1,5 +1,7 @@ module github.com/matrix-org/dendrite +replace github.com/matrix-org/gomatrixserverlib => /Users/neilalexander/Desktop/gomatrixserverlib + require ( github.com/DATA-DOG/go-sqlmock v1.5.0 github.com/Shopify/sarama v1.27.0 @@ -22,7 +24,7 @@ require ( github.com/matrix-org/go-http-js-libp2p v0.0.0-20200518170932-783164aeeda4 github.com/matrix-org/go-sqlite3-js v0.0.0-20200522092705-bc8506ccbcf3 github.com/matrix-org/gomatrix v0.0.0-20200827122206-7dd5e2a05bcd - github.com/matrix-org/gomatrixserverlib v0.0.0-20201203164156-f0ccbd5031a0 + github.com/matrix-org/gomatrixserverlib v0.0.0-20201204093034-fc2d35b5ad1b github.com/matrix-org/naffka v0.0.0-20200901083833-bcdd62999a91 github.com/matrix-org/util v0.0.0-20200807132607-55161520e1d4 github.com/mattn/go-sqlite3 v1.14.2 diff --git a/go.sum b/go.sum index c945db900..547361e1c 100644 --- a/go.sum +++ b/go.sum @@ -569,8 +569,6 @@ github.com/matrix-org/gomatrix v0.0.0-20190528120928-7df988a63f26 h1:Hr3zjRsq2bh github.com/matrix-org/gomatrix v0.0.0-20190528120928-7df988a63f26/go.mod h1:3fxX6gUjWyI/2Bt7J1OLhpCzOfO/bB3AiX0cJtEKud0= github.com/matrix-org/gomatrix v0.0.0-20200827122206-7dd5e2a05bcd h1:xVrqJK3xHREMNjwjljkAUaadalWc0rRbmVuQatzmgwg= github.com/matrix-org/gomatrix v0.0.0-20200827122206-7dd5e2a05bcd/go.mod h1:/gBX06Kw0exX1HrwmoBibFA98yBk/jxKpGVeyQbff+s= -github.com/matrix-org/gomatrixserverlib v0.0.0-20201203164156-f0ccbd5031a0 h1:e1phnLcAC30656IwWK/92bmqnm4e8oyhS+qh0rhzCa8= -github.com/matrix-org/gomatrixserverlib v0.0.0-20201203164156-f0ccbd5031a0/go.mod h1:JsAzE1Ll3+gDWS9JSUHPJiiyAksvOOnGWF2nXdg4ZzU= github.com/matrix-org/naffka v0.0.0-20200901083833-bcdd62999a91 h1:HJ6U3S3ljJqNffYMcIeAncp5qT/i+ZMiJ2JC2F0aXP4= github.com/matrix-org/naffka v0.0.0-20200901083833-bcdd62999a91/go.mod h1:sjyPyRxKM5uw1nD2cJ6O2OxI6GOqyVBfNXqKjBZTBZE= github.com/matrix-org/util v0.0.0-20190711121626-527ce5ddefc7 h1:ntrLa/8xVzeSs8vHFHK25k0C+NV74sYMJnNSg5NoSRo= diff --git a/roomserver/storage/shared/storage.go b/roomserver/storage/shared/storage.go index 11d163a18..3da8e5e45 100644 --- a/roomserver/storage/shared/storage.go +++ b/roomserver/storage/shared/storage.go @@ -332,7 +332,7 @@ func (d *Database) Events( return nil, err } } - result.Event, err = gomatrixserverlib.NewEventFromStoredJSON( + result.Event, err = gomatrixserverlib.NewEventFromTrustedJSONWithEventID( eventID, eventJSON.EventJSON, false, roomVersion, ) if err != nil { @@ -818,7 +818,7 @@ func (d *Database) GetStateEvent(ctx context.Context, roomID, evType, stateKey s if id, ierr := d.EventsTable.SelectEventID(ctx, nil, e.EventNID); ierr == nil { eventID = id } - ev, err := gomatrixserverlib.NewEventFromStoredJSON(eventID, data[0].EventJSON, false, roomInfo.RoomVersion) + ev, err := gomatrixserverlib.NewEventFromTrustedJSONWithEventID(eventID, data[0].EventJSON, false, roomInfo.RoomVersion) if err != nil { return nil, err } @@ -941,7 +941,7 @@ func (d *Database) GetBulkStateContent(ctx context.Context, roomIDs []string, tu if id, err := d.EventsTable.SelectEventID(ctx, nil, events[i].EventNID); err == nil { eventID = id } - ev, err := gomatrixserverlib.NewEventFromStoredJSON(eventID, events[i].EventJSON, false, roomVer) + ev, err := gomatrixserverlib.NewEventFromTrustedJSONWithEventID(eventID, events[i].EventJSON, false, roomVer) if err != nil { return nil, fmt.Errorf("GetBulkStateContent: failed to load event JSON for event NID %v : %w", events[i].EventNID, err) }