fix: resolve merge conflicts and remove debug code

Author: Bill Chirico

node_modules

@@ -1,48 +1,36 @@
+import { warn } from '../../logger.js';
 import { getConfig } from '../../modules/config.js';
 import { getBotOwnerIds } from '../../utils/permissions.js';
-import { warn } from '../../logger.js';
 
 /**
  * Middleware: restrict to API-secret callers or bot-owner OAuth users.
  */
 export function requireGlobalAdmin(forResource, req, res, next) {
-  console.error('[DEBUG] requireGlobalAdmin called');
-  console.error('[DEBUG] arguments.length:', arguments.length);
-  console.error('[DEBUG] typeof forResource:', typeof forResource);
-  
   // Support both requireGlobalAdmin(req, res, next) and requireGlobalAdmin('Resource', req, res, next)
   if (arguments.length === 3) {
-    console.error('[DEBUG] 3-arg case: shifting parameters');
     // Called as requireGlobalAdmin(req, res, next)
     // Parameters are shifted: forResource=req, req=res, res=next, next=undefined
-    next = res;      // res parameter is actually the next function
-    res = req;       // req parameter is actually the res object
+    next = res; // res parameter is actually the next function
+    res = req; // req parameter is actually the res object
     req = forResource; // forResource is the actual req object
     forResource = 'Global admin access';
   } else {
     forResource = forResource || 'Global admin access';
   }
 
-  console.error('[DEBUG] After shift - authMethod:', req.authMethod, 'userId:', req.user?.userId);
-  
   if (req.authMethod === 'api-secret') {
-    console.error('[DEBUG] api-secret - calling next()');
     return next();
   }
 
   if (req.authMethod === 'oauth') {
     const config = getConfig();
     const botOwners = getBotOwnerIds(config);
-    console.error('[DEBUG] oauth - botOwners:', botOwners, 'userId:', req.user?.userId);
     if (botOwners.includes(req.user?.userId)) {
-      console.error('[DEBUG] oauth owner - calling next()');
       return next();
     }
-    console.error('[DEBUG] oauth non-owner - returning 403');
     return res.status(403).json({ error: `${forResource} requires bot owner permissions` });
   }
 
-  console.error('[DEBUG] unknown authMethod - returning 401');
   warn('Unknown authMethod in global admin check', {
     authMethod: req.authMethod,
     path: req.path,

src/api/middleware/requireGlobalAdmin.js

@@ -82,9 +82,7 @@ export function validateConfigSchema(config) {
  *       "403":
  *         $ref: "#/components/responses/Forbidden"
  */
-router.get("/", requireGlobalAdmin, (req, res) => {
-  const fs = require("fs");
-  try { fs.writeFileSync("/tmp/config-route.log", "Route handler called at " + Date.now()); } catch(e) {}
+router.get('/', requireGlobalAdmin, (req, res) => {
   const config = getConfig();
   const safeConfig = {};
 

src/api/routes/config.js

@@ -520,6 +520,7 @@ async function startup() {
     startGithubFeed(client);
     startScheduledBackups();
     startVoiceFlush();
+  }
   // Load commands and login
   await loadCommands();
   await client.login(token);