Merge branch 'release-v0.6.0' into develop

This commit is contained in:
Mark Haines 2014-12-16 17:29:49 +00:00
commit 56db465047
10 changed files with 194 additions and 53 deletions

View file

@ -123,6 +123,11 @@ class MessageHandler(BaseHandler):
self.validator.validate_new(builder)
self.ratelimit(builder.user_id)
# TODO(paul): Why does 'event' not have a 'user' object?
user = self.hs.parse_userid(builder.user_id)
assert self.hs.is_mine(user), "User must be our own: %s" % (user,)
if builder.type == EventTypes.Member:
membership = builder.content.get("membership", None)
if membership == Membership.JOIN: