@everyone button box reward

server/src/services/buttonBoxService/httpRoute.js

@@ -8,7 +8,6 @@ function registerButtonBoxRoute(deps) {
     app,
     logger,
     buttonCount,
-    getRequestIp,
     normalizeIp,
     isLocalNetwork,
     applyPress,
@@ -21,8 +20,16 @@ function registerButtonBoxRoute(deps) {
     return null;
   }
 
+  function getSocketIp(req) {
+    return (
+      req?.socket?.remoteAddress ||
+      req?.connection?.remoteAddress ||
+      null
+    );
+  }
+
   function denyIfNotLocal(req, res) {
-    const ip = normalizeIp(getRequestIp(req));
+    const ip = normalizeIp(getSocketIp(req));
     if (isLocalNetwork(ip)) {
       return false;
     }

server/src/services/buttonBoxService/index.js

@@ -19,7 +19,7 @@ const {
   setEntityState: setHomeAssistantEntityState,
   setLightsLockedOn: setHomeAssistantLightsLockedOn,
 } = require('../homeAssistantService');
-const { getRequestIp, isLocalNetwork, normalizeIp } = require('../../helpers/ipResolver');
+const { isLocalNetwork, normalizeIp } = require('../../helpers/ipResolver');
 const { createButtonBoxStore } = require('./store');
 const { createButtonBoxCore } = require('./core');
 const { registerButtonBoxRoute } = require('./httpRoute');
@@ -66,7 +66,6 @@ registerButtonBoxRoute({
   app,
   logger,
   buttonCount: BUTTON_COUNT,
-  getRequestIp,
   normalizeIp,
   isLocalNetwork,
   applyPress: core.applyPress,

server/src/services/discordBotService/integrations/busEvents.js

@@ -250,6 +250,19 @@ function createBusEventHandler(deps) {
         });
         break;
       }
+      case 'buttonBox.discordPingEveryone': {
+        const message = payload?.message ? String(payload.message) : 'Button box chaos reward triggered.';
+        sendToChannel(
+          channels.general,
+          `@everyone ${message}`.trim(),
+          {
+            embeds: [buildEmbed({ title: 'Button Box', description: message, color: 0xff3b30, includeSiteUrl: false })],
+          },
+          { parse: ['everyone'] },
+          false,
+        );
+        break;
+      }
       default:
         break;
     }