Mj2 : modular and prepare for client options

routes/api.py

@@ -134,37 +134,48 @@ def get_pending_command():
     conn = get_db()
     c = conn.cursor()
 
-    build_cmd   = _fetch_pending_of_type(c, 'build', player_id)
-    recruit_cmd = _fetch_pending_of_type(c, 'recruit', player_id)
-    market_cmd  = _fetch_pending_of_type(c, 'market_offer', player_id)
-    farm_cmd    = _fetch_pending_of_type(c, 'farm_loot', player_id)
+    build_cmd        = _fetch_pending_of_type(c, 'build', player_id)
+    recruit_cmd      = _fetch_pending_of_type(c, 'recruit', player_id)
+    market_cmd       = _fetch_pending_of_type(c, 'market_offer', player_id)
+    farm_cmd         = _fetch_pending_of_type(c, 'farm_loot', player_id)
     farm_upgrade_cmd = _fetch_pending_of_type(c, 'farm_upgrade', player_id)
-    research_cmd = _fetch_pending_of_type(c, 'research', player_id)
-    sync_req    = _check_and_reset_sync(c, player_id)
+    research_cmd     = _fetch_pending_of_type(c, 'research', player_id)
+    sync_req         = _check_and_reset_sync(c, player_id)
 
-    # Also return current farm settings so TM knows loot_option
+    # Farm settings
     farm_row = c.execute(
         '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,
-        'loot_option': farm_row['loot_option'] if farm_row else 1
+        'enabled':     bool(farm_row['enabled']) if farm_row else False,
+        'loot_option': farm_row['loot_option']   if farm_row else 1
     }
 
+    # Feature flags — look up this player's authorized features from their clan
+    member_row = c.execute(
+        'SELECT features FROM clan_members WHERE player_id = ?', (str(player_id),)
+    ).fetchone()
+    if member_row and member_row['features']:
+        enabled_features = [f.strip() for f in member_row['features'].split(',') if f.strip()]
+    else:
+        enabled_features = ['farm', 'admin']  # default: all on (backward-compatible)
+
     conn.commit()
     conn.close()
 
     return jsonify({
-        'build':         build_cmd,
-        'recruit':       recruit_cmd,
-        'market':        market_cmd,
-        'research':      research_cmd,
-        'farm':          farm_cmd,
-        'farm_upgrade':  farm_upgrade_cmd,
-        'farm_settings': farm_settings,
-        'sync_requested': sync_req
+        'build':            build_cmd,
+        'recruit':          recruit_cmd,
+        'market':           market_cmd,
+        'research':         research_cmd,
+        'farm':             farm_cmd,
+        'farm_upgrade':     farm_upgrade_cmd,
+        'farm_settings':    farm_settings,
+        'enabled_features': enabled_features,
+        'sync_requested':   sync_req
     })
 
+
 def _check_and_reset_sync(c, player_id):
     key = f'sync_request_{player_id}'
     row = c.execute("SELECT value FROM kv_store WHERE key = ?", (key,)).fetchone()

routes/auth.py

@@ -140,7 +140,9 @@ def options():
                 'player_id':   row['player_id'],
                 'player_name': row['player_name'] or 'Άγνωστος',
                 'joined_at':   row['joined_at'][:10] if row['joined_at'] else '',
-                'is_online':   is_online
+                'is_online':   is_online,
+                'feat_farm':   'farm'  in (row['features'] or 'farm,admin'),
+                'feat_admin':  'admin' in (row['features'] or 'farm,admin'),
             })
 
     conn.close()
@@ -191,9 +193,6 @@ def regenerate_key():
     return redirect(url_for('auth.options'))
 
 
-# ------------------------------------------------------------------
-# POST /auth/clan/remove-member/<player_id>
-# ------------------------------------------------------------------
 @auth.route('/auth/clan/remove-member/<player_id>', methods=['POST'])
 @login_required
 def remove_member(player_id):
@@ -209,3 +208,28 @@ def remove_member(player_id):
         conn.commit()
     conn.close()
     return redirect(url_for('auth.options'))
+
+
+# ------------------------------------------------------------------
+# POST /auth/clan/update-features/<player_id>
+# ------------------------------------------------------------------
+@auth.route('/auth/clan/update-features/<player_id>', methods=['POST'])
+@login_required
+def update_member_features(player_id):
+    farm  = 'farm'  if request.form.get('farm')  else None
+    admin = 'admin' if request.form.get('admin') else None
+    features = ','.join(f for f in [farm, admin] if f) or ''
+
+    conn = get_db()
+    clan = conn.execute(
+        'SELECT id FROM clans WHERE owner_id = ?', (current_user.id,)
+    ).fetchone()
+    if clan:
+        conn.execute(
+            'UPDATE clan_members SET features = ? WHERE clan_id = ? AND player_id = ?',
+            (features, clan['id'], player_id)
+        )
+        conn.commit()
+    conn.close()
+    return redirect(url_for('auth.options'))
+