chz-telegram-bot 0.0.31 → 0.0.32

package/dist/entities/actions/commandAction.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"commandAction.d.ts","sourceRoot":"","sources":["../../../entities/actions/commandAction.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAChE,OAAO,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AAGjD,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,EAAE,gBAAgB,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AAE1E,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAI3D,qBAAa,aAAa,CAAC,YAAY,SAAS,YAAY,CACxD,YAAW,gBAAgB;IAE3B,QAAQ,EAAE,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAC;IAC9B,OAAO,EAAE,cAAc,CAAC,YAAY,CAAC,CAAC;IACtC,IAAI,EAAE,MAAM,CAAC;IACb,iBAAiB,EAAE,OAAO,CAAC;IAC3B,MAAM,EAAE,OAAO,CAAC;IAChB,cAAc,EAAE,MAAM,EAAE,CAAC;IACzB,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,SAAS,EAAE,gBAAgB,CAAC,YAAY,CAAC,CAAC;IAC1C,gBAAgB,EAAE,MAAM,YAAY,CAAC;IACrC,GAAG,EAAE,SAAS,CAAC;gBAGX,OAAO,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,EAAE,GAAG,MAAM,EAAE,EAC9C,OAAO,EAAE,cAAc,CAAC,YAAY,CAAC,EACrC,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,OAAO,EACf,QAAQ,EAAE,OAAO,EACjB,cAAc,EAAE,MAAM,EAAE,EACxB,YAAY,EAAE,MAAM,EAAE,EACtB,SAAS,EAAE,gBAAgB,CAAC,YAAY,CAAC,EACzC,gBAAgB,EAAE,MAAM,YAAY;IAelC,IAAI,CAAC,GAAG,EAAE,cAAc,CAAC,YAAY,CAAC;IAgD5C,OAAO,CAAC,YAAY;CAmDvB"}
+{"version":3,"file":"commandAction.d.ts","sourceRoot":"","sources":["../../../entities/actions/commandAction.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAChE,OAAO,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AAGjD,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,EAAE,gBAAgB,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AAE1E,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAI3D,qBAAa,aAAa,CAAC,YAAY,SAAS,YAAY,CACxD,YAAW,gBAAgB;IAE3B,QAAQ,EAAE,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAC;IAC9B,OAAO,EAAE,cAAc,CAAC,YAAY,CAAC,CAAC;IACtC,IAAI,EAAE,MAAM,CAAC;IACb,iBAAiB,EAAE,OAAO,CAAC;IAC3B,MAAM,EAAE,OAAO,CAAC;IAChB,cAAc,EAAE,MAAM,EAAE,CAAC;IACzB,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,SAAS,EAAE,gBAAgB,CAAC,YAAY,CAAC,CAAC;IAC1C,gBAAgB,EAAE,MAAM,YAAY,CAAC;IACrC,GAAG,EAAE,SAAS,CAAC;gBAGX,OAAO,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,EAAE,GAAG,MAAM,EAAE,EAC9C,OAAO,EAAE,cAAc,CAAC,YAAY,CAAC,EACrC,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,OAAO,EACf,QAAQ,EAAE,OAAO,EACjB,cAAc,EAAE,MAAM,EAAE,EACxB,YAAY,EAAE,MAAM,EAAE,EACtB,SAAS,EAAE,gBAAgB,CAAC,YAAY,CAAC,EACzC,gBAAgB,EAAE,MAAM,YAAY;IAelC,IAAI,CAAC,GAAG,EAAE,cAAc,CAAC,YAAY,CAAC;IAgD5C,OAAO,CAAC,YAAY;CAsDvB"}

package/dist/entities/actions/commandAction.js

@@ -54,31 +54,33 @@ class CommandAction {
             return commandTriggerCheckResult_1.CommandTriggerCheckResult.DontTriggerAndSkipCooldown;
         const isUserAllowed = this.allowedUsers.length == 0 ||
             this.allowedUsers.includes(ctx.fromUserId);
+        if (!isUserAllowed)
+            return commandTriggerCheckResult_1.CommandTriggerCheckResult.DontTriggerAndSkipCooldown;
         const lastExecutedDate = (0, moment_1.default)(state.lastExecutedDate);
         const cooldownInMilliseconds = (0, timeConvertions_1.secondsToMilliseconds)(this.cooldownInSeconds);
-        const notOnCooldown = (0, moment_1.default)().diff(lastExecutedDate) >= cooldownInMilliseconds;
-        if (isUserAllowed && notOnCooldown) {
-            if (typeof trigger == 'string') {
-                shouldTrigger = ctx.messageText.toLowerCase() == trigger;
-            }
-            else {
-                trigger.lastIndex = 0;
-                const execResult = trigger.exec(ctx.messageText);
-                if (execResult != null) {
-                    matchResults.push(execResult);
-                    if (trigger.global) {
-                        while (true) {
-                            const nextResult = trigger.exec(ctx.messageText);
-                            if (nextResult == null)
-                                break;
-                            matchResults.push(nextResult);
-                        }
+        const onCooldown = (0, moment_1.default)().diff(lastExecutedDate) < cooldownInMilliseconds;
+        if (onCooldown)
+            return commandTriggerCheckResult_1.CommandTriggerCheckResult.DoNotTrigger;
+        if (typeof trigger == 'string') {
+            shouldTrigger = ctx.messageText.toLowerCase() == trigger;
+        }
+        else {
+            trigger.lastIndex = 0;
+            const execResult = trigger.exec(ctx.messageText);
+            if (execResult != null) {
+                matchResults.push(execResult);
+                if (trigger.global) {
+                    while (true) {
+                        const nextResult = trigger.exec(ctx.messageText);
+                        if (nextResult == null)
+                            break;
+                        matchResults.push(nextResult);
                     }
                 }
-                shouldTrigger = matchResults.length > 0;
             }
+            shouldTrigger = matchResults.length > 0;
         }
-        return new commandTriggerCheckResult_1.CommandTriggerCheckResult(shouldTrigger, matchResults, !isUserAllowed);
+        return new commandTriggerCheckResult_1.CommandTriggerCheckResult(shouldTrigger, matchResults, false);
     }
 }
 exports.CommandAction = CommandAction;

package/dist/entities/botInstance.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"botInstance.d.ts","sourceRoot":"","sources":["../../entities/botInstance.ts"],"names":[],"mappings":"AAKA,OAAO,EAAuB,OAAO,EAAE,MAAM,qBAAqB,CAAC;AACnE,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAGlD,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAM5D,qBAAa,WAAW;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,GAAG,CAAqB;IAChC,OAAO,CAAC,QAAQ,CAAW;IAC3B,OAAO,CAAC,QAAQ,CAAgC;IAChD,OAAO,CAAC,SAAS,CAAkC;IACnD,OAAO,CAAC,KAAK,CAAyB;IACtC,OAAO,EAAE,cAAc,CAAC;gBAEZ,OAAO,EAAE;QACjB,IAAI,EAAE,MAAM,CAAC;QACb,KAAK,EAAE,MAAM,CAAC;QACd,QAAQ,EAAE,aAAa,CAAC,YAAY,CAAC,EAAE,CAAC;QACxC,SAAS,EAAE,eAAe,CAAC,YAAY,CAAC,EAAE,CAAC;QAC3C,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QAC9B,aAAa,CAAC,EAAE,cAAc,CAAC;QAC/B,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,eAAe,CAAC,EAAE,OAAO,CAAC;KAC7B;IAmCD,OAAO,CAAC,6BAA6B;IA6CrC,OAAO,CAAC,2BAA2B;IAsB7B,IAAI,CAAC,IAAI,EAAE,MAAM;YAYT,YAAY;YAyBZ,cAAc;CAmB/B"}
+{"version":3,"file":"botInstance.d.ts","sourceRoot":"","sources":["../../entities/botInstance.ts"],"names":[],"mappings":"AAKA,OAAO,EAAuB,OAAO,EAAE,MAAM,qBAAqB,CAAC;AACnE,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAGlD,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAM5D,qBAAa,WAAW;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,GAAG,CAAqB;IAChC,OAAO,CAAC,QAAQ,CAAW;IAC3B,OAAO,CAAC,QAAQ,CAAgC;IAChD,OAAO,CAAC,SAAS,CAAkC;IACnD,OAAO,CAAC,KAAK,CAAyB;IACtC,OAAO,EAAE,cAAc,CAAC;gBAEZ,OAAO,EAAE;QACjB,IAAI,EAAE,MAAM,CAAC;QACb,KAAK,EAAE,MAAM,CAAC;QACd,QAAQ,EAAE,aAAa,CAAC,YAAY,CAAC,EAAE,CAAC;QACxC,SAAS,EAAE,eAAe,CAAC,YAAY,CAAC,EAAE,CAAC;QAC3C,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QAC9B,aAAa,CAAC,EAAE,cAAc,CAAC;QAC/B,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,eAAe,CAAC,EAAE,OAAO,CAAC;KAC7B;IAmCD,OAAO,CAAC,6BAA6B;IA4CrC,OAAO,CAAC,2BAA2B;IAsB7B,IAAI,CAAC,IAAI,EAAE,MAAM;YAYT,YAAY;YAyBZ,cAAc;CAmB/B"}

package/dist/entities/botInstance.js

@@ -33,13 +33,13 @@ class BotInstance {
     initializeScheduledProcessing(period) {
         if (this.scheduled.length > 0) {
             const now = (0, moment_1.default)();
-            let nextExecutionTime = now.clone().startOf('hour');
             if (now.minute() == 0 && now.second() == 0) {
                 taskScheduler_1.Scheduler.createTask('ScheduledProcessing', async () => {
                     await this.runScheduled();
                 }, (0, timeConvertions_1.secondsToMilliseconds)(period), true, this.name);
                 return;
             }
+            let nextExecutionTime = now.clone().startOf('hour');
             if (now.minute() > 0 || now.second() > 0) {
                 nextExecutionTime = nextExecutionTime.add(1, 'hour');
             }

package/entities/actions/commandAction.ts

@@ -112,40 +112,43 @@ export class CommandAction<TActionState extends IActionState>
             this.allowedUsers.length == 0 ||
             this.allowedUsers.includes(ctx.fromUserId);
 
+        if (!isUserAllowed)
+            return CommandTriggerCheckResult.DontTriggerAndSkipCooldown;
+
         const lastExecutedDate = moment(state.lastExecutedDate);
         const cooldownInMilliseconds = secondsToMilliseconds(
             this.cooldownInSeconds
         );
-        const notOnCooldown =
-            moment().diff(lastExecutedDate) >= cooldownInMilliseconds;
-
-        if (isUserAllowed && notOnCooldown) {
-            if (typeof trigger == 'string') {
-                shouldTrigger = ctx.messageText.toLowerCase() == trigger;
-            } else {
-                trigger.lastIndex = 0;
-
-                const execResult = trigger.exec(ctx.messageText);
-                if (execResult != null) {
-                    matchResults.push(execResult);
-
-                    if (trigger.global) {
-                        while (true) {
-                            const nextResult = trigger.exec(ctx.messageText);
-                            if (nextResult == null) break;
-                            matchResults.push(nextResult);
-                        }
+        const onCooldown =
+            moment().diff(lastExecutedDate) < cooldownInMilliseconds;
+
+        if (onCooldown) return CommandTriggerCheckResult.DoNotTrigger;
+
+        if (typeof trigger == 'string') {
+            shouldTrigger = ctx.messageText.toLowerCase() == trigger;
+        } else {
+            trigger.lastIndex = 0;
+
+            const execResult = trigger.exec(ctx.messageText);
+            if (execResult != null) {
+                matchResults.push(execResult);
+
+                if (trigger.global) {
+                    while (true) {
+                        const nextResult = trigger.exec(ctx.messageText);
+                        if (nextResult == null) break;
+                        matchResults.push(nextResult);
                     }
                 }
-
-                shouldTrigger = matchResults.length > 0;
             }
+
+            shouldTrigger = matchResults.length > 0;
         }
 
         return new CommandTriggerCheckResult(
             shouldTrigger,
             matchResults,
-            !isUserAllowed
+            false
         );
     }
 }

package/entities/botInstance.ts

@@ -72,8 +72,6 @@ export class BotInstance {
         if (this.scheduled.length > 0) {
             const now = moment();
 
-            let nextExecutionTime = now.clone().startOf('hour');
-
             if (now.minute() == 0 && now.second() == 0) {
                 Scheduler.createTask(
                     'ScheduledProcessing',
@@ -88,6 +86,7 @@ export class BotInstance {
                 return;
             }
 
+            let nextExecutionTime = now.clone().startOf('hour');
             if (now.minute() > 0 || now.second() > 0) {
                 nextExecutionTime = nextExecutionTime.add(1, 'hour');
             }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "chz-telegram-bot",
-    "version": "0.0.31",
+    "version": "0.0.32",
     "type": "module",
     "dependencies": {
         "async-sema": "^3.1.1",