summary refs log tree commit diff
path: root/synapse/handlers
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2014-08-18 10:59:04 +0100
committerErik Johnston <erik@matrix.org>2014-08-18 10:59:04 +0100
commitdccb2f57be566c4cbf8cc413c78eed79036d7049 (patch)
tree3f6f8711d6c28796f3986e3b9588c4498012b772 /synapse/handlers
parentMerge branch 'master' of github.com:matrix-org/synapse into sql_refactor (diff)
downloadsynapse-dccb2f57be566c4cbf8cc413c78eed79036d7049.tar.xz
Disable the ability to GET individualy messages. We need to think about the correct API to do this, as the current one doesn't make much sense.
Diffstat (limited to 'synapse/handlers')
-rw-r--r--synapse/handlers/room.py12
1 files changed, 7 insertions, 5 deletions
diff --git a/synapse/handlers/room.py b/synapse/handlers/room.py
index 14ffddc630..cdc98d2b08 100644
--- a/synapse/handlers/room.py
+++ b/synapse/handlers/room.py
@@ -59,12 +59,14 @@ class MessageHandler(BaseHandler):
         yield self.auth.check_joined_room(room_id, user_id)
 
         # Pull out the message from the db
-        msg = yield self.store.get_message(room_id=room_id,
-                                           msg_id=msg_id,
-                                           user_id=sender_id)
+#        msg = yield self.store.get_message(
+#            room_id=room_id,
+#            msg_id=msg_id,
+#            user_id=sender_id
+#        )
+
+        # TODO (erikj): Once we work out the correct c-s api we need to think on how to do this.
 
-        if msg:
-            defer.returnValue(msg)
         defer.returnValue(None)
 
     @defer.inlineCallbacks