Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

add default_power_level_content_override config option. #12618

Merged
merged 36 commits into from
May 12, 2022
Merged

add default_power_level_content_override config option. #12618

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
0a6f1d1
add default_power_level_content_override config option.
ara4n Apr 23, 2022
8cb9abe
changelog
ara4n Apr 23, 2022
ba33466
update sample config
ara4n Apr 23, 2022
f415534
Merge branch 'develop' into matthew/configurable_default_pl
andybalaam May 3, 2022
c3a8159
Apply default_power_level_content_override before power_level_content…
andybalaam May 3, 2022
20e2a51
Provide an example of a default_power_level_content_override
andybalaam May 3, 2022
f7eed3a
Generate docs
andybalaam May 3, 2022
7531942
Add a config manual entry for default_power_level_content_override
andybalaam May 3, 2022
50b0b1e
Re-order room permissions config
andybalaam May 3, 2022
9da3abc
Move changelog file to correct name for this PR
andybalaam May 4, 2022
45da8d0
Tests for power level overrides
andybalaam May 4, 2022
bbea127
Merge branch 'develop' into configurable_default_pl
andybalaam May 4, 2022
0cb64bf
Update test config to match documentation
andybalaam May 4, 2022
f863ad9
Document the way power level overrides overwrite per key
andybalaam May 4, 2022
eba1ed4
Reformat changelog for default_power_level_content_override
andybalaam May 6, 2022
9d70d83
Explicitly mention that the config will be overlaid
andybalaam May 9, 2022
e860ec6
Expand 12618 changelog entry
andybalaam May 9, 2022
4309993
Delete extranous sentence about MSC3779 and MSC3761
andybalaam May 9, 2022
3aed63a
More realistic example for default_power_level_content_override
andybalaam May 9, 2022
9c99926
Fix indent of example config
andybalaam May 10, 2022
52197b0
Fix case of create in default power level tests
andybalaam May 10, 2022
55e1ecc
Spread out multi-line docstring
andybalaam May 10, 2022
21459d8
Use Python native string literal concatenation
andybalaam May 10, 2022
08b00e1
Reduce the user of Cucumber-style Given/And comments to be more readable
andybalaam May 10, 2022
9adeaa7
Document allowed keys inside default_power_level_content_override
andybalaam May 10, 2022
4dda230
Move default_power_level_content_override into a member
andybalaam May 10, 2022
ae9421c
Remove assumptions about default power levels from tests
andybalaam May 10, 2022
aa43bb1
Generate sample config
andybalaam May 10, 2022
d84ba9a
Code formatting
andybalaam May 10, 2022
990b7fa
Tidy default override if, and check against None instead of falsey
andybalaam May 12, 2022
8122c1b
Fix typo use->used
andybalaam May 12, 2022
a91a043
Remove extraneous null presets in example config
andybalaam May 12, 2022
383e021
Regenerate sample config
andybalaam May 12, 2022
b2ae9c9
Add wording "per room preset"
andybalaam May 12, 2022
e1a913d
Quotes for config key example
andybalaam May 12, 2022
8a639df
Make config example valid yaml
andybalaam May 12, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion changelog.d/12618.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Add a `default_power_level_content_override` config option to set default room power levels.
Add a `default_power_level_content_override` config option to set default room power levels per room preset.
22 changes: 10 additions & 12 deletions docs/sample_config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2476,20 +2476,18 @@ push:
# the default event power levels will be ignored).
#
#default_power_level_content_override:
# private_chat: {
# "events": {
# "com.example.myeventtype" : 0,
# "m.room.avatar": 50,
# "m.room.canonical_alias": 50,
# "m.room.encryption": 100,
# "m.room.history_visibility": 100,
# "m.room.name": 50,
# "m.room.power_levels": 100,
# "m.room.server_acl": 100,
# private_chat:
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
# private_chat:
# "private_chat":

# "events":
# "com.example.myeventtype" : 0
# "m.room.avatar": 50
# "m.room.canonical_alias": 50
# "m.room.encryption": 100
# "m.room.history_visibility": 100
# "m.room.name": 50
# "m.room.power_levels": 100
# "m.room.server_acl": 100
# "m.room.tombstone": 100
# },
# "events_default": 1
# }


# Uncomment to allow non-server-admin users to create groups on this server
Expand Down
22 changes: 10 additions & 12 deletions synapse/config/room.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,18 +118,16 @@ def generate_config_section(self, **kwargs: Any) -> str:
# the default event power levels will be ignored).
#
#default_power_level_content_override:
# private_chat: {
# "events": {
# "com.example.myeventtype" : 0,
# "m.room.avatar": 50,
# "m.room.canonical_alias": 50,
# "m.room.encryption": 100,
# "m.room.history_visibility": 100,
# "m.room.name": 50,
# "m.room.power_levels": 100,
# "m.room.server_acl": 100,
# private_chat:
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
# private_chat:
# "private_chat":

# "events":
# "com.example.myeventtype" : 0
# "m.room.avatar": 50
# "m.room.canonical_alias": 50
# "m.room.encryption": 100
# "m.room.history_visibility": 100
# "m.room.name": 50
# "m.room.power_levels": 100
# "m.room.server_acl": 100
# "m.room.tombstone": 100
# },
# "events_default": 1
# }
"""