From b216b3689248094989168c340b60f500c93772a7 Mon Sep 17 00:00:00 2001
From: Kegan Dougal <kegan@matrix.org>
Date: Mon, 2 Mar 2015 10:41:35 +0000
Subject: [PATCH] JOIN state_events rather than parsing unrecognized_keys to
 pull out member state_keys

---
 synapse/storage/appservice.py |  2 +-
 synapse/storage/stream.py     | 14 ++++----------
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/synapse/storage/appservice.py b/synapse/storage/appservice.py
index 0e3eab942..3a267d044 100644
--- a/synapse/storage/appservice.py
+++ b/synapse/storage/appservice.py
@@ -218,7 +218,7 @@ class ApplicationServiceStore(SQLBaseStore):
         # less obvious.
 
         # get all rooms matching the room ID regex.
-        room_entries = yield self.get_all_rooms()  # RoomEntry list
+        room_entries = yield self.get_all_rooms()
         matching_room_list = set([
             r["room_id"] for r in room_entries if
             service.is_interested_in_room(r["room_id"])
diff --git a/synapse/storage/stream.py b/synapse/storage/stream.py
index bad427288..865cb13e9 100644
--- a/synapse/storage/stream.py
+++ b/synapse/storage/stream.py
@@ -43,7 +43,6 @@ from synapse.util.logutils import log_function
 from collections import namedtuple
 
 import logging
-import simplejson as json
 
 
 logger = logging.getLogger(__name__)
@@ -161,8 +160,9 @@ class StreamStore(SQLBaseStore):
 
         # select all the events between from/to with a sensible limit
         sql = (
-            "SELECT e.event_id, e.room_id, e.type, e.unrecognized_keys, "
-            "e.stream_ordering FROM events AS e "
+            "SELECT e.event_id, e.room_id, e.type, s.state_key, "
+            "e.stream_ordering FROM events AS e LEFT JOIN state_events as s ON "
+            "e.event_id = s.event_id "
             "WHERE e.stream_ordering > ? AND e.stream_ordering <= ? "
             "ORDER BY stream_ordering ASC LIMIT %(limit)d "
         ) % {
@@ -174,13 +174,7 @@ class StreamStore(SQLBaseStore):
                 return True
 
             if row["type"] == EventTypes.Member:
-                # load up the content to inspect if some user the AS is
-                # interested in was invited to a room. We'll be passing this
-                # through _get_events_txn later, so ignore the fact that this
-                # may be a redacted event.
-                event_content = json.loads(row["unrecognized_keys"])
-                if (service.is_interested_in_user(
-                        event_content.get("state_key"))):
+                if service.is_interested_in_user(row.get("state_key")):
                     return True
             return False