Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-05-02 13:56:02 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop' into storage_transactions

Browse source 
Conflicts:
	synapse/api/auth.py
	synapse/handlers/room.py
	synapse/storage/__init__.py
This commit is contained in:
Mark Haines 2014-08-26 16:07:05 +01:00
commit 4b63b06cad
74 changed files with 3467 additions and 870 deletions
Download patch file Download diff file Expand all files Collapse all files

8
tests/utils.py
View file

@ -190,7 +190,7 @@ class MemoryDataStore(object):
def persist_event(self, event):
if event.type == RoomMemberEvent.TYPE:
room_id = event.room_id
user = event.target_user_id
user = event.state_key
membership = event.membership
self.members.setdefault(room_id, {})[user] = event
@ -203,7 +203,9 @@ class MemoryDataStore(object):
def get_current_state(self, room_id, event_type=None, state_key=""):
if event_type:
key = (room_id, event_type, state_key)
return self.current_state.get(key)
if self.current_state.get(key):
return [self.current_state.get(key)]
return None
else:
return [
e for e in self.current_state
@ -221,7 +223,7 @@ class MemoryDataStore(object):
def _format_call(args, kwargs):
return ", ".join(
["%r" % (a) for a in args] +
["%r" % (a) for a in args] +
["%s=%r" % (k, v) for k, v in kwargs.items()]
)