MirrorHub/synapse
0
0
Fork 1
mirror of https://mau.dev/maunium/synapse.git synced 2024-07-04 10:18:52 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.10.0

Browse source
This commit is contained in:
Erik Johnston 2015-08-20 16:10:14 +01:00
parent d5c31e01f2 3befc9ccc3
commit b578c822e3
4 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
synapse/api/constants.py
View file

@ -77,6 +77,7 @@ class EventTypes(object):
RoomHistoryVisibility = "m.room.history_visibility" RoomHistoryVisibility = "m.room.history_visibility"
CanonicalAlias = "m.room.canonical_alias" CanonicalAlias = "m.room.canonical_alias"
RoomAvatar = "m.room.avatar"
# These are used for validation # These are used for validation
Message = "m.room.message" Message = "m.room.message"

2
synapse/handlers/auth.py
View file

@ -162,7 +162,7 @@ class AuthHandler(BaseHandler):
if not user_id.startswith('@'): if not user_id.startswith('@'):
user_id = UserID.create(user_id, self.hs.hostname).to_string() 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.returnValue(user_id)
@defer.inlineCallbacks @defer.inlineCallbacks

5
synapse/handlers/room.py
View file

@ -247,10 +247,11 @@ class RoomCreationHandler(BaseHandler):
}, },
"users_default": 0, "users_default": 0,
"events": { "events": {
EventTypes.Name: 100, EventTypes.Name: 50,
EventTypes.PowerLevels: 100, EventTypes.PowerLevels: 100,
EventTypes.RoomHistoryVisibility: 100, EventTypes.RoomHistoryVisibility: 100,
EventTypes.CanonicalAlias: 100, EventTypes.CanonicalAlias: 50,
EventTypes.RoomAvatar: 50,
}, },
"events_default": 0, "events_default": 0,
"state_default": 50, "state_default": 50,

2
synapse/rest/client/v2_alpha/account.py
View file

@ -79,7 +79,7 @@ class PasswordRestServlet(RestServlet):
new_password = params['new_password'] new_password = params['new_password']
yield self.auth_handler.set_password( yield self.auth_handler.set_password(
user_id, new_password, None user_id, new_password
) )
defer.returnValue((200, {})) defer.returnValue((200, {}))