Include the topic event in the prejoin state, per MSC3173. (#11666)
Invites and knocks will now include the topic in the stripped state send to clients before joining the room.
This commit is contained in:
parent
13c974ed35
commit
8422a7f7f6
|
@ -0,0 +1 @@
|
||||||
|
Include the room topic in the stripped state included with invites and knocking.
|
|
@ -1488,6 +1488,7 @@ room_prejoin_state:
|
||||||
# - m.room.encryption
|
# - m.room.encryption
|
||||||
# - m.room.name
|
# - m.room.name
|
||||||
# - m.room.create
|
# - m.room.create
|
||||||
|
# - m.room.topic
|
||||||
#
|
#
|
||||||
# Uncomment the following to disable these defaults (so that only the event
|
# Uncomment the following to disable these defaults (so that only the event
|
||||||
# types listed in 'additional_event_types' are shared). Defaults to 'false'.
|
# types listed in 'additional_event_types' are shared). Defaults to 'false'.
|
||||||
|
|
|
@ -107,6 +107,8 @@ _DEFAULT_PREJOIN_STATE_TYPES = [
|
||||||
EventTypes.Name,
|
EventTypes.Name,
|
||||||
# Per MSC1772.
|
# Per MSC1772.
|
||||||
EventTypes.Create,
|
EventTypes.Create,
|
||||||
|
# Per MSC3173.
|
||||||
|
EventTypes.Topic,
|
||||||
]
|
]
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -108,6 +108,15 @@ class KnockingStrippedStateEventHelperMixin(TestCase):
|
||||||
"state_key": "",
|
"state_key": "",
|
||||||
},
|
},
|
||||||
),
|
),
|
||||||
|
(
|
||||||
|
EventTypes.Topic,
|
||||||
|
{
|
||||||
|
"content": {
|
||||||
|
"topic": "A really cool room",
|
||||||
|
},
|
||||||
|
"state_key": "",
|
||||||
|
},
|
||||||
|
),
|
||||||
]
|
]
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue