revert
This commit is contained in:
@@ -104,11 +104,10 @@ def get_pending_command():
|
||||
|
||||
# Also return current farm settings so TM knows loot_option
|
||||
farm_row = c.execute(
|
||||
'SELECT enabled, bandit_camp_enabled, loot_option FROM farm_settings WHERE player_id = ?', (player_id,)
|
||||
'SELECT enabled, loot_option FROM farm_settings WHERE player_id = ?', (player_id,)
|
||||
).fetchone()
|
||||
farm_settings = {
|
||||
'enabled': bool(farm_row['enabled']) if farm_row else False,
|
||||
'bandit_camp_enabled': bool(farm_row['bandit_camp_enabled']) if farm_row else False,
|
||||
'loot_option': farm_row['loot_option'] if farm_row else 1
|
||||
}
|
||||
|
||||
|
||||
@@ -70,12 +70,12 @@ def get_farm_settings():
|
||||
player_id = request.args.get('player_id')
|
||||
conn = get_db()
|
||||
row = conn.execute(
|
||||
'SELECT enabled, bandit_camp_enabled, loot_option FROM farm_settings WHERE player_id = ?', (player_id,)
|
||||
'SELECT enabled, loot_option FROM farm_settings WHERE player_id = ?', (player_id,)
|
||||
).fetchone()
|
||||
conn.close()
|
||||
if row:
|
||||
return jsonify({'enabled': bool(row['enabled']), 'bandit_camp_enabled': bool(row['bandit_camp_enabled']), 'loot_option': row['loot_option']})
|
||||
return jsonify({'enabled': False, 'bandit_camp_enabled': False, 'loot_option': 1})
|
||||
return jsonify({'enabled': bool(row['enabled']), 'loot_option': row['loot_option']})
|
||||
return jsonify({'enabled': False, 'loot_option': 1})
|
||||
|
||||
@dashboard.route('/dashboard/farm-settings', methods=['POST'])
|
||||
def set_farm_settings():
|
||||
@@ -84,18 +84,16 @@ def set_farm_settings():
|
||||
return jsonify({'error': 'missing player_id'}), 400
|
||||
player_id = data['player_id']
|
||||
enabled = 1 if data.get('enabled') else 0
|
||||
bandit_camp_enabled = 1 if data.get('bandit_camp_enabled') else 0
|
||||
loot_option = int(data.get('loot_option', 1))
|
||||
conn = get_db()
|
||||
conn.execute('''
|
||||
INSERT INTO farm_settings (player_id, enabled, bandit_camp_enabled, loot_option, updated_at)
|
||||
VALUES (?, ?, ?, ?, ?)
|
||||
INSERT INTO farm_settings (player_id, enabled, loot_option, updated_at)
|
||||
VALUES (?, ?, ?, ?)
|
||||
ON CONFLICT(player_id) DO UPDATE SET
|
||||
enabled = excluded.enabled,
|
||||
bandit_camp_enabled = excluded.bandit_camp_enabled,
|
||||
loot_option = excluded.loot_option,
|
||||
updated_at = excluded.updated_at
|
||||
''', (player_id, enabled, bandit_camp_enabled, loot_option, datetime.utcnow().isoformat()))
|
||||
''', (player_id, enabled, loot_option, datetime.utcnow().isoformat()))
|
||||
conn.commit()
|
||||
conn.close()
|
||||
return jsonify({'ok': True})
|
||||
|
||||
Reference in New Issue
Block a user