diff options
| author | David Baker <dave@matrix.org> | 2016-01-05 18:39:50 +0000 |
|---|---|---|
| committer | David Baker <dave@matrix.org> | 2016-01-05 18:39:50 +0000 |
| commit | eb036256267dc76f13a8a25ab952356e1b1e9c00 (patch) | |
| tree | 6d91ca8882e7afc8c5486e28d2e782783b1c85de /synapse/handlers/sync.py | |
| parent | comment typo (diff) | |
| parent | Merge pull request #463 from matrix-org/daniel/hashtagnofilter (diff) | |
| download | synapse-eb036256267dc76f13a8a25ab952356e1b1e9c00.tar.xz | |
Merge remote-tracking branch 'origin/develop' into store_event_actions
Diffstat (limited to 'synapse/handlers/sync.py')
| -rw-r--r-- | synapse/handlers/sync.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/synapse/handlers/sync.py b/synapse/handlers/sync.py index 2ec42ee503..257bd2bfee 100644 --- a/synapse/handlers/sync.py +++ b/synapse/handlers/sync.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright 2015 OpenMarket Ltd +# Copyright 2015 - 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. @@ -118,7 +118,7 @@ class SyncResult(collections.namedtuple("SyncResult", [ events. """ return bool( - self.presence or self.joined or self.invited + self.presence or self.joined or self.invited or self.archived ) GuestRoom = collections.namedtuple("GuestRoom", ("room_id", "membership")) @@ -690,7 +690,6 @@ class SyncHandler(BaseHandler): sync_config.user.to_string(), loaded_recents, is_guest=sync_config.is_guest, - require_all_visible_for_guests=False ) loaded_recents.extend(recents) recents = loaded_recents |