mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2025-12-17 03:43:11 -06:00
Code Issues Packages Projects Releases Wiki Activity

Default to v1 when room_version key missing

Browse source 
Signed-off-by: Alex Chen <minecnly@gmail.com>
This commit is contained in:
Cnly 2020-04-10 18:17:29 +08:00
parent 301c79d0e8
commit a6d6fe7349
2 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
roomserver/storage/postgres/storage.go
View file

@ -20,8 +20,6 @@ import (
"database/sql" "database/sql"
"encoding/json" "encoding/json"
roomserverVersion "github.com/matrix-org/dendrite/roomserver/version"
// Import the postgres database driver. // Import the postgres database driver.
_ "github.com/lib/pq" _ "github.com/lib/pq"
"github.com/matrix-org/dendrite/roomserver/api" "github.com/matrix-org/dendrite/roomserver/api"
@ -146,7 +144,7 @@ func extractRoomVersionFromCreateEvent(event gomatrixserverlib.Event) (
if event.Type() != gomatrixserverlib.MRoomCreate { if event.Type() != gomatrixserverlib.MRoomCreate {
return gomatrixserverlib.RoomVersion(""), nil return gomatrixserverlib.RoomVersion(""), nil
} }
roomVersion = roomserverVersion.DefaultRoomVersion() roomVersion = gomatrixserverlib.RoomVersionV1
var createContent gomatrixserverlib.CreateContent var createContent gomatrixserverlib.CreateContent
// The m.room.create event contains an optional "room_version" key in // The m.room.create event contains an optional "room_version" key in
// the event content, so we need to unmarshal that first. // the event content, so we need to unmarshal that first.

4
roomserver/storage/sqlite3/storage.go
View file

@ -22,8 +22,6 @@ import (
"errors" "errors"
"net/url" "net/url"
roomserverVersion "github.com/matrix-org/dendrite/roomserver/version"
"github.com/matrix-org/dendrite/common" "github.com/matrix-org/dendrite/common"
"github.com/matrix-org/dendrite/roomserver/api" "github.com/matrix-org/dendrite/roomserver/api"
"github.com/matrix-org/dendrite/roomserver/types" "github.com/matrix-org/dendrite/roomserver/types"
@ -175,7 +173,7 @@ func extractRoomVersionFromCreateEvent(event gomatrixserverlib.Event) (
if event.Type() != gomatrixserverlib.MRoomCreate { if event.Type() != gomatrixserverlib.MRoomCreate {
return gomatrixserverlib.RoomVersion(""), nil return gomatrixserverlib.RoomVersion(""), nil
} }
roomVersion = roomserverVersion.DefaultRoomVersion() roomVersion = gomatrixserverlib.RoomVersionV1
var createContent gomatrixserverlib.CreateContent var createContent gomatrixserverlib.CreateContent
// The m.room.create event contains an optional "room_version" key in // The m.room.create event contains an optional "room_version" key in
// the event content, so we need to unmarshal that first. // the event content, so we need to unmarshal that first.