From b08ad0389e0e412798f32d9f5656db483238173d Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Tue, 24 May 2016 11:04:35 +0100
Subject: [PATCH] Only include non-offline presence in initial sync

---
 synapse/handlers/sync.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/synapse/handlers/sync.py b/synapse/handlers/sync.py
index 12a4cc8b57..8143171c11 100644
--- a/synapse/handlers/sync.py
+++ b/synapse/handlers/sync.py
@@ -606,13 +606,16 @@ class SyncHandler(object):
         since_token = sync_result_builder.since_token
         if since_token and not sync_result_builder.full_state:
             presence_key = since_token.presence_key
+            include_offline = True
         else:
             presence_key = None
+            include_offline = False
 
         presence, presence_key = yield presence_source.get_new_events(
             user=user,
             from_key=presence_key,
             is_guest=sync_config.is_guest,
+            include_offline=include_offline,
         )
         sync_result_builder.now_token = now_token.copy_and_replace(
             "presence_key", presence_key