enchance farming/fix

This commit is contained in:
2026-04-29 23:22:25 +03:00
parent 2517538b88
commit 0643422a30
4 changed files with 154 additions and 73 deletions

View File

@@ -126,6 +126,12 @@ def get_farm_data():
rows = conn.execute(
'SELECT town_id, town_name, data FROM town_state WHERE player_id = ?', (player_id,)
).fetchall()
# Also fetch when the bot last farmed
lf_row = conn.execute(
"SELECT value FROM kv_store WHERE key = ?", (f'last_farmed_{player_id}',)
).fetchone()
last_farmed_at = lf_row['value'] if lf_row else None
conn.close()
now_ts = int(datetime.utcnow().timestamp())
@@ -142,7 +148,7 @@ def get_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 and f.get('relation_status', 0) == 1), default=None)
})
return jsonify(farms_summary)
return jsonify({'towns': farms_summary, 'last_farmed_at': last_farmed_at})
# ------------------------------------------------------------------