summary refs log tree commit diff
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2016-01-06 16:54:57 +0000
committerMark Haines <mark.haines@matrix.org>2016-01-06 16:54:57 +0000
commit4cec90a26061748602d244604b34b4df67087eb2 (patch)
tree9fe6c34aeeeb88687339b4737615f3c66bd9fd11
parentGuest users must be joined to a room to see it in /sync (diff)
downloadsynapse-4cec90a26061748602d244604b34b4df67087eb2.tar.xz
Pass whether the user was a guest to some of the event streams
Diffstat (limited to '')
-rw-r--r--synapse/handlers/sync.py8
1 files changed, 3 insertions, 5 deletions
diff --git a/synapse/handlers/sync.py b/synapse/handlers/sync.py
index fdccb52231..5428864bb7 100644
--- a/synapse/handlers/sync.py
+++ b/synapse/handlers/sync.py
@@ -340,7 +340,7 @@ class SyncHandler(BaseHandler):
             from_key=typing_key,
             limit=sync_config.filter.ephemeral_limit(),
             room_ids=room_ids,
-            is_guest=False,
+            is_guest=sync_config.is_guest,
         )
         now_token = now_token.copy_and_replace("typing_key", typing_key)
 
@@ -363,8 +363,7 @@ class SyncHandler(BaseHandler):
             from_key=receipt_key,
             limit=sync_config.filter.ephemeral_limit(),
             room_ids=room_ids,
-            # /sync doesn't support guest access, they can't get to this point in code
-            is_guest=False,
+            is_guest=sync_config.is_guest,
         )
         now_token = now_token.copy_and_replace("receipt_key", receipt_key)
 
@@ -420,8 +419,7 @@ class SyncHandler(BaseHandler):
             from_key=since_token.presence_key,
             limit=sync_config.filter.presence_limit(),
             room_ids=room_ids,
-            # /sync doesn't support guest access, they can't get to this point in code
-            is_guest=False,
+            is_guest=sync_config.is_guest,
         )
         now_token = now_token.copy_and_replace("presence_key", presence_key)