@@ -244,20 +244,13 @@ func (eb *EventBuilder) Build(
244244 now time.Time , origin spec.ServerName , keyID KeyID ,
245245 privateKey ed25519.PrivateKey , roomVersion RoomVersion ,
246246) (result * Event , err error ) {
247- if ! KnownRoomVersion (roomVersion ) {
248- return nil , UnsupportedRoomVersionError {
249- Version : roomVersion ,
250- }
251- }
252-
253- eventFormat , err := roomVersion .EventFormat ()
254- if err != nil {
255- return result , err
256- }
257- eventIDFormat , err := roomVersion .EventIDFormat ()
247+ verImpl , err := GetRoomVersion (roomVersion )
258248 if err != nil {
259- return result , err
249+ return nil , err
260250 }
251+
252+ eventFormat := verImpl .EventFormat ()
253+ eventIDFormat := verImpl .EventIDFormat ()
261254 var event struct {
262255 EventBuilder
263256 EventID string `json:"event_id"`
@@ -369,37 +362,22 @@ func (eb *EventBuilder) Build(
369362// This checks that the event is valid JSON.
370363// It also checks the content hashes to ensure the event has not been tampered with.
371364// This should be used when receiving new events from remote servers.
372- func newEventFromUntrustedJSON (eventJSON []byte , roomVersion RoomVersion ) (result * Event , err error ) {
373- if ! KnownRoomVersion (roomVersion ) {
374- return nil , UnsupportedRoomVersionError {
375- Version : roomVersion ,
376- }
377- }
378-
365+ func newEventFromUntrustedJSON (eventJSON []byte , roomVersion RoomVersionImpl ) (result * Event , err error ) {
379366 if r := gjson .GetBytes (eventJSON , "_*" ); r .Exists () {
380367 err = fmt .Errorf ("gomatrixserverlib NewEventFromUntrustedJSON: %w" , UnexpectedHeaderedEvent {})
381368 return
382369 }
383-
384- var enforceCanonicalJSON bool
385- if enforceCanonicalJSON , err = roomVersion .EnforceCanonicalJSON (); err != nil {
386- return
387- }
388- if enforceCanonicalJSON {
370+ if roomVersion .EnforceCanonicalJSON () {
389371 if err = verifyEnforcedCanonicalJSON (eventJSON ); err != nil {
390372 err = BadJSONError {err }
391373 return
392374 }
393375 }
394376
395377 result = & Event {}
396- result .roomVersion = roomVersion
378+ result .roomVersion = roomVersion . ver
397379
398- var eventFormat EventFormat
399- eventFormat , err = result .roomVersion .EventFormat ()
400- if err != nil {
401- return
402- }
380+ eventFormat := roomVersion .EventFormat ()
403381
404382 if eventJSON , err = sjson .DeleteBytes (eventJSON , "unsigned" ); err != nil {
405383 return
@@ -457,15 +435,9 @@ func newEventFromUntrustedJSON(eventJSON []byte, roomVersion RoomVersion) (resul
457435// newEventFromTrustedJSON loads a new event from some JSON that must be valid.
458436// This will be more efficient than NewEventFromUntrustedJSON since it can skip cryptographic checks.
459437// This can be used when loading matrix events from a local database.
460- func newEventFromTrustedJSON (eventJSON []byte , redacted bool , roomVersion RoomVersion ) (result * Event , err error ) {
461- if ! KnownRoomVersion (roomVersion ) {
462- return nil , UnsupportedRoomVersionError {
463- Version : roomVersion ,
464- }
465- }
466-
438+ func newEventFromTrustedJSON (eventJSON []byte , redacted bool , roomVersion RoomVersionImpl ) (result * Event , err error ) {
467439 result = & Event {}
468- result .roomVersion = roomVersion
440+ result .roomVersion = roomVersion . ver
469441 result .redacted = redacted
470442 err = result .populateFieldsFromJSON ("" , eventJSON ) // "" -> event ID not known
471443 return
@@ -476,15 +448,9 @@ func newEventFromTrustedJSON(eventJSON []byte, redacted bool, roomVersion RoomVe
476448// an event from the database and NEVER when accepting an event over federation.
477449// This will be more efficient than NewEventFromTrustedJSON since, if the event
478450// ID is known, we skip all the reference hash and canonicalisation work.
479- func newEventFromTrustedJSONWithEventID (eventID string , eventJSON []byte , redacted bool , roomVersion RoomVersion ) (result * Event , err error ) {
480- if ! KnownRoomVersion (roomVersion ) {
481- return nil , UnsupportedRoomVersionError {
482- Version : roomVersion ,
483- }
484- }
485-
451+ func newEventFromTrustedJSONWithEventID (eventID string , eventJSON []byte , redacted bool , roomVersion RoomVersionImpl ) (result * Event , err error ) {
486452 result = & Event {}
487- result .roomVersion = roomVersion
453+ result .roomVersion = roomVersion . ver
488454 result .redacted = redacted
489455 err = result .populateFieldsFromJSON (eventID , eventJSON )
490456 return
@@ -497,9 +463,12 @@ func newEventFromTrustedJSONWithEventID(eventID string, eventJSON []byte, redact
497463// calculations etc as they are expensive operations. If the event
498464// ID isn't known, pass an empty string and we'll work it out.
499465func (e * Event ) populateFieldsFromJSON (eventIDIfKnown string , eventJSON []byte ) error {
466+ verImpl , err := GetRoomVersion (e .roomVersion )
467+ if err != nil {
468+ return err
469+ }
500470 // Work out the format of the event from the room version.
501- var eventFormat EventFormat
502- eventFormat , err := e .roomVersion .EventFormat ()
471+ eventFormat := verImpl .EventFormat ()
503472 if err != nil {
504473 return err
505474 }
@@ -557,7 +526,11 @@ func (e *Event) Redact() {
557526 if e .redacted {
558527 return
559528 }
560- eventJSON , err := e .roomVersion .RedactEventJSON (e .eventJSON )
529+ verImpl , err := GetRoomVersion (e .roomVersion )
530+ if err != nil {
531+ panic (fmt .Errorf ("gomatrixserverlib: invalid event %v" , err ))
532+ }
533+ eventJSON , err := verImpl .RedactEventJSON (e .eventJSON )
561534 if err != nil {
562535 // This is unreachable for events created with EventBuilder.Build or NewEventFromUntrustedJSON
563536 panic (fmt .Errorf ("gomatrixserverlib: invalid event %v" , err ))
@@ -806,11 +779,11 @@ func checkID(id, kind string, sigil byte) (err error) {
806779}
807780
808781func (e * Event ) generateEventID () (eventID string , err error ) {
809- var eventFormat EventFormat
810- eventFormat , err = e .roomVersion .EventFormat ()
782+ verImpl , err := GetRoomVersion (e .roomVersion )
811783 if err != nil {
812- return
784+ return "" , err
813785 }
786+ eventFormat := verImpl .EventFormat ()
814787 switch eventFormat {
815788 case EventFormatV1 :
816789 eventID = e .fields .(eventFormatV1Fields ).EventID
@@ -943,10 +916,11 @@ func (e *Event) PrevEventIDs() []string {
943916}
944917
945918func (e * Event ) extractContent (eventType string , content interface {}) error {
946- eventFormat , err := e .roomVersion . EventFormat ( )
919+ verImpl , err := GetRoomVersion ( e .roomVersion )
947920 if err != nil {
948921 panic (err )
949922 }
923+ eventFormat := verImpl .EventFormat ()
950924 var fields eventFields
951925 switch eventFormat {
952926 case EventFormatV1 :
0 commit comments