From 79aaf8893b6bae37f30349e7f8ffa9882c129511 Mon Sep 17 00:00:00 2001
From: CKY- <xx_cky_xx@hotmail.com>
Date: Thu, 12 Dec 2024 11:08:12 -0700
Subject: [PATCH 1/2] feat: add send as reply as an option in restrictions

---
 .../chat/commands/chat-command-handler.ts      |  2 +-
 .../restrictions/restrictionsSection.js        | 18 +++++++++++++++---
 src/types/restrictions.d.ts                    |  3 +++
 3 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/src/backend/chat/commands/chat-command-handler.ts b/src/backend/chat/commands/chat-command-handler.ts
index 2bb84bfa8..3717afaa1 100644
--- a/src/backend/chat/commands/chat-command-handler.ts
+++ b/src/backend/chat/commands/chat-command-handler.ts
@@ -258,7 +258,7 @@ class CommandHandler {
                             .replace("{reason}", reason),
                         null,
                         null,
-                        firebotChatMessage.id
+                        restrictionData.sendAsReply === true ? firebotChatMessage.id : undefined
                     );
                 }
 
diff --git a/src/gui/app/directives/restrictions/restrictionsSection.js b/src/gui/app/directives/restrictions/restrictionsSection.js
index 9dc388329..5bf9b3f0c 100644
--- a/src/gui/app/directives/restrictions/restrictionsSection.js
+++ b/src/gui/app/directives/restrictions/restrictionsSection.js
@@ -59,7 +59,14 @@
                                 <i class="far fa-plus"></i>
                         </div>
                     </div>
+
                     <div class="ml-3.5" ng-show="$ctrl.restrictionData.restrictions.length > 0">
+                        <firebot-checkbox ng-show="$ctrl.trigger.name !== 'channel_reward'"
+                            label="Send as reply"
+                            tooltip="Replying only works within a Command or Chat Message event"
+                            model="$ctrl.restrictionData.sendAsReply"
+                            style="margin: 0px 15px 0px 0px"
+                        />
                         <label class="control-fb control--checkbox"> Send chat message when restrictions not met
                             <input type="checkbox" ng-model="$ctrl.restrictionData.sendFailMessage">
                             <div class="control__indicator"></div>
@@ -91,7 +98,7 @@
                 const $ctrl = this;
 
                 const restrictionDefinitions = backendCommunicator.fireEventSync("getRestrictions")
-                    .map(r => {
+                    .map((r) => {
                         return {
                             definition: r.definition,
                             optionsTemplate: r.optionsTemplate,
@@ -127,7 +134,8 @@
                             mode: "all",
                             sendFailMessage: true,
                             useCustomFailMessage: false,
-                            failMessage: DEFAULT_FAIL_MESSAGE
+                            failMessage: DEFAULT_FAIL_MESSAGE,
+                            sendAsReply: false
                         };
                     }
 
@@ -147,6 +155,10 @@
                         $ctrl.restrictionData.failMessage = DEFAULT_FAIL_MESSAGE;
                     }
 
+                    if ($ctrl.restrictionData.sendAsReply == null) {
+                        $ctrl.restrictionData.sendAsReply = false;
+                    }
+
                     updateCanAddMoreRestrictions();
                 };
 
@@ -165,7 +177,7 @@
 
                     const options = restrictionDefinitions
                         .filter(r => !r.definition.hidden)
-                        .map(r => {
+                        .map((r) => {
                             return {
                                 id: r.definition.id,
                                 name: r.definition.name,
diff --git a/src/types/restrictions.d.ts b/src/types/restrictions.d.ts
index 39c2d9ff9..f907aff34 100644
--- a/src/types/restrictions.d.ts
+++ b/src/types/restrictions.d.ts
@@ -1,3 +1,5 @@
+import bodyParser from "body-parser";
+
 export type RestrictionData = {
     /**
      * Sets the command to only trigger when all/any/none of the restrictions pass.
@@ -10,4 +12,5 @@ export type RestrictionData = {
     useCustomFailMessage?: boolean;
     failMessage?: string;
     restrictions: unknown[]; // TODO: change when restriction-manager and companion types are added
+    sendAsReply?:boolean;
 };
\ No newline at end of file

From cdc0fe140a1608bb910d810894b44db94b55492e Mon Sep 17 00:00:00 2001
From: CKY- <xx_cky_xx@hotmail.com>
Date: Wed, 25 Dec 2024 01:18:26 -0700
Subject: [PATCH 2/2] removed import

---
 src/types/restrictions.d.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/types/restrictions.d.ts b/src/types/restrictions.d.ts
index f907aff34..3e7730e07 100644
--- a/src/types/restrictions.d.ts
+++ b/src/types/restrictions.d.ts
@@ -1,4 +1,3 @@
-import bodyParser from "body-parser";
 
 export type RestrictionData = {
     /**