summary refs log tree commit diff
path: root/synapse/notifier.py
diff options
context:
space:
mode:
authorDaniel Wagner-Hall <dawagner@gmail.com>2016-01-05 18:12:40 +0000
committerDaniel Wagner-Hall <dawagner@gmail.com>2016-01-05 18:12:40 +0000
commit87d577e0232dafa0abdaf80660da5e8dab1fba9c (patch)
tree8e48e6bd64b001cbb5085b95cf71496777353a0d /synapse/notifier.py
parentMerge pull request #462 from matrix-org/daniel/guestupgrade (diff)
parentSkip, rather than erroring, invalid guest requests (diff)
downloadsynapse-87d577e0232dafa0abdaf80660da5e8dab1fba9c.tar.xz
Merge pull request #463 from matrix-org/daniel/hashtagnofilter
Skip, rather than erroring, invalid guest requests

Erroring causes problems when people make illegal requests, because they
don't know what limit parameter they should pass.

This is definitely buggy. It leaks message counts for rooms people don't
have permission to see, via tokens. But apparently we already
consciously decided to allow that as a team, so this preserves that
behaviour.
Diffstat (limited to 'synapse/notifier.py')
-rw-r--r--synapse/notifier.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/synapse/notifier.py b/synapse/notifier.py
index fd52578325..0a5653b8d5 100644
--- a/synapse/notifier.py
+++ b/synapse/notifier.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright 2014, 2015 OpenMarket Ltd
+# Copyright 2014 - 2016 OpenMarket Ltd
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -386,7 +386,6 @@ class Notifier(object):
                         user.to_string(),
                         new_events,
                         is_guest=is_guest,
-                        require_all_visible_for_guests=False
                     )
 
                 events.extend(new_events)