This repository was archived by the owner on Apr 26, 2024. It is now read-only.
-
-
Notifications
You must be signed in to change notification settings - Fork 2.1k
Enable spaces by default. #10011
Merged
Merged
Enable spaces by default. #10011
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
Enable experimental support for [MSC2946](https://github.com/matrix-org/matrix-doc/pull/2946): Spaces Summary by default. | ||
clokep marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -29,9 +29,26 @@ def read_config(self, config: JsonDict, **kwargs): | |
self.msc2858_enabled = experimental.get("msc2858_enabled", False) # type: bool | ||
|
||
# Spaces (MSC1772, MSC2946, MSC3083, etc) | ||
self.spaces_enabled = experimental.get("spaces_enabled", False) # type: bool | ||
self.spaces_enabled = experimental.get("spaces_enabled", True) # type: bool | ||
if self.spaces_enabled: | ||
KNOWN_ROOM_VERSIONS[RoomVersions.MSC3083.identifier] = RoomVersions.MSC3083 | ||
|
||
# MSC3026 (busy presence state) | ||
self.msc3026_enabled = experimental.get("msc3026_enabled", False) # type: bool | ||
|
||
def generate_config_section(self, **kwargs): | ||
return """\ | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. We may want to leave a note here stating that we only include experimental features that are on by default in the sample config. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Is that true though? This only includes the one enabled by default, but I'm unsure that's the reason it is the only one included. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I'm going to merge this as is for now, we can update it when (if?) we add more here. |
||
# Enable experimental features in Synapse. | ||
# | ||
# Experimental features might break or be removed without a deprecation | ||
# period. | ||
# | ||
experimental_features: | ||
# Support for Spaces (MSC1772), it enables the following: | ||
# | ||
# * The Spaces Summary API (MSC2946). | ||
# * Restricting room membership based on space membership (MSC3083). | ||
# | ||
# Uncomment to disable support for Spaces. | ||
#spaces_enabled: False | ||
""" |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.