paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-10-26 09:34:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

mypy: Fix no-redef errors from django-stubs.

Browse Source 
Signed-off-by: Anders Kaseorg <anders@zulip.com>
(cherry picked from commit 1d694aeff4)
This commit is contained in:
Anders Kaseorg
2025-09-19 17:26:14 -07:00
committed by Alex Vandiver
parent 99445ce496
commit ad7eed2d7e
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
zerver/lib/soft_deactivation.py
View File

@@ -344,13 +344,13 @@ def get_users_for_soft_deactivation(
**filter_kwargs, **filter_kwargs,
) )
.values("user_profile_id") .values("user_profile_id")
.annotate(last_visit=Max("last_visit")) .annotate(max_last_visit=Max("last_visit"))
) )
today = timezone_now() today = timezone_now()
user_ids_to_deactivate = [ user_ids_to_deactivate = [
user_activity["user_profile_id"] user_activity["user_profile_id"]
for user_activity in users_activity for user_activity in users_activity
if (today - user_activity["last_visit"]).days > inactive_for_days if (today - user_activity["max_last_visit"]).days > inactive_for_days
] ]
users_to_deactivate = list(UserProfile.objects.filter(id__in=user_ids_to_deactivate)) users_to_deactivate = list(UserProfile.objects.filter(id__in=user_ids_to_deactivate))
return users_to_deactivate return users_to_deactivate

4
zerver/lib/stream_traffic.py
View File

@@ -24,10 +24,10 @@ def get_streams_traffic(stream_ids: set[int], realm: Realm) -> dict[int, int] |
end_time__gt=traffic_from, end_time__gt=traffic_from,
) )
traffic_list = query.values("stream_id").annotate(value=Sum("value")) traffic_list = query.values("stream_id").annotate(sum_value=Sum("value"))
traffic_dict = {} traffic_dict = {}
for traffic in traffic_list: for traffic in traffic_list:
traffic_dict[traffic["stream_id"]] = traffic["value"] traffic_dict[traffic["stream_id"]] = traffic["sum_value"]
return traffic_dict return traffic_dict