farm fix between worlds
This commit is contained in:
@@ -122,14 +122,22 @@ def set_farm_settings():
|
||||
@dashboard.route('/dashboard/farm-data', methods=['GET'])
|
||||
def get_farm_data():
|
||||
player_id = request.args.get('player_id')
|
||||
world_id = request.args.get('world_id')
|
||||
conn = get_db()
|
||||
rows = conn.execute(
|
||||
'SELECT town_id, town_name, data FROM town_state WHERE player_id = ?', (player_id,)
|
||||
).fetchall()
|
||||
if world_id:
|
||||
rows = conn.execute(
|
||||
'SELECT town_id, town_name, data FROM town_state WHERE player_id = ? AND world_id = ?',
|
||||
(player_id, world_id)
|
||||
).fetchall()
|
||||
else:
|
||||
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
|
||||
# Also fetch when the bot last farmed (per world)
|
||||
lf_key = f'last_farmed_{player_id}_{world_id}' if world_id else f'last_farmed_{player_id}'
|
||||
lf_row = conn.execute(
|
||||
"SELECT value FROM kv_store WHERE key = ?", (f'last_farmed_{player_id}',)
|
||||
"SELECT value FROM kv_store WHERE key = ?", (lf_key,)
|
||||
).fetchone()
|
||||
last_farmed_at = lf_row['value'] if lf_row else None
|
||||
conn.close()
|
||||
|
||||
Reference in New Issue
Block a user