diff --git a/synapse/storage/stream.py b/synapse/storage/stream.py
index 8c766b8a00..a76fecf24f 100644
--- a/synapse/storage/stream.py
+++ b/synapse/storage/stream.py
@@ -146,7 +146,7 @@ class StreamStore(SQLBaseStore):
current_room_membership_sql = (
"SELECT m.room_id FROM room_memberships as m "
"INNER JOIN current_state_events as c ON m.event_id = c.event_id "
- "WHERE m.user_id = ?"
+ "WHERE m.user_id = ? AND m.membership = 'join'"
)
# We also want to get any membership events about that user, e.g.
diff --git a/tests/storage/test_stream.py b/tests/storage/test_stream.py
new file mode 100644
index 0000000000..6cbfcc7652
--- /dev/null
+++ b/tests/storage/test_stream.py
@@ -0,0 +1,173 @@
+# -*- coding: utf-8 -*-
+# 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.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+
+from tests import unittest
+from twisted.internet import defer
+
+from synapse.server import HomeServer
+from synapse.api.constants import Membership
+from synapse.api.events.room import RoomMemberEvent, MessageEvent
+
+from tests.utils import SQLiteMemoryDbPool
+
+
+class StreamStoreTestCase(unittest.TestCase):
+
+ @defer.inlineCallbacks
+ def setUp(self):
+ db_pool = SQLiteMemoryDbPool()
+ yield db_pool.prepare()
+
+ hs = HomeServer(
+ "test",
+ db_pool=db_pool,
+ )
+
+ self.store = hs.get_datastore()
+ self.event_factory = hs.get_event_factory()
+
+ self.u_alice = hs.parse_userid("@alice:test")
+ self.u_bob = hs.parse_userid("@bob:test")
+
+ self.room1 = hs.parse_roomid("!abc123:test")
+ self.room2 = hs.parse_roomid("!xyx987:test")
+
+ self.depth = 1
+
+ @defer.inlineCallbacks
+ def inject_room_member(self, room, user, membership):
+ self.depth += 1
+
+ # Have to create a join event using the eventfactory
+ yield self.store.persist_event(
+ self.event_factory.create_event(
+ etype=RoomMemberEvent.TYPE,
+ user_id=user.to_string(),
+ state_key=user.to_string(),
+ room_id=room.to_string(),
+ membership=membership,
+ content={"membership": membership},
+ depth=self.depth,
+ )
+ )
+
+
+ @defer.inlineCallbacks
+ def inject_message(self, room, user, body):
+ self.depth += 1
+
+ # Have to create a join event using the eventfactory
+ yield self.store.persist_event(
+ self.event_factory.create_event(
+ etype=MessageEvent.TYPE,
+ user_id=user.to_string(),
+ room_id=room.to_string(),
+ content={"body": body, "msgtype": u"message"},
+ depth=self.depth,
+ )
+ )
+
+ @defer.inlineCallbacks
+ def test_event_stream_get_other(self):
+ # Both bob and alice joins the room
+ yield self.inject_room_member(self.room1, self.u_alice, Membership.JOIN)
+ yield self.inject_room_member(self.room1, self.u_bob, Membership.JOIN)
+
+ # Initial stream key:
+ start = yield self.store.get_room_events_max_id()
+
+ yield self.inject_message(self.room1, self.u_alice, u"test")
+
+ end = yield self.store.get_room_events_max_id()
+
+ results, _ = yield self.store.get_room_events_stream(
+ self.u_bob.to_string(),
+ start,
+ end,
+ None, # Is currently ignored
+ )
+
+ self.assertEqual(1, len(results))
+
+ event = results[0]
+
+ self.assertObjectHasAttributes(
+ {
+ "type": MessageEvent.TYPE,
+ "user_id": self.u_alice.to_string(),
+ "content": {"body": "test", "msgtype": "message"},
+ },
+ event,
+ )
+
+ @defer.inlineCallbacks
+ def test_event_stream_get_own(self):
+ # Both bob and alice joins the room
+ yield self.inject_room_member(self.room1, self.u_alice, Membership.JOIN)
+ yield self.inject_room_member(self.room1, self.u_bob, Membership.JOIN)
+
+ # Initial stream key:
+ start = yield self.store.get_room_events_max_id()
+
+ yield self.inject_message(self.room1, self.u_alice, u"test")
+
+ end = yield self.store.get_room_events_max_id()
+
+ results, _ = yield self.store.get_room_events_stream(
+ self.u_alice.to_string(),
+ start,
+ end,
+ None, # Is currently ignored
+ )
+
+ self.assertEqual(1, len(results))
+
+ event = results[0]
+
+ self.assertObjectHasAttributes(
+ {
+ "type": MessageEvent.TYPE,
+ "user_id": self.u_alice.to_string(),
+ "content": {"body": "test", "msgtype": "message"},
+ },
+ event,
+ )
+
+ @defer.inlineCallbacks
+ def test_event_stream_join_leave(self):
+ # Both bob and alice joins the room
+ yield self.inject_room_member(self.room1, self.u_alice, Membership.JOIN)
+ yield self.inject_room_member(self.room1, self.u_bob, Membership.JOIN)
+
+ # Then bob leaves again.
+ yield self.inject_room_member(self.room1, self.u_bob, Membership.LEAVE)
+
+ # Initial stream key:
+ start = yield self.store.get_room_events_max_id()
+
+ yield self.inject_message(self.room1, self.u_alice, u"test")
+
+ end = yield self.store.get_room_events_max_id()
+
+ results, _ = yield self.store.get_room_events_stream(
+ self.u_bob.to_string(),
+ start,
+ end,
+ None, # Is currently ignored
+ )
+
+ # We should not get the message, as it happened *after* bob left.
+ self.assertEqual(0, len(results))
|
