chz-telegram-bot 0.3.18 → 0.3.19

package/builtin/helpAction.ts

@@ -2,13 +2,16 @@ import { CommandActionBuilder } from '../helpers/builders/commandActionBuilder';
 import { Seconds } from '../types/timeValues';
 
 export function buildHelpCommand(readmes: string[], botUsername: string) {
-    return new CommandActionBuilder('Reaction.Help')
+    const helpCommandBuilder = new CommandActionBuilder('Reaction.Help')
         .on(['/help', `/help@${botUsername}`])
         .do((ctx) => {
-            if (readmes.length == 0) return;
-
             ctx.reply.withText(readmes.join('\n\n'));
         })
-        .cooldown(60 as Seconds)
-        .build();
+        .withCooldown({
+            seconds: 60 as Seconds
+        });
+
+    if (readmes.length == 0) helpCommandBuilder.disabled();
+
+    return helpCommandBuilder.build();
 }

package/bun.lock

@@ -14,7 +14,7 @@
         "@types/node": "^22.5.5",
         "eslint": "^9.29.0",
         "globals": "^16.2.0",
-        "typescript": "^5.6.2",
+        "typescript": "^5.9.0-beta",
         "typescript-eslint": "^8.34.1",
       },
     },
@@ -270,7 +270,7 @@
 
     "type-check": ["type-check@0.4.0", "", { "dependencies": { "prelude-ls": "^1.2.1" } }, "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew=="],
 
-    "typescript": ["typescript@5.8.3", "", { "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" } }, "sha512-p1diW6TqL9L07nNxvRMM7hMMw4c5XOo/1ibL4aAIGmSAt9slTE1Xgw5KWuof2uTOvCg9BY7ZRi+GaF+7sfgPeQ=="],
+    "typescript": ["typescript@5.9.0-beta", "", { "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" } }, "sha512-p91qoTdwWKj9YEBYavmGiBn0DF4OBElzw4pW4oPbK4HeCfr/SDz9+yviVWshZXGvGvFCJ3AVQ+J7F1UZXc23QQ=="],
 
     "typescript-eslint": ["typescript-eslint@8.34.1", "", { "dependencies": { "@typescript-eslint/eslint-plugin": "8.34.1", "@typescript-eslint/parser": "8.34.1", "@typescript-eslint/utils": "8.34.1" }, "peerDependencies": { "eslint": "^8.57.0 || ^9.0.0", "typescript": ">=4.8.4 <5.9.0" } }, "sha512-XjS+b6Vg9oT1BaIUfkW3M3LvqZE++rbzAMEHuccCfO/YkP43ha6w3jTEMilQxMF92nVOYCcdjv1ZUhAa1D/0ow=="],
 

package/dist/builtin/helpAction.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"helpAction.d.ts","sourceRoot":"","sources":["../../builtin/helpAction.ts"],"names":[],"mappings":"AAGA,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,WAAW,EAAE,MAAM,4DAUtE"}
+{"version":3,"file":"helpAction.d.ts","sourceRoot":"","sources":["../../builtin/helpAction.ts"],"names":[],"mappings":"AAGA,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,WAAW,EAAE,MAAM,4DAatE"}

package/dist/builtin/helpAction.js

@@ -3,13 +3,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.buildHelpCommand = buildHelpCommand;
 const commandActionBuilder_1 = require("../helpers/builders/commandActionBuilder");
 function buildHelpCommand(readmes, botUsername) {
-    return new commandActionBuilder_1.CommandActionBuilder('Reaction.Help')
+    const helpCommandBuilder = new commandActionBuilder_1.CommandActionBuilder('Reaction.Help')
         .on(['/help', `/help@${botUsername}`])
         .do((ctx) => {
-        if (readmes.length == 0)
-            return;
         ctx.reply.withText(readmes.join('\n\n'));
     })
-        .cooldown(60)
-        .build();
+        .withCooldown({
+        seconds: 60
+    });
+    if (readmes.length == 0)
+        helpCommandBuilder.disabled();
+    return helpCommandBuilder.build();
 }

package/dist/dtos/ActionPermissionsData.d.ts

@@ -0,0 +1,7 @@
+export declare class ActionPermissionsData {
+    readonly userIdsWhitelist: number[];
+    readonly chatIdsWhitelist: number[];
+    readonly chatIdsBlacklist: number[];
+    constructor(userIdsWhitelist: number[], chatIdsWhitelist: number[], chatIdsBlacklist: number[]);
+}
+//# sourceMappingURL=actionPermissionsData.d.ts.map

package/dist/dtos/ActionPermissionsData.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"actionPermissionsData.d.ts","sourceRoot":"","sources":["../../dtos/actionPermissionsData.ts"],"names":[],"mappings":"AAAA,qBAAa,qBAAqB;IAE1B,QAAQ,CAAC,gBAAgB,EAAE,MAAM,EAAE;IACnC,QAAQ,CAAC,gBAAgB,EAAE,MAAM,EAAE;IACnC,QAAQ,CAAC,gBAAgB,EAAE,MAAM,EAAE;gBAF1B,gBAAgB,EAAE,MAAM,EAAE,EAC1B,gBAAgB,EAAE,MAAM,EAAE,EAC1B,gBAAgB,EAAE,MAAM,EAAE;CAE1C"}

package/dist/dtos/ActionPermissionsData.js

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ActionPermissionsData = void 0;
+class ActionPermissionsData {
+    userIdsWhitelist;
+    chatIdsWhitelist;
+    chatIdsBlacklist;
+    constructor(userIdsWhitelist, chatIdsWhitelist, chatIdsBlacklist) {
+        this.userIdsWhitelist = userIdsWhitelist;
+        this.chatIdsWhitelist = chatIdsWhitelist;
+        this.chatIdsBlacklist = chatIdsBlacklist;
+    }
+}
+exports.ActionPermissionsData = ActionPermissionsData;

package/dist/dtos/commandTriggerCheckResult.d.ts

@@ -5,6 +5,8 @@ declare const _SkipTriggerReasonsObject: {
     readonly CustomConditionNotMet: "CustomConditionNotMet";
     readonly TriggerNotSatisfied: "TriggerNotSatisfied";
     readonly Other: "Other";
+    readonly ActionDisabled: "ActionDisabled";
+    readonly ChatForbidden: "ChatForbidden";
 };
 export type SkipTriggerReasons = keyof typeof _SkipTriggerReasonsObject;
 export declare class CommandTriggerCheckResult {

package/dist/dtos/commandTriggerCheckResult.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"commandTriggerCheckResult.d.ts","sourceRoot":"","sources":["../../dtos/commandTriggerCheckResult.ts"],"names":[],"mappings":"AAAA,QAAA,MAAM,yBAAyB;;;;;;;CAOrB,CAAC;AAEX,MAAM,MAAM,kBAAkB,GAAG,MAAM,OAAO,yBAAyB,CAAC;AAExE,qBAAa,yBAAyB;IAY9B,QAAQ,CAAC,aAAa,EAAE,OAAO;IAC/B,QAAQ,CAAC,YAAY,EAAE,eAAe,EAAE;IACxC,QAAQ,CAAC,YAAY,EAAE,OAAO;IAC9B,QAAQ,CAAC,MAAM,CAAC,EAAE,kBAAkB;IAdxC,MAAM,CAAC,0BAA0B,CAAC,MAAM,EAAE,kBAAkB;IAG5D,MAAM,CAAC,YAAY,CAAC,MAAM,EAAE,kBAAkB;IAG9C,MAAM,CAAC,OAAO;gBAKD,aAAa,EAAE,OAAO,EACtB,YAAY,EAAE,eAAe,EAAE,EAC/B,YAAY,EAAE,OAAO,EACrB,MAAM,CAAC,EAAE,kBAAkB,YAAA;IAGxC,SAAS,CAAC,KAAK,EAAE,yBAAyB;CAQ7C"}
+{"version":3,"file":"commandTriggerCheckResult.d.ts","sourceRoot":"","sources":["../../dtos/commandTriggerCheckResult.ts"],"names":[],"mappings":"AAAA,QAAA,MAAM,yBAAyB;;;;;;;;;CASrB,CAAC;AAEX,MAAM,MAAM,kBAAkB,GAAG,MAAM,OAAO,yBAAyB,CAAC;AAExE,qBAAa,yBAAyB;IAY9B,QAAQ,CAAC,aAAa,EAAE,OAAO;IAC/B,QAAQ,CAAC,YAAY,EAAE,eAAe,EAAE;IACxC,QAAQ,CAAC,YAAY,EAAE,OAAO;IAC9B,QAAQ,CAAC,MAAM,CAAC,EAAE,kBAAkB;IAdxC,MAAM,CAAC,0BAA0B,CAAC,MAAM,EAAE,kBAAkB;IAG5D,MAAM,CAAC,YAAY,CAAC,MAAM,EAAE,kBAAkB;IAG9C,MAAM,CAAC,OAAO;gBAKD,aAAa,EAAE,OAAO,EACtB,YAAY,EAAE,eAAe,EAAE,EAC/B,YAAY,EAAE,OAAO,EACrB,MAAM,CAAC,EAAE,kBAAkB,YAAA;IAGxC,SAAS,CAAC,KAAK,EAAE,yBAAyB;CAQ7C"}

