diff options
| author | Erik Johnston <erik@matrix.org> | 2015-08-20 16:10:14 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-08-20 16:10:14 +0100 |
| commit | b578c822e3f382d6321c76ded3f9bd57c371ab86 (patch) | |
| tree | 1949a627914b7f22f4450fc76d133db49e278b3b /synapse | |
| parent | Merge pull request #237 from matrix-org/markjh/readme-rst-formatting (diff) | |
| parent | Merge branch 'release-v0.10.0' of github.com:matrix-org/synapse into develop (diff) | |
| download | synapse-b578c822e3f382d6321c76ded3f9bd57c371ab86.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.10.0
Diffstat (limited to 'synapse')
| -rw-r--r-- | synapse/api/constants.py | 1 | ||||
| -rw-r--r-- | synapse/handlers/auth.py | 2 | ||||
| -rw-r--r-- | synapse/handlers/room.py | 5 | ||||
| -rw-r--r-- | synapse/rest/client/v2_alpha/account.py | 2 |
4 files changed, 6 insertions, 4 deletions
diff --git a/synapse/api/constants.py b/synapse/api/constants.py index 60a0d336da..1423986c1e 100644 --- a/synapse/api/constants.py +++ b/synapse/api/constants.py @@ -77,6 +77,7 @@ class EventTypes(object): RoomHistoryVisibility = "m.room.history_visibility" CanonicalAlias = "m.room.canonical_alias" + RoomAvatar = "m.room.avatar" # These are used for validation Message = "m.room.message" diff --git a/synapse/handlers/auth.py b/synapse/handlers/auth.py index be2baeaece..ff2c66f442 100644 --- a/synapse/handlers/auth.py +++ b/synapse/handlers/auth.py @@ -162,7 +162,7 @@ class AuthHandler(BaseHandler): if not user_id.startswith('@'): user_id = UserID.create(user_id, self.hs.hostname).to_string() - self._check_password(user_id, password) + yield self._check_password(user_id, password) defer.returnValue(user_id) @defer.inlineCallbacks diff --git a/synapse/handlers/room.py b/synapse/handlers/room.py index 8108c2763d..c5d1001b50 100644 --- a/synapse/handlers/room.py +++ b/synapse/handlers/room.py @@ -247,10 +247,11 @@ class RoomCreationHandler(BaseHandler): }, "users_default": 0, "events": { - EventTypes.Name: 100, + EventTypes.Name: 50, EventTypes.PowerLevels: 100, EventTypes.RoomHistoryVisibility: 100, - EventTypes.CanonicalAlias: 100, + EventTypes.CanonicalAlias: 50, + EventTypes.RoomAvatar: 50, }, "events_default": 0, "state_default": 50, diff --git a/synapse/rest/client/v2_alpha/account.py b/synapse/rest/client/v2_alpha/account.py index 897c54b539..522a312c9e 100644 --- a/synapse/rest/client/v2_alpha/account.py +++ b/synapse/rest/client/v2_alpha/account.py @@ -79,7 +79,7 @@ class PasswordRestServlet(RestServlet): new_password = params['new_password'] yield self.auth_handler.set_password( - user_id, new_password, None + user_id, new_password ) defer.returnValue((200, {})) |