Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

by default include m.room.encryption on invites #3902

Merged
merged 4 commits into from Jan 30, 2019
Merged
Changes from all commits
Commits
File filter...
Filter file types
Jump to…
Jump to file or symbol
Failed to load files and symbols.
+4 −0
Diff settings

Always

Just for now

Copy path View file
@@ -0,0 +1 @@
Include m.room.encryption on invites by default
Copy path View file
@@ -73,6 +73,7 @@ class EventTypes(object):
RoomHistoryVisibility = "m.room.history_visibility"
CanonicalAlias = "m.room.canonical_alias"
RoomAvatar = "m.room.avatar"
RoomEncryption = "m.room.encryption"
GuestAccess = "m.room.guest_access"

# These are used for validation
Copy path View file
@@ -24,6 +24,7 @@ def read_config(self, config):
EventTypes.JoinRules,
EventTypes.CanonicalAlias,
EventTypes.RoomAvatar,
EventTypes.RoomEncryption,
EventTypes.Name,
])

@@ -36,5 +37,6 @@ def default_config(cls, **kwargs):
- "{JoinRules}"
- "{CanonicalAlias}"
- "{RoomAvatar}"
- "{RoomEncryption}"
- "{Name}"
""".format(**vars(EventTypes))
ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.