MSC2946: Use new MSC1772 format for space parents
MODIFY
setup/mscs/msc2946/msc2946.go
setup/mscs/msc2946/msc2946.go
@@ -36,7 +36,7 @@ import (
const (
ConstCreateEventContentKey = "org.matrix.msc1772.type"
ConstSpaceChildEventType = "org.matrix.msc1772.space.child"
- ConstSpaceParentEventType = "org.matrix.msc1772.room.parent"
+ ConstSpaceParentEventType = "org.matrix.msc1772.space.parent"
)
// SpacesRequest is the request body to POST /_matrix/client/r0/rooms/{roomID}/spaces
@@ -57,7 +57,7 @@ type SpacesResponse struct {
NextBatch string `json:"next_batch"`
// Rooms are nodes on the space graph.
Rooms []Room `json:"rooms"`
- // Events are edges on the space graph, exclusively m.space.child or m.room.parent events
+ // Events are edges on the space graph, exclusively m.space.child or m.space.parent events
Events []gomatrixserverlib.ClientEvent `json:"events"`
}
@@ -182,8 +182,8 @@ func (w *walker) walk() *SpacesResponse {
if !w.authorised(roomID) {
continue
}
- // Get all `m.space.child` and `m.room.parent` state events for the room. *In addition*, get
- // all `m.space.child` and `m.room.parent` state events which *point to* (via `state_key` or `content.room_id`)
+ // Get all `m.space.child` and `m.space.parent` state events for the room. *In addition*, get
+ // all `m.space.child` and `m.space.parent` state events which *point to* (via `state_key` or `content.room_id`)
// this room. This requires servers to store reverse lookups.
refs, err := w.references(roomID)
if err != nil {
@@ -196,7 +196,7 @@ func (w *walker) walk() *SpacesResponse {
if !w.alreadySent(roomID) {
pubRoom := w.publicRoomsChunk(roomID)
roomType := ""
- create := w.stateEvent(roomID, "m.room.create", "")
+ create := w.stateEvent(roomID, gomatrixserverlib.MRoomCreate, "")
if create != nil {
roomType = gjson.GetBytes(create.Content(), ConstCreateEventContentKey).Str
}

MODIFY
setup/mscs/msc2946/msc2946_test.go
setup/mscs/msc2946/msc2946_test.go
@@ -87,7 +87,6 @@ func TestMSC2946(t *testing.T) {
StateKey: &room1,
Content: map[string]interface{}{
"via": []string{"localhost"},
- "present": true,
},
})
rootToR2 := mustCreateEvent(t, fledglingEvent{
@@ -97,7 +96,6 @@ func TestMSC2946(t *testing.T) {
StateKey: &room2,
Content: map[string]interface{}{
"via": []string{"localhost"},
- "present": true,
},
})
rootToS1 := mustCreateEvent(t, fledglingEvent{
@@ -107,7 +105,6 @@ func TestMSC2946(t *testing.T) {
StateKey: &subSpaceS1,
Content: map[string]interface{}{
"via": []string{"localhost"},
- "present": true,
},
})
s1ToR3 := mustCreateEvent(t, fledglingEvent{
@@ -117,7 +114,6 @@ func TestMSC2946(t *testing.T) {
StateKey: &room3,
Content: map[string]interface{}{
"via": []string{"localhost"},
- "present": true,
},
})
s1ToR4 := mustCreateEvent(t, fledglingEvent{
@@ -127,7 +123,6 @@ func TestMSC2946(t *testing.T) {
StateKey: &room4,
Content: map[string]interface{}{
"via": []string{"localhost"},
- "present": true,
},
})
s1ToS2 := mustCreateEvent(t, fledglingEvent{
@@ -137,7 +132,6 @@ func TestMSC2946(t *testing.T) {
StateKey: &subSpaceS2,
Content: map[string]interface{}{
"via": []string{"localhost"},
- "present": true,
},
})
// This is a parent link only
@@ -145,11 +139,9 @@ func TestMSC2946(t *testing.T) {
RoomID: room5,
Sender: alice,
Type: msc2946.ConstSpaceParentEventType,
- StateKey: &empty,
+ StateKey: &subSpaceS2,
Content: map[string]interface{}{
- "room_id": subSpaceS2,
"via": []string{"localhost"},
- "present": true,
},
})
// history visibility for R4

MODIFY
setup/mscs/msc2946/storage.go
setup/mscs/msc2946/storage.go
@@ -22,7 +22,6 @@ import (
"github.com/matrix-org/dendrite/internal/sqlutil"
"github.com/matrix-org/dendrite/setup/config"
"github.com/matrix-org/gomatrixserverlib"
- "github.com/tidwall/gjson"
)
var (
@@ -175,7 +174,7 @@ func SpaceTarget(he *gomatrixserverlib.HeaderedEvent) string {
}
switch he.Type() {
case ConstSpaceParentEventType:
- return gjson.GetBytes(he.Content(), "room_id").Str
+ return *he.StateKey()
case ConstSpaceChildEventType:
return *he.StateKey()
}

MSC2946: Use new MSC1772 format for space parents (#1713)