From f2e7f4cb671b4d6893ca551c92e155b331a4bee9 Mon Sep 17 00:00:00 2001 From: Luke Faraone Date: Tue, 16 Dec 2014 22:56:45 -0800 Subject: [PATCH] Revert "Exclude dormant users from the buddy list." Resolves a AmbiguousTimeError. Approved by Leo. This reverts commit ebfaeb97ffda22b618be7a9206877f9d2ec53404. (imported from commit 42b29c6c57eb954952a740bc89611031cef1834a) --- zerver/models.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/zerver/models.py b/zerver/models.py index 844f35cd23..814b07ef8f 100644 --- a/zerver/models.py +++ b/zerver/models.py @@ -28,7 +28,6 @@ import pylibmc import re import ujson import logging -import datetime bugdown = None @@ -1153,9 +1152,7 @@ class UserPresence(models.Model): def get_status_dict_by_realm(realm_id): user_statuses = defaultdict(dict) - dormancy_cutoff_date = datetime.datetime.now() - datetime.timedelta(days=45) query = UserPresence.objects.filter( - timestamp__gte=dormancy_cutoff_date, user_profile__realm_id=realm_id, user_profile__is_active=True, user_profile__is_bot=False