package/dist/dtos/commandTriggerCheckResult.js

@@ -7,7 +7,9 @@ const _SkipTriggerReasonsObject = {
     OnCooldown: 'OnCooldown',
     CustomConditionNotMet: 'CustomConditionNotMet',
     TriggerNotSatisfied: 'TriggerNotSatisfied',
-    Other: 'Other'
+    Other: 'Other',
+    ActionDisabled: 'ActionDisabled',
+    ChatForbidden: 'ChatForbidden'
 };
 class CommandTriggerCheckResult {
     shouldExecute;

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

@@ -6,7 +6,7 @@ import { MessageContextInternal } from '../context/messageContext';
 import { CommandTrigger } from '../../types/commandTrigger';
 import { Sema as Semaphore } from 'async-sema';
 import { CooldownInfo } from '../../dtos/cooldownInfo';
-import { Seconds } from '../../types/timeValues';
+import { ActionPermissionsData } from '../../dtos/actionPermissionsData';
 export declare class CommandAction<TActionState extends IActionState> implements IActionWithState<TActionState> {
     readonly ratelimitSemaphores: Map<number, Semaphore>;
     readonly triggers: CommandTrigger[];
@@ -15,14 +15,15 @@ export declare class CommandAction<TActionState extends IActionState> implements
     readonly cooldownInfo: CooldownInfo;
     readonly active: boolean;
     readonly chatsBlacklist: number[];
-    readonly allowedUsers: number[];
+    readonly chatsWhitelist: number[];
+    readonly usersWhitelist: number[];
     readonly condition: CommandCondition<TActionState>;
     readonly stateConstructor: () => TActionState;
     readonly key: ActionKey;
     readonly readmeFactory: (botName: string) => string;
     readonly maxAllowedSimultaniousExecutions: number;
-    lastCustomCooldown: Seconds | undefined;
-    constructor(trigger: CommandTrigger | CommandTrigger[], handler: CommandHandler<TActionState>, name: string, active: boolean, cooldownInfo: CooldownInfo, chatsBlacklist: number[], allowedUsers: number[], maxAllowedSimultaniousExecutions: number, condition: CommandCondition<TActionState>, stateConstructor: () => TActionState, readmeFactory: (botName: string) => string);
+    private lastCustomCooldown;
+    constructor(trigger: CommandTrigger | CommandTrigger[], handler: CommandHandler<TActionState>, name: string, active: boolean, cooldownInfo: CooldownInfo, permissionsData: ActionPermissionsData, maxAllowedSimultaniousExecutions: number, condition: CommandCondition<TActionState>, stateConstructor: () => TActionState, readmeFactory: (botName: string) => string);
     exec(ctx: MessageContextInternal<TActionState>): Promise<import("../../types/response").BotResponse[]>;
     private checkIfShouldBeExecuted;
     private checkTrigger;

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;AAGhE,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,EAAE,gBAAgB,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAEjE,OAAO,EAAE,sBAAsB,EAAE,MAAM,2BAA2B,CAAC;AACnE,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAG5D,OAAO,EAAE,IAAI,IAAI,SAAS,EAAE,MAAM,YAAY,CAAC;AAE/C,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAGvD,OAAO,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AAEjD,qBAAa,aAAa,CAAC,YAAY,SAAS,YAAY,CACxD,YAAW,gBAAgB,CAAC,YAAY,CAAC;IAEzC,QAAQ,CAAC,mBAAmB,yBAAgC;IAE5D,QAAQ,CAAC,QAAQ,EAAE,cAAc,EAAE,CAAC;IACpC,QAAQ,CAAC,OAAO,EAAE,cAAc,CAAC,YAAY,CAAC,CAAC;IAC/C,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,YAAY,EAAE,YAAY,CAAC;IACpC,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC;IACzB,QAAQ,CAAC,cAAc,EAAE,MAAM,EAAE,CAAC;IAClC,QAAQ,CAAC,YAAY,EAAE,MAAM,EAAE,CAAC;IAChC,QAAQ,CAAC,SAAS,EAAE,gBAAgB,CAAC,YAAY,CAAC,CAAC;IACnD,QAAQ,CAAC,gBAAgB,EAAE,MAAM,YAAY,CAAC;IAC9C,QAAQ,CAAC,GAAG,EAAE,SAAS,CAAC;IACxB,QAAQ,CAAC,aAAa,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,MAAM,CAAC;IACpD,QAAQ,CAAC,gCAAgC,EAAE,MAAM,CAAC;IAElD,kBAAkB,EAAE,OAAO,GAAG,SAAS,CAAC;gBAGpC,OAAO,EAAE,cAAc,GAAG,cAAc,EAAE,EAC1C,OAAO,EAAE,cAAc,CAAC,YAAY,CAAC,EACrC,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,OAAO,EACf,YAAY,EAAE,YAAY,EAC1B,cAAc,EAAE,MAAM,EAAE,EACxB,YAAY,EAAE,MAAM,EAAE,EACtB,gCAAgC,EAAE,MAAM,EACxC,SAAS,EAAE,gBAAgB,CAAC,YAAY,CAAC,EACzC,gBAAgB,EAAE,MAAM,YAAY,EACpC,aAAa,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,MAAM;IAkBxC,IAAI,CAAC,GAAG,EAAE,sBAAsB,CAAC,YAAY,CAAC;IA8EpD,OAAO,CAAC,uBAAuB;IA0C/B,OAAO,CAAC,YAAY;CAuCvB"}
+{"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;AAGhE,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,EAAE,gBAAgB,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAEjE,OAAO,EAAE,sBAAsB,EAAE,MAAM,2BAA2B,CAAC;AACnE,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAG5D,OAAO,EAAE,IAAI,IAAI,SAAS,EAAE,MAAM,YAAY,CAAC;AAE/C,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAIvD,OAAO,EAAE,qBAAqB,EAAE,MAAM,kCAAkC,CAAC;AAEzE,qBAAa,aAAa,CAAC,YAAY,SAAS,YAAY,CACxD,YAAW,gBAAgB,CAAC,YAAY,CAAC;IAEzC,QAAQ,CAAC,mBAAmB,yBAAgC;IAE5D,QAAQ,CAAC,QAAQ,EAAE,cAAc,EAAE,CAAC;IACpC,QAAQ,CAAC,OAAO,EAAE,cAAc,CAAC,YAAY,CAAC,CAAC;IAC/C,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,YAAY,EAAE,YAAY,CAAC;IACpC,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC;IACzB,QAAQ,CAAC,cAAc,EAAE,MAAM,EAAE,CAAC;IAClC,QAAQ,CAAC,cAAc,EAAE,MAAM,EAAE,CAAC;IAClC,QAAQ,CAAC,cAAc,EAAE,MAAM,EAAE,CAAC;IAClC,QAAQ,CAAC,SAAS,EAAE,gBAAgB,CAAC,YAAY,CAAC,CAAC;IACnD,QAAQ,CAAC,gBAAgB,EAAE,MAAM,YAAY,CAAC;IAC9C,QAAQ,CAAC,GAAG,EAAE,SAAS,CAAC;IACxB,QAAQ,CAAC,aAAa,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,MAAM,CAAC;IACpD,QAAQ,CAAC,gCAAgC,EAAE,MAAM,CAAC;IAElD,OAAO,CAAC,kBAAkB,CAAsB;gBAG5C,OAAO,EAAE,cAAc,GAAG,cAAc,EAAE,EAC1C,OAAO,EAAE,cAAc,CAAC,YAAY,CAAC,EACrC,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,OAAO,EACf,YAAY,EAAE,YAAY,EAC1B,eAAe,EAAE,qBAAqB,EACtC,gCAAgC,EAAE,MAAM,EACxC,SAAS,EAAE,gBAAgB,CAAC,YAAY,CAAC,EACzC,gBAAgB,EAAE,MAAM,YAAY,EACpC,aAAa,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,MAAM;IAmBxC,IAAI,CAAC,GAAG,EAAE,sBAAsB,CAAC,YAAY,CAAC;IA2EpD,OAAO,CAAC,uBAAuB;IAyD/B,OAAO,CAAC,YAAY;CAuCvB"}

package/dist/entities/actions/commandAction.js

@@ -22,21 +22,23 @@ class CommandAction {
     cooldownInfo;
     active;
     chatsBlacklist;
-    allowedUsers;
+    chatsWhitelist;
+    usersWhitelist;
     condition;
     stateConstructor;
     key;
     readmeFactory;
     maxAllowedSimultaniousExecutions;
     lastCustomCooldown;
-    constructor(trigger, handler, name, active, cooldownInfo, chatsBlacklist, allowedUsers, maxAllowedSimultaniousExecutions, condition, stateConstructor, readmeFactory) {
+    constructor(trigger, handler, name, active, cooldownInfo, permissionsData, maxAllowedSimultaniousExecutions, condition, stateConstructor, readmeFactory) {
         this.triggers = (0, toArray_1.toArray)(trigger);
         this.handler = handler;
         this.name = name;
         this.cooldownInfo = cooldownInfo;
         this.active = active;
-        this.chatsBlacklist = chatsBlacklist;
-        this.allowedUsers = allowedUsers;
+        this.chatsBlacklist = permissionsData.chatIdsBlacklist;
+        this.chatsWhitelist = permissionsData.chatIdsWhitelist;
+        this.usersWhitelist = permissionsData.userIdsWhitelist;
         this.condition = condition;
         this.stateConstructor = stateConstructor;
         this.readmeFactory = readmeFactory;
@@ -47,8 +49,6 @@ class CommandAction {
     async exec(ctx) {
         if (!ctx.isInitialized)
             throw new Error(`Context for ${this.key} is not initialized or already consumed`);
-        if (!this.active || this.chatsBlacklist.includes(ctx.chatInfo.id))
-            return noop_1.Noop.NoResponse;
         let lock;
         if (this.maxAllowedSimultaniousExecutions != 0) {
             lock = (0, mapUtils_1.getOrSetIfNotExists)(this.ratelimitSemaphores, ctx.chatInfo.id, new async_sema_1.Sema(this.maxAllowedSimultaniousExecutions));
@@ -84,13 +84,20 @@ class CommandAction {
         }
     }
     checkIfShouldBeExecuted(ctx, trigger, state) {
+        if (!this.active)
+            return commandTriggerCheckResult_1.CommandTriggerCheckResult.DontTriggerAndSkipCooldown('ActionDisabled');
+        const isChatInBlacklist = this.chatsBlacklist.includes(ctx.chatInfo.id);
+        const isChatInWhitelist = this.chatsWhitelist.length != 0 &&
+            this.chatsWhitelist.includes(ctx.chatInfo.id);
+        if (isChatInBlacklist || !isChatInWhitelist)
+            return commandTriggerCheckResult_1.CommandTriggerCheckResult.DontTriggerAndSkipCooldown('ChatForbidden');
         const triggerCheckResult = this.checkTrigger(ctx, trigger);
         if (!triggerCheckResult.shouldExecute)
             return triggerCheckResult;
         if (!ctx.userInfo.id)
             return commandTriggerCheckResult_1.CommandTriggerCheckResult.DontTriggerAndSkipCooldown('UserIdMissing');
-        const isUserAllowed = this.allowedUsers.length == 0 ||
-            this.allowedUsers.includes(ctx.userInfo.id);
+        const isUserAllowed = this.usersWhitelist.length == 0 ||
+            this.usersWhitelist.includes(ctx.userInfo.id);
         if (!isUserAllowed)
             return commandTriggerCheckResult_1.CommandTriggerCheckResult.DontTriggerAndSkipCooldown('UserForbidden');
         const lastExecutedDate = (0, moment_1.default)(state.lastExecutedDate);

package/dist/helpers/builders/commandActionBuilder.d.ts

@@ -9,18 +9,19 @@ import { CommandTrigger } from '../../types/commandTrigger';
  * Builder for `CommandAction` with state represented by `TActionState`
  */
 export declare class CommandActionBuilderWithState<TActionState extends IActionState> {
-    name: string;
-    trigger: CommandTrigger | CommandTrigger[];
-    active: boolean;
-    readmeFactory: null | ((botName: string) => string);
-    cooldownSeconds: Seconds;
-    blacklist: number[];
-    allowedUsers: number[];
-    stateConstructor: () => TActionState;
-    handler: CommandHandler<TActionState>;
-    condition: CommandCondition<TActionState>;
-    maxAllowedSimultaniousExecutions: number;
-    cooldownMessage: string | undefined;
+    private readonly name;
+    private trigger;
+    private active;
+    private cooldownSeconds;
+    private blacklist;
+    private whitelist;
+    private allowedUsers;
+    private readmeFactory;
+    private readonly stateConstructor;
+    private handler;
+    private condition;
+    private maxAllowedSimultaniousExecutions;
+    private cooldownMessage;
     /**
      * Builder for `CommandAction` with state represented by `TActionState`
      * @param name Action name, will be used for logging and storage
@@ -38,6 +39,16 @@ export declare class CommandActionBuilderWithState<TActionState extends IActionS
      * @param id User id or ids
      */
     from(id: number | number[]): this;
+    /**
+     * Sets chats whitelist for this action.
+     * @param chatIds Chats ids to allow.
+     */
+    in(chatIds: number[]): this;
+    /**
+     * Sets chats blacklist for this action.
+     * @param chatIds Chats ids to ignore.
+     */
+    notIn(chatIds: number[]): this;
     /** Defines action logic itself, will be executed on trigger.
      * @param handler Callback that will be called on trigger
      */
@@ -46,24 +57,22 @@ export declare class CommandActionBuilderWithState<TActionState extends IActionS
      * @param condition Condition check predicate
      */
     when(condition: CommandCondition<TActionState>): this;
+    /**
+     * Sets factory method for readme (shown on /help) for this action.
+     * @param readmeFactory readme factory
+     */
     withHelp(readmeFactory: (botName: string) => string): this;
     /** If called during building, action is marked as disabled and never checked. */
     disabled(): this;
     /** Sets maximum number of simultaniously executing handlers for this command per chat. 0 is treated as unlimited. */
-    ratelimit(maxAllowedSimultaniousExecutions: number): this;
-    /** Sets action cooldown.
-     * @param seconds Cooldown in seconds.
-     */
-    cooldown(seconds: Seconds): this;
-    /** Sets action cooldown message.
-     * @param message Message that will be sent if action is on cooldown.
-     */
-    withCooldownMessage(message: string): this;
-    /**
-     * Adds a chat to ignore list for this action.
-     * @param chatId Chat id to ignore.
+    withRatelimit(maxAllowedSimultaniousExecutions: number): this;
+    /** Sets action cooldown settings.
+     * @param cooldownSettings Settings.
      */
-    ignoreChat(chatId: number): this;
+    withCooldown(cooldownSettings: {
+        seconds: Seconds;
+        message?: string;
+    }): this;
     /** Builds action */
     build(): CommandAction<TActionState>;
 }

package/dist/helpers/builders/commandActionBuilder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"commandActionBuilder.d.ts","sourceRoot":"","sources":["../../../helpers/builders/commandActionBuilder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAChE,OAAO,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AACjD,OAAO,EAAE,aAAa,EAAE,MAAM,sCAAsC,CAAC;AACrE,OAAO,EAAE,eAAe,EAAE,MAAM,uCAAuC,CAAC;AACxE,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAGvD,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAG5D;;GAEG;AACH,qBAAa,6BAA6B,CAAC,YAAY,SAAS,YAAY;IACxE,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,cAAc,GAAG,cAAc,EAAE,CAAM;IAEhD,MAAM,UAAQ;IACd,aAAa,EAAE,IAAI,GAAG,CAAC,CAAC,OAAO,EAAE,MAAM,KAAK,MAAM,CAAC,CAAQ;IAC3D,eAAe,EAAE,OAAO,CAAgB;IACxC,SAAS,EAAE,MAAM,EAAE,CAAM;IACzB,YAAY,EAAE,MAAM,EAAE,CAAM;IAC5B,gBAAgB,EAAE,MAAM,YAAY,CAAC;IACrC,OAAO,EAAE,cAAc,CAAC,YAAY,CAAC,CAAa;IAClD,SAAS,EAAE,gBAAgB,CAAC,YAAY,CAAC,CAAa;IACtD,gCAAgC,EAAE,MAAM,CAAK;IAC7C,eAAe,EAAE,MAAM,GAAG,SAAS,CAAC;IAEpC;;;;OAIG;gBACS,IAAI,EAAE,MAAM,EAAE,gBAAgB,EAAE,MAAM,YAAY;IAK9D;;;;;OAKG;IACH,EAAE,CAAC,OAAO,EAAE,cAAc,GAAG,cAAc,EAAE;IAM7C;;OAEG;IACH,IAAI,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM,EAAE;IAM1B;;OAEG;IACH,EAAE,CAAC,OAAO,EAAE,cAAc,CAAC,YAAY,CAAC;IAMxC;;OAEG;IACH,IAAI,CAAC,SAAS,EAAE,gBAAgB,CAAC,YAAY,CAAC;IAM9C,QAAQ,CAAC,aAAa,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,MAAM;IAMnD,iFAAiF;IACjF,QAAQ;IAMR,qHAAqH;IACrH,SAAS,CAAC,gCAAgC,EAAE,MAAM;IAOlD;;OAEG;IACH,QAAQ,CAAC,OAAO,EAAE,OAAO;IAMzB;;OAEG;IACH,mBAAmB,CAAC,OAAO,EAAE,MAAM;IAMnC;;;OAGG;IACH,UAAU,CAAC,MAAM,EAAE,MAAM;IAMzB,oBAAoB;IACpB,KAAK;CAeR;AAED;;GAEG;AACH,qBAAa,oBAAqB,SAAQ,6BAA6B,CAAC,eAAe,CAAC;IACpF;;OAEG;gBACS,IAAI,EAAE,MAAM;CAG3B"}
+{"version":3,"file":"commandActionBuilder.d.ts","sourceRoot":"","sources":["../../../helpers/builders/commandActionBuilder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAChE,OAAO,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AACjD,OAAO,EAAE,aAAa,EAAE,MAAM,sCAAsC,CAAC;AACrE,OAAO,EAAE,eAAe,EAAE,MAAM,uCAAuC,CAAC;AACxE,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAGvD,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAI5D;;GAEG;AACH,qBAAa,6BAA6B,CAAC,YAAY,SAAS,YAAY;IACxE,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAS;IAC9B,OAAO,CAAC,OAAO,CAAyC;IAExD,OAAO,CAAC,MAAM,CAAQ;IACtB,OAAO,CAAC,eAAe,CAAyB;IAChD,OAAO,CAAC,SAAS,CAAgB;IACjC,OAAO,CAAC,SAAS,CAAgB;IACjC,OAAO,CAAC,YAAY,CAAgB;IACpC,OAAO,CAAC,aAAa,CAAiD;IACtE,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAqB;IACtD,OAAO,CAAC,OAAO,CAA2C;IAC1D,OAAO,CAAC,SAAS,CAA6C;IAC9D,OAAO,CAAC,gCAAgC,CAAa;IACrD,OAAO,CAAC,eAAe,CAAqB;IAE5C;;;;OAIG;gBACS,IAAI,EAAE,MAAM,EAAE,gBAAgB,EAAE,MAAM,YAAY;IAK9D;;;;;OAKG;IACH,EAAE,CAAC,OAAO,EAAE,cAAc,GAAG,cAAc,EAAE;IAM7C;;OAEG;IACH,IAAI,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM,EAAE;IAM1B;;;OAGG;IACH,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE;IAMpB;;;OAGG;IACH,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE;IAMvB;;OAEG;IACH,EAAE,CAAC,OAAO,EAAE,cAAc,CAAC,YAAY,CAAC;IAMxC;;OAEG;IACH,IAAI,CAAC,SAAS,EAAE,gBAAgB,CAAC,YAAY,CAAC;IAM9C;;;OAGG;IACH,QAAQ,CAAC,aAAa,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,MAAM;IAMnD,iFAAiF;IACjF,QAAQ;IAMR,qHAAqH;IACrH,aAAa,CAAC,gCAAgC,EAAE,MAAM;IAOtD;;OAEG;IACH,YAAY,CAAC,gBAAgB,EAAE;QAAE,OAAO,EAAE,OAAO,CAAC;QAAC,OAAO,CAAC,EAAE,MAAM,CAAA;KAAE;IAOrE,oBAAoB;IACpB,KAAK;CAkBR;AAED;;GAEG;AACH,qBAAa,oBAAqB,SAAQ,6BAA6B,CAAC,eAAe,CAAC;IACpF;;OAEG;gBACS,IAAI,EAAE,MAAM;CAG3B"}

package/dist/helpers/builders/commandActionBuilder.js

@@ -6,6 +6,7 @@ const actionStateBase_1 = require("../../entities/states/actionStateBase");
 const toArray_1 = require("../toArray");
 const noop_1 = require("../noop");
 const cooldownInfo_1 = require("../../dtos/cooldownInfo");
+const actionPermissionsData_1 = require("../../dtos/actionPermissionsData");
 /**
  * Builder for `CommandAction` with state represented by `TActionState`
  */
@@ -13,10 +14,11 @@ class CommandActionBuilderWithState {
     name;
     trigger = [];
     active = true;
-    readmeFactory = null;
     cooldownSeconds = 0;
     blacklist = [];
+    whitelist = [];
     allowedUsers = [];
+    readmeFactory = noop_1.Noop.emptyString;
     stateConstructor;
     handler = noop_1.Noop.call;
     condition = noop_1.Noop.true;
@@ -48,6 +50,22 @@ class CommandActionBuilderWithState {
         this.allowedUsers = (0, toArray_1.toArray)(id);
         return this;
     }
+    /**
+     * Sets chats whitelist for this action.
+     * @param chatIds Chats ids to allow.
+     */
+    in(chatIds) {
+        this.whitelist = chatIds;
+        return this;
+    }
+    /**
+     * Sets chats blacklist for this action.
+     * @param chatIds Chats ids to ignore.
+     */
+    notIn(chatIds) {
+        this.blacklist = chatIds;
+        return this;
+    }
     /** Defines action logic itself, will be executed on trigger.
      * @param handler Callback that will be called on trigger
      */
@@ -62,6 +80,10 @@ class CommandActionBuilderWithState {
         this.condition = condition;
         return this;
     }
+    /**
+     * Sets factory method for readme (shown on /help) for this action.
+     * @param readmeFactory readme factory
+     */
     withHelp(readmeFactory) {
         this.readmeFactory = readmeFactory;
         return this;
@@ -72,36 +94,22 @@ class CommandActionBuilderWithState {
         return this;
     }
     /** Sets maximum number of simultaniously executing handlers for this command per chat. 0 is treated as unlimited. */
-    ratelimit(maxAllowedSimultaniousExecutions) {
+    withRatelimit(maxAllowedSimultaniousExecutions) {
         this.maxAllowedSimultaniousExecutions =
             maxAllowedSimultaniousExecutions;
         return this;
     }
-    /** Sets action cooldown.
-     * @param seconds Cooldown in seconds.
-     */
-    cooldown(seconds) {
-        this.cooldownSeconds = seconds;
-        return this;
-    }
-    /** Sets action cooldown message.
-     * @param message Message that will be sent if action is on cooldown.
-     */
-    withCooldownMessage(message) {
-        this.cooldownMessage = message;
-        return this;
-    }
-    /**
-     * Adds a chat to ignore list for this action.
-     * @param chatId Chat id to ignore.
+    /** Sets action cooldown settings.
+     * @param cooldownSettings Settings.
      */
-    ignoreChat(chatId) {
-        this.blacklist.push(chatId);
+    withCooldown(cooldownSettings) {
+        this.cooldownSeconds = cooldownSettings.seconds;
+        this.cooldownMessage = cooldownSettings.message;
         return this;
     }
     /** Builds action */
     build() {
-        return new commandAction_1.CommandAction(this.trigger, this.handler, this.name, this.active, new cooldownInfo_1.CooldownInfo(this.cooldownSeconds, this.cooldownMessage), this.blacklist, this.allowedUsers, this.maxAllowedSimultaniousExecutions, this.condition, this.stateConstructor, this.readmeFactory ?? noop_1.Noop.emptyString);
+        return new commandAction_1.CommandAction(this.trigger, this.handler, this.name, this.active, new cooldownInfo_1.CooldownInfo(this.cooldownSeconds, this.cooldownMessage), new actionPermissionsData_1.ActionPermissionsData(this.allowedUsers, this.whitelist, this.blacklist), this.maxAllowedSimultaniousExecutions, this.condition, this.stateConstructor, this.readmeFactory);
     }
 }
 exports.CommandActionBuilderWithState = CommandActionBuilderWithState;

package/dist/helpers/builders/inlineQueryActionBuilder.d.ts

@@ -1,17 +1,13 @@
 import { InlineQueryHandler } from '../../types/handlers';
-import { Seconds } from '../../types/timeValues';
 import { InlineQueryAction } from '../../entities/actions/inlineQueryAction';
 /**
  * Builder for `InlineQueryAction`
  */
 export declare class InlineQueryActionBuilder {
-    name: string;
-    pattern: RegExp;
-    active: boolean;
-    cooldownSeconds: Seconds;
-    blacklist: number[];
-    allowedUsers: number[];
-    handler: InlineQueryHandler;
+    private readonly name;
+    private pattern;
+    private active;
+    private handler;
     /**
      * Builder for `InlineQueryAction`
      * @param name Action name, will be used for logging and storage

package/dist/helpers/builders/inlineQueryActionBuilder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"inlineQueryActionBuilder.d.ts","sourceRoot":"","sources":["../../../helpers/builders/inlineQueryActionBuilder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AAEjD,OAAO,EAAE,iBAAiB,EAAE,MAAM,0CAA0C,CAAC;AAE7E;;GAEG;AACH,qBAAa,wBAAwB;IACjC,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAU;IAEzB,MAAM,UAAQ;IACd,eAAe,EAAE,OAAO,CAAgB;IACxC,SAAS,EAAE,MAAM,EAAE,CAAM;IACzB,YAAY,EAAE,MAAM,EAAE,CAAM;IAC5B,OAAO,EAAE,kBAAkB,CAAa;IAExC;;;OAGG;gBACS,IAAI,EAAE,MAAM;IAIxB;;;OAGG;IACH,EAAE,CAAC,OAAO,EAAE,MAAM;IAMlB;;OAEG;IACH,EAAE,CAAC,OAAO,EAAE,kBAAkB;IAM9B,iFAAiF;IACjF,QAAQ;IAMR,oBAAoB;IACpB,KAAK;CAQR"}
+{"version":3,"file":"inlineQueryActionBuilder.d.ts","sourceRoot":"","sources":["../../../helpers/builders/inlineQueryActionBuilder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAE1D,OAAO,EAAE,iBAAiB,EAAE,MAAM,0CAA0C,CAAC;AAE7E;;GAEG;AACH,qBAAa,wBAAwB;IACjC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAS;IAC9B,OAAO,CAAC,OAAO,CAAkB;IAEjC,OAAO,CAAC,MAAM,CAAQ;IACtB,OAAO,CAAC,OAAO,CAAiC;IAEhD;;;OAGG;gBACS,IAAI,EAAE,MAAM;IAIxB;;;OAGG;IACH,EAAE,CAAC,OAAO,EAAE,MAAM;IAMlB;;OAEG;IACH,EAAE,CAAC,OAAO,EAAE,kBAAkB;IAM9B,iFAAiF;IACjF,QAAQ;IAMR,oBAAoB;IACpB,KAAK;CAQR"}

package/dist/helpers/builders/inlineQueryActionBuilder.js

@@ -10,9 +10,6 @@ class InlineQueryActionBuilder {
     name;
     pattern = /.+/gi;
     active = true;
-    cooldownSeconds = 0;
-    blacklist = [];
-    allowedUsers = [];
     handler = noop_1.Noop.call;
     /**
      * Builder for `InlineQueryAction`

package/dist/helpers/builders/scheduledActionBuilder.d.ts

@@ -1,5 +1,4 @@
 import { ScheduledAction } from '../../entities/actions/scheduledAction';
-import { CachedStateFactory } from '../../entities/cachedStateFactory';
 import { ActionStateBase } from '../../entities/states/actionStateBase';
 import { IActionState } from '../../types/actionState';
 import { ScheduledHandler } from '../../types/handlers';
@@ -8,13 +7,13 @@ import { Hours, HoursOfDay } from '../../types/timeValues';
  * Builder for `ScheduledAction` with state represented by `TActionState`
  */
 export declare class ScheduledActionBuilderWithState<TActionState extends IActionState> {
-    active: boolean;
-    time: HoursOfDay;
-    cachedStateFactories: Map<string, CachedStateFactory>;
-    whitelist: number[];
-    stateConstructor: () => TActionState;
-    handler: ScheduledHandler<TActionState>;
-    name: string;
+    private active;
+    private time;
+    private readonly cachedStateFactories;
+    private whitelist;
+    private readonly stateConstructor;
+    private handler;
+    private readonly name;
     /**
      * Builder for `ScheduledAction` with state represented by `TActionState`
      * @param name Action name, will be used for logging and storage
@@ -22,10 +21,10 @@ export declare class ScheduledActionBuilderWithState<TActionState extends IActio
      */
     constructor(name: string, stateConstructor: () => TActionState);
     /**
-     * Adds a chat to whitelist for this action.
-     * @param chatId Chat id to execute in.
+     * Sets whitelist for this action.
+     * @param chatIds Chat ids to execute in.
      */
-    allowIn(chatId: number): this;
+    in(chatIds: number[]): this;
     /**
      * Defines time for scheduled item execution.
      * @param time Time of day (0 - 23) to execute action.

package/dist/helpers/builders/scheduledActionBuilder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"scheduledActionBuilder.d.ts","sourceRoot":"","sources":["../../../helpers/builders/scheduledActionBuilder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,wCAAwC,CAAC;AACzE,OAAO,EAAE,kBAAkB,EAAE,MAAM,mCAAmC,CAAC;AACvE,OAAO,EAAE,eAAe,EAAE,MAAM,uCAAuC,CAAC;AACxE,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AACxD,OAAO,EAAE,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAG3D;;GAEG;AACH,qBAAa,+BAA+B,CACxC,YAAY,SAAS,YAAY;IAEjC,MAAM,UAAQ;IACd,IAAI,EAAE,UAAU,CAAK;IACrB,oBAAoB,kCAAyC;IAC7D,SAAS,EAAE,MAAM,EAAE,CAAM;IACzB,gBAAgB,EAAE,MAAM,YAAY,CAAC;IACrC,OAAO,EAAE,gBAAgB,CAAC,YAAY,CAAC,CAAa;IAEpD,IAAI,EAAE,MAAM,CAAC;IAEb;;;;OAIG;gBACS,IAAI,EAAE,MAAM,EAAE,gBAAgB,EAAE,MAAM,YAAY;IAK9D;;;OAGG;IACH,OAAO,CAAC,MAAM,EAAE,MAAM;IAMtB;;;OAGG;IACH,KAAK,CAAC,IAAI,EAAE,UAAU;IAMtB;;OAEG;IACH,EAAE,CAAC,OAAO,EAAE,gBAAgB,CAAC,YAAY,CAAC;IAM1C;;;;;;OAMG;IACH,eAAe,CACX,GAAG,EAAE,MAAM,EACX,WAAW,EAAE,MAAM,OAAO,CAAC,OAAO,CAAC,EACnC,0BAA0B,GAAE,KAAmB;IAUnD,iFAAiF;IACjF,QAAQ;IAMR,oBAAoB;IACpB,KAAK;CAWR;AAED;;GAEG;AACH,qBAAa,sBAAuB,SAAQ,+BAA+B,CAAC,eAAe,CAAC;IACxF;;OAEG;gBACS,IAAI,EAAE,MAAM;CAG3B"}
+{"version":3,"file":"scheduledActionBuilder.d.ts","sourceRoot":"","sources":["../../../helpers/builders/scheduledActionBuilder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,wCAAwC,CAAC;AAEzE,OAAO,EAAE,eAAe,EAAE,MAAM,uCAAuC,CAAC;AACxE,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AACxD,OAAO,EAAE,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAG3D;;GAEG;AACH,qBAAa,+BAA+B,CACxC,YAAY,SAAS,YAAY;IAEjC,OAAO,CAAC,MAAM,CAAQ;IACtB,OAAO,CAAC,IAAI,CAAiB;IAC7B,OAAO,CAAC,QAAQ,CAAC,oBAAoB,CAGjC;IACJ,OAAO,CAAC,SAAS,CAAgB;IACjC,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAqB;IACtD,OAAO,CAAC,OAAO,CAA6C;IAE5D,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAS;IAE9B;;;;OAIG;gBACS,IAAI,EAAE,MAAM,EAAE,gBAAgB,EAAE,MAAM,YAAY;IAK9D;;;OAGG;IACH,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE;IAMpB;;;OAGG;IACH,KAAK,CAAC,IAAI,EAAE,UAAU;IAMtB;;OAEG;IACH,EAAE,CAAC,OAAO,EAAE,gBAAgB,CAAC,YAAY,CAAC;IAM1C;;;;;;OAMG;IACH,eAAe,CACX,GAAG,EAAE,MAAM,EACX,WAAW,EAAE,MAAM,OAAO,CAAC,OAAO,CAAC,EACnC,0BAA0B,GAAE,KAAmB;IAUnD,iFAAiF;IACjF,QAAQ;IAMR,oBAAoB;IACpB,KAAK;CAWR;AAED;;GAEG;AACH,qBAAa,sBAAuB,SAAQ,+BAA+B,CAAC,eAAe,CAAC;IACxF;;OAEG;gBACS,IAAI,EAAE,MAAM;CAG3B"}

package/dist/helpers/builders/scheduledActionBuilder.js

@@ -26,11 +26,11 @@ class ScheduledActionBuilderWithState {
         this.stateConstructor = stateConstructor;
     }
     /**
-     * Adds a chat to whitelist for this action.
-     * @param chatId Chat id to execute in.
+     * Sets whitelist for this action.
+     * @param chatIds Chat ids to execute in.
      */
-    allowIn(chatId) {
-        this.whitelist.push(chatId);
+    in(chatIds) {
+        this.whitelist = chatIds;
         return this;
     }
     /**

package/dist/main.d.ts

@@ -5,8 +5,8 @@ import { BotInstance } from './entities/botInstance';
 import { Seconds } from './types/timeValues';
 import { IScheduler } from './types/scheduler';
 import { ILogger } from './types/logger';
-import { ActionStateBase } from './entities/states/actionStateBase';
 import { InlineQueryAction } from './entities/actions/inlineQueryAction';
+import { IActionState } from './types/actionState';
 declare class BotOrchestrator {
     bots: BotInstance[];
     /**
@@ -19,9 +19,9 @@ declare class BotOrchestrator {
         tokenFilePath: string;
         actions: {
             /** Collection of actions that will be executed as a response to message from used. Created using `CommandActionBuilder`.*/
-            commands: CommandAction<ActionStateBase>[];
+            commands: CommandAction<IActionState>[];
             /** Collection of actions that will be executed on timer. Created using `ScheduledActionBuilder`.*/
-            scheduled: ScheduledAction<ActionStateBase>[];
+            scheduled: ScheduledAction<IActionState>[];
             /** Collection of actions that will handle inline queries */
             inlineQueries: InlineQueryAction[];
         };

package/dist/main.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"main.d.ts","sourceRoot":"","sources":["../main.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AACjD,OAAO,EAAE,aAAa,EAAE,MAAM,kCAAkC,CAAC;AACjE,OAAO,EAAE,eAAe,EAAE,MAAM,oCAAoC,CAAC;AACrE,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAC7C,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAC/C,OAAO,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AACzC,OAAO,EAAE,eAAe,EAAE,MAAM,mCAAmC,CAAC;AACpE,OAAO,EAAE,iBAAiB,EAAE,MAAM,sCAAsC,CAAC;AAEzE,cAAM,eAAe;IACjB,IAAI,EAAE,WAAW,EAAE,CAAM;IAEzB;;OAEG;IACG,QAAQ,CAAC,OAAO,EAAE;QACpB,gCAAgC;QAChC,IAAI,EAAE,MAAM,CAAC;QACb,kDAAkD;QAClD,aAAa,EAAE,MAAM,CAAC;QACtB,OAAO,EAAE;YACL,2HAA2H;YAC3H,QAAQ,EAAE,aAAa,CAAC,eAAe,CAAC,EAAE,CAAC;YAC3C,mGAAmG;YACnG,SAAS,EAAE,eAAe,CAAC,eAAe,CAAC,EAAE,CAAC;YAC9C,4DAA4D;YAC5D,aAAa,EAAE,iBAAiB,EAAE,CAAC;SACtC,CAAC;QACF,yGAAyG;QACzG,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QAC9B,2KAA2K;QAC3K,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,6DAA6D;QAC7D,eAAe,CAAC,EAAE,OAAO,CAAC;QAC1B,+EAA+E;QAC/E,gCAAgC,CAAC,EAAE,OAAO,CAAC;QAC3C,QAAQ,CAAC,EAAE;YACP,qGAAqG;YACrG,aAAa,CAAC,EAAE,cAAc,CAAC;YAC/B,8FAA8F;YAC9F,MAAM,CAAC,EAAE,OAAO,CAAC;YACjB,yGAAyG;YACzG,SAAS,CAAC,EAAE,UAAU,CAAC;SAC1B,CAAC;KACL;IA0BD;;OAEG;IACG,QAAQ,CAAC,MAAM,EAAE,MAAM;CAKhC;AAED,eAAO,MAAM,eAAe,iBAAwB,CAAC"}
+{"version":3,"file":"main.d.ts","sourceRoot":"","sources":["../main.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AACjD,OAAO,EAAE,aAAa,EAAE,MAAM,kCAAkC,CAAC;AACjE,OAAO,EAAE,eAAe,EAAE,MAAM,oCAAoC,CAAC;AACrE,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAC7C,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAC/C,OAAO,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AACzC,OAAO,EAAE,iBAAiB,EAAE,MAAM,sCAAsC,CAAC;AACzE,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAEnD,cAAM,eAAe;IACjB,IAAI,EAAE,WAAW,EAAE,CAAM;IAEzB;;OAEG;IACG,QAAQ,CAAC,OAAO,EAAE;QACpB,gCAAgC;QAChC,IAAI,EAAE,MAAM,CAAC;QACb,kDAAkD;QAClD,aAAa,EAAE,MAAM,CAAC;QACtB,OAAO,EAAE;YACL,2HAA2H;YAC3H,QAAQ,EAAE,aAAa,CAAC,YAAY,CAAC,EAAE,CAAC;YACxC,mGAAmG;YACnG,SAAS,EAAE,eAAe,CAAC,YAAY,CAAC,EAAE,CAAC;YAC3C,4DAA4D;YAC5D,aAAa,EAAE,iBAAiB,EAAE,CAAC;SACtC,CAAC;QACF,yGAAyG;QACzG,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QAC9B,2KAA2K;QAC3K,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,6DAA6D;QAC7D,eAAe,CAAC,EAAE,OAAO,CAAC;QAC1B,+EAA+E;QAC/E,gCAAgC,CAAC,EAAE,OAAO,CAAC;QAC3C,QAAQ,CAAC,EAAE;YACP,qGAAqG;YACrG,aAAa,CAAC,EAAE,cAAc,CAAC;YAC/B,8FAA8F;YAC9F,MAAM,CAAC,EAAE,OAAO,CAAC;YACjB,yGAAyG;YACzG,SAAS,CAAC,EAAE,UAAU,CAAC;SAC1B,CAAC;KACL;IA0BD;;OAEG;IACG,QAAQ,CAAC,MAAM,EAAE,MAAM;CAKhC;AAED,eAAO,MAAM,eAAe,iBAAwB,CAAC"}

package/dtos/actionPermissionsData.ts

@@ -0,0 +1,7 @@
+export class ActionPermissionsData {
+    constructor(
+        readonly userIdsWhitelist: number[],
+        readonly chatIdsWhitelist: number[],
+        readonly chatIdsBlacklist: number[]
+    ) {}
+}

package/dtos/commandTriggerCheckResult.ts

@@ -4,7 +4,9 @@ const _SkipTriggerReasonsObject = {
     OnCooldown: 'OnCooldown',
     CustomConditionNotMet: 'CustomConditionNotMet',
     TriggerNotSatisfied: 'TriggerNotSatisfied',
-    Other: 'Other'
+    Other: 'Other',
+    ActionDisabled: 'ActionDisabled',
+    ChatForbidden: 'ChatForbidden'
 } as const;
 
 export type SkipTriggerReasons = keyof typeof _SkipTriggerReasonsObject;

package/entities/actions/commandAction.ts

@@ -16,6 +16,7 @@ import { CooldownInfo } from '../../dtos/cooldownInfo';
 import { TextMessage } from '../../dtos/responses/textMessage';
 import { ReplyInfo } from '../../dtos/replyInfo';
 import { Seconds } from '../../types/timeValues';
+import { ActionPermissionsData } from '../../dtos/actionPermissionsData';
 
 export class CommandAction<TActionState extends IActionState>
     implements IActionWithState<TActionState>
@@ -28,14 +29,15 @@ export class CommandAction<TActionState extends IActionState>
     readonly cooldownInfo: CooldownInfo;
     readonly active: boolean;
     readonly chatsBlacklist: number[];
-    readonly allowedUsers: number[];
+    readonly chatsWhitelist: number[];
+    readonly usersWhitelist: number[];
     readonly condition: CommandCondition<TActionState>;
     readonly stateConstructor: () => TActionState;
     readonly key: ActionKey;
     readonly readmeFactory: (botName: string) => string;
     readonly maxAllowedSimultaniousExecutions: number;
 
-    lastCustomCooldown: Seconds | undefined;
+    private lastCustomCooldown: Seconds | undefined;
 
     constructor(
         trigger: CommandTrigger | CommandTrigger[],
@@ -43,8 +45,7 @@ export class CommandAction<TActionState extends IActionState>
         name: string,
         active: boolean,
         cooldownInfo: CooldownInfo,
-        chatsBlacklist: number[],
-        allowedUsers: number[],
+        permissionsData: ActionPermissionsData,
         maxAllowedSimultaniousExecutions: number,
         condition: CommandCondition<TActionState>,
         stateConstructor: () => TActionState,
@@ -55,8 +56,9 @@ export class CommandAction<TActionState extends IActionState>
         this.name = name;
         this.cooldownInfo = cooldownInfo;
         this.active = active;
-        this.chatsBlacklist = chatsBlacklist;
-        this.allowedUsers = allowedUsers;
+        this.chatsBlacklist = permissionsData.chatIdsBlacklist;
+        this.chatsWhitelist = permissionsData.chatIdsWhitelist;
+        this.usersWhitelist = permissionsData.userIdsWhitelist;
         this.condition = condition;
         this.stateConstructor = stateConstructor;
         this.readmeFactory = readmeFactory;
@@ -72,9 +74,6 @@ export class CommandAction<TActionState extends IActionState>
                 `Context for ${this.key} is not initialized or already consumed`
             );
 
-        if (!this.active || this.chatsBlacklist.includes(ctx.chatInfo.id))
-            return Noop.NoResponse;
-
         let lock: Semaphore | undefined;
         if (this.maxAllowedSimultaniousExecutions != 0) {
             lock = getOrSetIfNotExists(
@@ -149,6 +148,21 @@ export class CommandAction<TActionState extends IActionState>
         trigger: CommandTrigger,
         state: TActionState
     ) {
+        if (!this.active)
+            return CommandTriggerCheckResult.DontTriggerAndSkipCooldown(
+                'ActionDisabled'
+            );
+
+        const isChatInBlacklist = this.chatsBlacklist.includes(ctx.chatInfo.id);
+        const isChatInWhitelist =
+            this.chatsWhitelist.length != 0 &&
+            this.chatsWhitelist.includes(ctx.chatInfo.id);
+
+        if (isChatInBlacklist || !isChatInWhitelist)
+            return CommandTriggerCheckResult.DontTriggerAndSkipCooldown(
+                'ChatForbidden'
+            );
+
         const triggerCheckResult = this.checkTrigger(ctx, trigger);
 
         if (!triggerCheckResult.shouldExecute) return triggerCheckResult;
@@ -159,8 +173,8 @@ export class CommandAction<TActionState extends IActionState>
             );
 
         const isUserAllowed =
-            this.allowedUsers.length == 0 ||
-            this.allowedUsers.includes(ctx.userInfo.id);
+            this.usersWhitelist.length == 0 ||
+            this.usersWhitelist.includes(ctx.userInfo.id);
 
         if (!isUserAllowed)
             return CommandTriggerCheckResult.DontTriggerAndSkipCooldown(

package/eslint.config.js

@@ -1,13 +1,17 @@
 import eslint from '@eslint/js';
 import tseslint from 'typescript-eslint';
+import parser from '@typescript-eslint/parser';
 
 export default tseslint.config(
     eslint.configs.recommended,
-    ...tseslint.configs.strictTypeChecked,
+    tseslint.configs.strictTypeChecked,
     {
         languageOptions: {
+            // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+            parser,
             parserOptions: {
                 project: './tsconfig.json',
+                tsconfigRootDir: import.meta.dirname,
                 sourceType: 'module'
             }
         },

package/helpers/builders/commandActionBuilder.ts

@@ -8,24 +8,26 @@ import { toArray } from '../toArray';
 import { Noop } from '../noop';
 import { CommandTrigger } from '../../types/commandTrigger';
 import { CooldownInfo } from '../../dtos/cooldownInfo';
+import { ActionPermissionsData } from '../../dtos/actionPermissionsData';
 
 /**
  * Builder for `CommandAction` with state represented by `TActionState`
  */
 export class CommandActionBuilderWithState<TActionState extends IActionState> {
-    name: string;
-    trigger: CommandTrigger | CommandTrigger[] = [];
-
-    active = true;
-    readmeFactory: null | ((botName: string) => string) = null;
-    cooldownSeconds: Seconds = 0 as Seconds;
-    blacklist: number[] = [];
-    allowedUsers: number[] = [];
-    stateConstructor: () => TActionState;
-    handler: CommandHandler<TActionState> = Noop.call;
-    condition: CommandCondition<TActionState> = Noop.true;
-    maxAllowedSimultaniousExecutions: number = 0;
-    cooldownMessage: string | undefined;
+    private readonly name: string;
+    private trigger: CommandTrigger | CommandTrigger[] = [];
+
+    private active = true;
+    private cooldownSeconds: Seconds = 0 as Seconds;
+    private blacklist: number[] = [];
+    private whitelist: number[] = [];
+    private allowedUsers: number[] = [];
+    private readmeFactory: (botName: string) => string = Noop.emptyString;
+    private readonly stateConstructor: () => TActionState;
+    private handler: CommandHandler<TActionState> = Noop.call;
+    private condition: CommandCondition<TActionState> = Noop.true;
+    private maxAllowedSimultaniousExecutions: number = 0;
+    private cooldownMessage: string | undefined;
 
     /**
      * Builder for `CommandAction` with state represented by `TActionState`
@@ -58,6 +60,26 @@ export class CommandActionBuilderWithState<TActionState extends IActionState> {
         return this;
     }
 
+    /**
+     * Sets chats whitelist for this action.
+     * @param chatIds Chats ids to allow.
+     */
+    in(chatIds: number[]) {
+        this.whitelist = chatIds;
+
+        return this;
+    }
+
+    /**
+     * Sets chats blacklist for this action.
+     * @param chatIds Chats ids to ignore.
+     */
+    notIn(chatIds: number[]) {
+        this.blacklist = chatIds;
+
+        return this;
+    }
+
     /** Defines action logic itself, will be executed on trigger.
      * @param handler Callback that will be called on trigger
      */
@@ -76,6 +98,10 @@ export class CommandActionBuilderWithState<TActionState extends IActionState> {
         return this;
     }
 
+    /**
+     * Sets factory method for readme (shown on /help) for this action.
+     * @param readmeFactory readme factory
+     */
     withHelp(readmeFactory: (botName: string) => string) {
         this.readmeFactory = readmeFactory;
 
@@ -90,37 +116,19 @@ export class CommandActionBuilderWithState<TActionState extends IActionState> {
     }
 
     /** Sets maximum number of simultaniously executing handlers for this command per chat. 0 is treated as unlimited. */
-    ratelimit(maxAllowedSimultaniousExecutions: number) {
+    withRatelimit(maxAllowedSimultaniousExecutions: number) {
         this.maxAllowedSimultaniousExecutions =
             maxAllowedSimultaniousExecutions;
 
         return this;
     }
 
-    /** Sets action cooldown.
-     * @param seconds Cooldown in seconds.
-     */
-    cooldown(seconds: Seconds) {
-        this.cooldownSeconds = seconds;
-
-        return this;
-    }
-
-    /** Sets action cooldown message.
-     * @param message Message that will be sent if action is on cooldown.
-     */
-    withCooldownMessage(message: string) {
-        this.cooldownMessage = message;
-
-        return this;
-    }
-
-    /**
-     * Adds a chat to ignore list for this action.
-     * @param chatId Chat id to ignore.
+    /** Sets action cooldown settings.
+     * @param cooldownSettings Settings.
      */
-    ignoreChat(chatId: number) {
-        this.blacklist.push(chatId);
+    withCooldown(cooldownSettings: { seconds: Seconds; message?: string }) {
+        this.cooldownSeconds = cooldownSettings.seconds;
+        this.cooldownMessage = cooldownSettings.message;
 
         return this;
     }
@@ -133,12 +141,15 @@ export class CommandActionBuilderWithState<TActionState extends IActionState> {
             this.name,
             this.active,
             new CooldownInfo(this.cooldownSeconds, this.cooldownMessage),
-            this.blacklist,
-            this.allowedUsers,
+            new ActionPermissionsData(
+                this.allowedUsers,
+                this.whitelist,
+                this.blacklist
+            ),
             this.maxAllowedSimultaniousExecutions,
             this.condition,
             this.stateConstructor,
-            this.readmeFactory ?? Noop.emptyString
+            this.readmeFactory
         );
     }
 }

package/helpers/builders/inlineQueryActionBuilder.ts

@@ -1,5 +1,4 @@
 import { InlineQueryHandler } from '../../types/handlers';
-import { Seconds } from '../../types/timeValues';
 import { Noop } from '../noop';
 import { InlineQueryAction } from '../../entities/actions/inlineQueryAction';
 
@@ -7,14 +6,11 @@ import { InlineQueryAction } from '../../entities/actions/inlineQueryAction';
  * Builder for `InlineQueryAction`
  */
 export class InlineQueryActionBuilder {
-    name: string;
-    pattern: RegExp = /.+/gi;
-
-    active = true;
-    cooldownSeconds: Seconds = 0 as Seconds;
-    blacklist: number[] = [];
-    allowedUsers: number[] = [];
-    handler: InlineQueryHandler = Noop.call;
+    private readonly name: string;
+    private pattern: RegExp = /.+/gi;
+
+    private active = true;
+    private handler: InlineQueryHandler = Noop.call;
 
     /**
      * Builder for `InlineQueryAction`

package/helpers/builders/scheduledActionBuilder.ts

@@ -12,14 +12,17 @@ import { Noop } from '../noop';
 export class ScheduledActionBuilderWithState<
     TActionState extends IActionState
 > {
-    active = true;
-    time: HoursOfDay = 0;
-    cachedStateFactories = new Map<string, CachedStateFactory>();
-    whitelist: number[] = [];
-    stateConstructor: () => TActionState;
-    handler: ScheduledHandler<TActionState> = Noop.call;
+    private active = true;
+    private time: HoursOfDay = 0;
+    private readonly cachedStateFactories = new Map<
+        string,
+        CachedStateFactory
+    >();
+    private whitelist: number[] = [];
+    private readonly stateConstructor: () => TActionState;
+    private handler: ScheduledHandler<TActionState> = Noop.call;
 
-    name: string;
+    private readonly name: string;
 
     /**
      * Builder for `ScheduledAction` with state represented by `TActionState`
@@ -32,11 +35,11 @@ export class ScheduledActionBuilderWithState<
     }
 
     /**
-     * Adds a chat to whitelist for this action.
-     * @param chatId Chat id to execute in.
+     * Sets whitelist for this action.
+     * @param chatIds Chat ids to execute in.
      */
-    allowIn(chatId: number) {
-        this.whitelist.push(chatId);
+    in(chatIds: number[]) {
+        this.whitelist = chatIds;
 
         return this;
     }

package/main.ts

@@ -6,8 +6,8 @@ import { BotInstance } from './entities/botInstance';
 import { Seconds } from './types/timeValues';
 import { IScheduler } from './types/scheduler';
 import { ILogger } from './types/logger';
-import { ActionStateBase } from './entities/states/actionStateBase';
 import { InlineQueryAction } from './entities/actions/inlineQueryAction';
+import { IActionState } from './types/actionState';
 
 class BotOrchestrator {
     bots: BotInstance[] = [];
@@ -22,9 +22,9 @@ class BotOrchestrator {
         tokenFilePath: string;
         actions: {
             /** Collection of actions that will be executed as a response to message from used. Created using `CommandActionBuilder`.*/
-            commands: CommandAction<ActionStateBase>[];
+            commands: CommandAction<IActionState>[];
             /** Collection of actions that will be executed on timer. Created using `ScheduledActionBuilder`.*/
-            scheduled: ScheduledAction<ActionStateBase>[];
+            scheduled: ScheduledAction<IActionState>[];
             /** Collection of actions that will handle inline queries */
             inlineQueries: InlineQueryAction[];
         };

package/package.json

@@ -14,7 +14,7 @@
         "type": "git",
         "url": "https://github.com/AlexSolari/botFramework.git"
     },
-    "version": "0.3.18",
+    "version": "0.3.19",
     "type": "module",
     "dependencies": {
         "async-sema": "^3.1.1",
@@ -29,7 +29,7 @@
         "@types/node": "^22.5.5",
         "eslint": "^9.29.0",
         "globals": "^16.2.0",
-        "typescript": "^5.6.2",
+        "typescript": "^5.9.0-beta",
         "typescript-eslint": "^8.34.1"
     },
     "scripts": {