summary refs log tree commit diff
path: root/synapse/handlers/room.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2014-08-14 18:40:50 +0100
committerErik Johnston <erik@matrix.org>2014-08-14 18:40:50 +0100
commit2c46bb620828efaebdbae37e5212a28b505ee72d (patch)
tree9b10dfb00f35b00f9b6e6d49feb22a5e9207ce19 /synapse/handlers/room.py
parentUpdate StreamStore (diff)
downloadsynapse-2c46bb620828efaebdbae37e5212a28b505ee72d.tar.xz
Fix up typos and correct sql queries
Diffstat (limited to 'synapse/handlers/room.py')
-rw-r--r--synapse/handlers/room.py10
1 files changed, 2 insertions, 8 deletions
diff --git a/synapse/handlers/room.py b/synapse/handlers/room.py
index a9ff2d93f1..9b55206e47 100644
--- a/synapse/handlers/room.py
+++ b/synapse/handlers/room.py
@@ -201,7 +201,7 @@ class MessageHandler(BaseHandler):
 
     @defer.inlineCallbacks
     def get_feedback(self, event_id):
-        yield self.auth.check_joined_room(room_id, user_id)
+        # yield self.auth.check_joined_room(room_id, user_id)
 
         # Pull out the feedback from the db
         fb = yield self.store.get_feedback(event_id)
@@ -690,13 +690,7 @@ class RoomMemberHandler(BaseHandler):
     @defer.inlineCallbacks
     def _do_local_membership_update(self, event, membership, broadcast_msg):
         # store membership
-        store_id = yield self.store.store_room_member(
-            user_id=event.target_user_id,
-            sender=event.user_id,
-            room_id=event.room_id,
-            content=event.content,
-            membership=membership
-        )
+        store_id = yield self.store.persist_event(event)
 
         # Send a PDU to all hosts who have joined the room.
         destinations = yield self.store.get_joined_hosts_for_room(