summary refs log tree commit diff
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2015-12-02 10:57:51 +0000
committerMark Haines <mark.haines@matrix.org>2015-12-02 10:57:51 +0000
commitdede14f689b1e9e297a337b8676a72930c96c5b4 (patch)
tree8cdd1b6604404627c51877d26fa83d9af6b6b00f
parentAdd comments (diff)
parentFix typo in collect_presencelike_data (diff)
downloadsynapse-dede14f689b1e9e297a337b8676a72930c96c5b4.tar.xz
Merge branch 'develop' into markjh/edu_frequency
-rw-r--r--synapse/handlers/message.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/handlers/message.py b/synapse/handlers/message.py
index cb0361ac49..c972e8cd4c 100644
--- a/synapse/handlers/message.py
+++ b/synapse/handlers/message.py
@@ -32,7 +32,7 @@ logger = logging.getLogger(__name__)
 
 
 def collect_presencelike_data(distributor, user, content):
-    return distributor.fire("changed_presencelike_data", user, content)
+    return distributor.fire("collect_presencelike_data", user, content)
 
 
 class MessageHandler(BaseHandler):