From 27e093cbc1bc50f597119c132596ccb12c219ee4 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 22 May 2015 17:03:37 +0100 Subject: Bump version --- synapse/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'synapse') diff --git a/synapse/__init__.py b/synapse/__init__.py index 68f86138a4..4720d99848 100644 --- a/synapse/__init__.py +++ b/synapse/__init__.py @@ -16,4 +16,4 @@ """ This is a reference implementation of a Matrix home server. """ -__version__ = "0.9.0-r5" +__version__ = "0.9.1" -- cgit 1.5.1 From 00dd207f603597f016af11729d1fd31f6391ff9a Mon Sep 17 00:00:00 2001 From: Mark Haines Date: Tue, 26 May 2015 14:57:48 +0100 Subject: Take a dict of the rule, not the rule list --- synapse/push/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'synapse') diff --git a/synapse/push/__init__.py b/synapse/push/__init__.py index 167b973b2b..8059fff1b2 100644 --- a/synapse/push/__init__.py +++ b/synapse/push/__init__.py @@ -76,7 +76,7 @@ class Pusher(object): rules = [] for rawrule in rawrules: - rule = dict(rawrules) + rule = dict(rawrule) rule['conditions'] = json.loads(rawrule['conditions']) rule['actions'] = json.loads(rawrule['actions']) rules.append(rule) -- cgit 1.5.1 From 554c63ca604f3b8e9a3e8cde143eb319bf750c00 Mon Sep 17 00:00:00 2001 From: Mark Haines Date: Tue, 26 May 2015 15:03:49 +0100 Subject: Iterate over the user_streams not the user_ids --- synapse/notifier.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'synapse') diff --git a/synapse/notifier.py b/synapse/notifier.py index 4f47f88df8..078abfc56d 100644 --- a/synapse/notifier.py +++ b/synapse/notifier.py @@ -153,7 +153,7 @@ class Notifier(object): for x in self.room_to_user_streams.values(): all_user_streams |= x - for x in self.user_to_user_stream: + for x in self.user_to_user_stream.values(): all_user_streams.add(x) for x in self.appservice_to_user_streams.values(): all_user_streams |= x -- cgit 1.5.1