diff options
| author | Erik Johnston <erik@matrix.org> | 2014-09-03 19:47:32 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2014-09-03 19:47:32 +0100 |
| commit | 0538a4098d797eaa901c168e3a76df2ac94da2ed (patch) | |
| tree | bc1ef822fdb3184daf6d39a2ab4da1afb6370dd9 /synapse/handlers/events.py | |
| parent | Add database upgrade script (diff) | |
| parent | Bump versions. Update change logs. (diff) | |
| download | synapse-0538a4098d797eaa901c168e3a76df2ac94da2ed.tar.xz | |
Merge branch 'release-v0.2.1' v0.2.1
Diffstat (limited to 'synapse/handlers/events.py')
| -rw-r--r-- | synapse/handlers/events.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/synapse/handlers/events.py b/synapse/handlers/events.py index 980a169b25..fd24a11fb8 100644 --- a/synapse/handlers/events.py +++ b/synapse/handlers/events.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright 2014 matrix.org +# Copyright 2014 OpenMarket Ltd # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -126,5 +126,7 @@ class EventHandler(BaseHandler): defer.returnValue(None) return - yield self.auth.check(event, raises=True) + if hasattr(event, "room_id"): + yield self.auth.check_joined_room(event.room_id, user.to_string()) + defer.returnValue(event) |