Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-12-15 21:33:48 -05:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop' of github.com:matrix-org/synapse into develop

Browse source
This commit is contained in:
Daniel Wagner-Hall 2015-11-04 17:31:01 +00:00
commit 4e62ffdb21
12 changed files with 7 additions and 231 deletions
Download patch file Download diff file Expand all files Collapse all files

3
synapse/storage/stream.py
View file

@ -158,8 +158,7 @@ class StreamStore(SQLBaseStore):
defer.returnValue(results)
@log_function
def get_room_events_stream(self, user_id, from_key, to_key, room_id,
limit=0):
def get_room_events_stream(self, user_id, from_key, to_key, limit=0):
current_room_membership_sql = (
"SELECT m.room_id FROM room_memberships as m "
" INNER JOIN current_state_events as c"