summary refs log tree commit diff
path: root/synapse/api
diff options
context:
space:
mode:
authorDavid Baker <dbkr@users.noreply.github.com>2018-06-22 16:49:42 +0100
committerGitHub <noreply@github.com>2018-06-22 16:49:42 +0100
commit7735eee41db5ea4917cf4ca5bf652aa782da3ee4 (patch)
tree21ee40cba9020311f925bbfdc47a5faf36c6c65d /synapse/api
parentMerge pull request #3202 from matrix-org/michaelkaye/domain_based_rule_checker (diff)
parentAdd m.encryption to event types (diff)
downloadsynapse-7735eee41db5ea4917cf4ca5bf652aa782da3ee4.tar.xz
Merge pull request #3426 from matrix-org/dbkr/e2e_by_default
Server-enforced e2e for private rooms
Diffstat (limited to 'synapse/api')
-rw-r--r--synapse/api/constants.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/synapse/api/constants.py b/synapse/api/constants.py

index 5baba43966..92b5790557 100644 --- a/synapse/api/constants.py +++ b/synapse/api/constants.py
@@ -1,6 +1,7 @@ # -*- coding: utf-8 -*- # Copyright 2014-2016 OpenMarket Ltd # Copyright 2017 Vector Creations Ltd +# Copyright 2018 New Vector Ltd # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -70,6 +71,7 @@ class EventTypes(object): CanonicalAlias = "m.room.canonical_alias" RoomAvatar = "m.room.avatar" GuestAccess = "m.room.guest_access" + Encryption = "m.room.encryption" # These are used for validation Message = "m.room.message"