From f6f4df05bf0ee1e2d651d6babe79ea6a877b900b Mon Sep 17 00:00:00 2001 From: haunter Date: Fri, 24 Apr 2026 20:18:14 +0300 Subject: [PATCH] fix farm --- routes/dashboard.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/routes/dashboard.py b/routes/dashboard.py index e2e5d86..2fa433e 100644 --- a/routes/dashboard.py +++ b/routes/dashboard.py @@ -117,14 +117,14 @@ def get_farm_data(): for row in rows: d = json.loads(row['data']) farm_data = d.get('farms', []) - ready = [f for f in farm_data if f.get('lootable_at', 0) <= now_ts] + ready = [f for f in farm_data if f.get('lootable_at', 0) <= now_ts and f.get('relation_status', 0) == 1] if farm_data: farms_summary.append({ 'town_id': row['town_id'], 'town_name': row['town_name'], 'total_farms': len(farm_data), 'ready_farms': len(ready), - 'next_ready_at': min((f['lootable_at'] for f in farm_data if f.get('lootable_at', 0) > now_ts), default=None) + 'next_ready_at': min((f['lootable_at'] for f in farm_data if f.get('lootable_at', 0) > now_ts and f.get('relation_status', 0) == 1), default=None) }) return jsonify(farms_summary)