iobroker.telegram-menu 2.2.3 → 2.3.0

package/build/lib/math.js

@@ -0,0 +1,41 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var math_exports = {};
+__export(math_exports, {
+  evaluate: () => evaluate
+});
+module.exports = __toCommonJS(math_exports);
+var import_logging = require("../app/logging");
+function evaluate(val, adapter) {
+  var _a;
+  try {
+    if (Array.isArray(val)) {
+      return { val: (_a = eval(val.join(" "))) != null ? _a : "", error: false };
+    }
+    return { val: eval(val), error: false };
+  } catch (e) {
+    (0, import_logging.errorLogger)("Error Eval:", e, adapter);
+    return { val: "", error: true };
+  }
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  evaluate
+});
+//# sourceMappingURL=math.js.map

package/build/lib/math.js.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../src/lib/math.ts"],
+  "sourcesContent": ["import type { Adapter, EvaluateReturnType } from '../types/types';\nimport { errorLogger } from '../app/logging';\n\nexport function evaluate(val: string | string[], adapter: Adapter): EvaluateReturnType {\n    try {\n        if (Array.isArray(val)) {\n            return { val: eval(val.join(' ')) ?? '', error: false };\n        }\n        return { val: eval(val), error: false };\n    } catch (e: any) {\n        errorLogger('Error Eval:', e, adapter);\n        return { val: '', error: true };\n    }\n}\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AACA,qBAA4B;AAErB,SAAS,SAAS,KAAwB,SAAsC;AAHvF;AAII,MAAI;AACA,QAAI,MAAM,QAAQ,GAAG,GAAG;AACpB,aAAO,EAAE,MAAK,UAAK,IAAI,KAAK,GAAG,CAAC,MAAlB,YAAuB,IAAI,OAAO,MAAM;AAAA,IAC1D;AACA,WAAO,EAAE,KAAK,KAAK,GAAG,GAAG,OAAO,MAAM;AAAA,EAC1C,SAAS,GAAQ;AACb,oCAAY,eAAe,GAAG,OAAO;AACrC,WAAO,EAAE,KAAK,IAAI,OAAO,KAAK;AAAA,EAClC;AACJ;",
+  "names": []
+}

package/build/lib/messageIds.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/lib/messageIds.ts"],
-  "sourcesContent": ["import TelegramMenu from '../main';\nimport { deleteMessageByBot } from './botAction';\nimport { error } from './logging';\nimport type { UserListWithChatId, WhatShouldDelete } from './telegram-menu';\nimport { getChatID } from './utilities';\nimport { deepCopy } from './global';\n\ninterface Messages {\n    [key: string]: MessageInfos[];\n}\ninterface MessageInfos {\n    id: ioBroker.StateValue;\n    time?: number;\n    request?: ioBroker.StateValue | null | undefined;\n}\nlet isDeleting = false;\nasync function saveMessageIds(state: ioBroker.State, instanceTelegram: string): Promise<void> {\n    const _this = TelegramMenu.getInstance();\n    try {\n        let requestMessageId: Messages = {};\n        let requestMessageIdObj: ioBroker.State | null | undefined = null;\n        if (!isDeleting) {\n            requestMessageIdObj = await _this.getStateAsync('communication.requestIds');\n        }\n        isDeleting = false;\n        const requestUserIdObj = await _this.getForeignStateAsync(`${instanceTelegram}.communicate.requestChatId`);\n\n        const request = await _this.getForeignStateAsync(`${instanceTelegram}.communicate.request`);\n\n        if (!(requestUserIdObj && requestUserIdObj.val)) {\n            return;\n        }\n\n        requestMessageId = requestMessageIdObj?.val ? JSON.parse(requestMessageIdObj?.val.toString()) : {};\n\n        if (!requestMessageId[requestUserIdObj.val.toString()]) {\n            requestMessageId[requestUserIdObj.val.toString()] = [];\n        }\n\n        if (!requestMessageId[requestUserIdObj.val.toString()]?.find(message => message.id === state.val)) {\n            requestMessageId[requestUserIdObj.val.toString()].push({\n                id: state.val,\n                time: Date.now(),\n                request: request?.val,\n            });\n        }\n\n        requestMessageId = removeOldMessageIds(requestMessageId, requestUserIdObj.val.toString());\n        await _this.setState('communication.requestIds', JSON.stringify(requestMessageId), true);\n    } catch (e: any) {\n        error([\n            { text: 'Error saveMessageIds:', val: e.message },\n            { text: 'Stack:', val: e.stack },\n        ]);\n    }\n}\nfunction removeOldMessageIds(messages: Messages, chatID: string): Messages {\n    messages[chatID] = messages[chatID].filter(message => {\n        return message.time && message.time > Date.now() - 1000 * 60 * 60 * 24 * 2;\n    });\n    return messages;\n}\n\nconst removeMessageFromList = ({\n    element,\n    chat_id,\n    copyMessageIds,\n}: {\n    element: any;\n    chat_id: string;\n    copyMessageIds: Messages;\n}): MessageInfos[] => {\n    return copyMessageIds[chat_id].filter(message => message.id !== element.id);\n};\n\nasync function deleteMessageIds(\n    user: string,\n    userListWithChatID: UserListWithChatId[],\n    instanceTelegram: string,\n    whatShouldDelete: WhatShouldDelete,\n): Promise<void> {\n    const _this = TelegramMenu.getInstance();\n    try {\n        const requestMessageIdObj = await _this.getStateAsync('communication.requestIds');\n        const lastMessageId = await _this.getForeignStateAsync(`${instanceTelegram}.communicate.requestMessageId`);\n\n        if (\n            !requestMessageIdObj ||\n            typeof requestMessageIdObj.val !== 'string' ||\n            !JSON.parse(requestMessageIdObj.val)\n        ) {\n            return;\n        }\n\n        const chat_id = getChatID(userListWithChatID, user);\n        const messageIds: Messages = JSON.parse(requestMessageIdObj.val);\n\n        if (lastMessageId && lastMessageId.val) {\n            messageIds[chat_id].push({ id: lastMessageId.val.toString() });\n        }\n\n        isDeleting = true;\n        const copyMessageIds = deepCopy(messageIds);\n        messageIds[chat_id].forEach((element, index) => {\n            if (whatShouldDelete === 'all' && element.id) {\n                deleteMessageByBot(\n                    instanceTelegram,\n                    user,\n                    userListWithChatID,\n                    parseInt(element.id?.toString()),\n                    chat_id,\n                );\n            }\n            if (whatShouldDelete === 'last' && index === messageIds[chat_id].length - 1 && element.id) {\n                deleteMessageByBot(\n                    instanceTelegram,\n                    user,\n                    userListWithChatID,\n                    parseInt(element.id?.toString()),\n                    chat_id,\n                );\n            }\n            if (!copyMessageIds) {\n                return;\n            }\n            copyMessageIds[chat_id] = removeMessageFromList({ element, chat_id, copyMessageIds });\n        });\n\n        await _this.setState('communication.requestIds', JSON.stringify(copyMessageIds), true);\n    } catch (e: any) {\n        error([\n            { text: 'Error deleteMessageIds:', val: e.message },\n            { text: 'Stack:', val: e.stack },\n        ]);\n    }\n}\n\nexport { deleteMessageIds, saveMessageIds };\n"],
+  "sourcesContent": ["import TelegramMenu from '../main';\nimport { deleteMessageByBot } from './botAction';\nimport { error } from './logging';\nimport type { UserListWithChatId, WhatShouldDelete } from '../types/types';\nimport { getChatID } from './utilities';\nimport { deepCopy } from './global';\n\ninterface Messages {\n    [key: string]: MessageInfos[];\n}\ninterface MessageInfos {\n    id: ioBroker.StateValue;\n    time?: number;\n    request?: ioBroker.StateValue | null | undefined;\n}\nlet isDeleting = false;\nasync function saveMessageIds(state: ioBroker.State, instanceTelegram: string): Promise<void> {\n    const _this = TelegramMenu.getInstance();\n    try {\n        let requestMessageId: Messages = {};\n        let requestMessageIdObj: ioBroker.State | null | undefined = null;\n        if (!isDeleting) {\n            requestMessageIdObj = await _this.getStateAsync('communication.requestIds');\n        }\n        isDeleting = false;\n        const requestUserIdObj = await _this.getForeignStateAsync(`${instanceTelegram}.communicate.requestChatId`);\n\n        const request = await _this.getForeignStateAsync(`${instanceTelegram}.communicate.request`);\n\n        if (!(requestUserIdObj && requestUserIdObj.val)) {\n            return;\n        }\n\n        requestMessageId = requestMessageIdObj?.val ? JSON.parse(requestMessageIdObj?.val.toString()) : {};\n\n        if (!requestMessageId[requestUserIdObj.val.toString()]) {\n            requestMessageId[requestUserIdObj.val.toString()] = [];\n        }\n\n        if (!requestMessageId[requestUserIdObj.val.toString()]?.find(message => message.id === state.val)) {\n            requestMessageId[requestUserIdObj.val.toString()].push({\n                id: state.val,\n                time: Date.now(),\n                request: request?.val,\n            });\n        }\n\n        requestMessageId = removeOldMessageIds(requestMessageId, requestUserIdObj.val.toString());\n        await _this.setState('communication.requestIds', JSON.stringify(requestMessageId), true);\n    } catch (e: any) {\n        error([\n            { text: 'Error saveMessageIds:', val: e.message },\n            { text: 'Stack:', val: e.stack },\n        ]);\n    }\n}\nfunction removeOldMessageIds(messages: Messages, chatID: string): Messages {\n    messages[chatID] = messages[chatID].filter(message => {\n        return message.time && message.time > Date.now() - 1000 * 60 * 60 * 24 * 2;\n    });\n    return messages;\n}\n\nconst removeMessageFromList = ({\n    element,\n    chat_id,\n    copyMessageIds,\n}: {\n    element: any;\n    chat_id: string;\n    copyMessageIds: Messages;\n}): MessageInfos[] => {\n    return copyMessageIds[chat_id].filter(message => message.id !== element.id);\n};\n\nasync function deleteMessageIds(\n    user: string,\n    userListWithChatID: UserListWithChatId[],\n    instanceTelegram: string,\n    whatShouldDelete: WhatShouldDelete,\n): Promise<void> {\n    const _this = TelegramMenu.getInstance();\n    try {\n        const requestMessageIdObj = await _this.getStateAsync('communication.requestIds');\n        const lastMessageId = await _this.getForeignStateAsync(`${instanceTelegram}.communicate.requestMessageId`);\n\n        if (\n            !requestMessageIdObj ||\n            typeof requestMessageIdObj.val !== 'string' ||\n            !JSON.parse(requestMessageIdObj.val)\n        ) {\n            return;\n        }\n\n        const chat_id = getChatID(userListWithChatID, user);\n        const messageIds: Messages = JSON.parse(requestMessageIdObj.val);\n\n        if (lastMessageId && lastMessageId.val) {\n            messageIds[chat_id].push({ id: lastMessageId.val.toString() });\n        }\n\n        isDeleting = true;\n        const copyMessageIds = deepCopy(messageIds);\n        messageIds[chat_id].forEach((element, index) => {\n            if (whatShouldDelete === 'all' && element.id) {\n                deleteMessageByBot(\n                    instanceTelegram,\n                    user,\n                    userListWithChatID,\n                    parseInt(element.id?.toString()),\n                    chat_id,\n                );\n            }\n            if (whatShouldDelete === 'last' && index === messageIds[chat_id].length - 1 && element.id) {\n                deleteMessageByBot(\n                    instanceTelegram,\n                    user,\n                    userListWithChatID,\n                    parseInt(element.id?.toString()),\n                    chat_id,\n                );\n            }\n            if (!copyMessageIds) {\n                return;\n            }\n            copyMessageIds[chat_id] = removeMessageFromList({ element, chat_id, copyMessageIds });\n        });\n\n        await _this.setState('communication.requestIds', JSON.stringify(copyMessageIds), true);\n    } catch (e: any) {\n        error([\n            { text: 'Error deleteMessageIds:', val: e.message },\n            { text: 'Stack:', val: e.stack },\n        ]);\n    }\n}\n\nexport { deleteMessageIds, saveMessageIds };\n"],
   "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAAyB;AACzB,uBAAmC;AACnC,qBAAsB;AAEtB,uBAA0B;AAC1B,oBAAyB;AAUzB,IAAI,aAAa;AACjB,eAAe,eAAe,OAAuB,kBAAyC;AAhB9F;AAiBI,QAAM,QAAQ,YAAAA,QAAa,YAAY;AACvC,MAAI;AACA,QAAI,mBAA6B,CAAC;AAClC,QAAI,sBAAyD;AAC7D,QAAI,CAAC,YAAY;AACb,4BAAsB,MAAM,MAAM,cAAc,0BAA0B;AAAA,IAC9E;AACA,iBAAa;AACb,UAAM,mBAAmB,MAAM,MAAM,qBAAqB,GAAG,gBAAgB,4BAA4B;AAEzG,UAAM,UAAU,MAAM,MAAM,qBAAqB,GAAG,gBAAgB,sBAAsB;AAE1F,QAAI,EAAE,oBAAoB,iBAAiB,MAAM;AAC7C;AAAA,IACJ;AAEA,wBAAmB,2DAAqB,OAAM,KAAK,MAAM,2DAAqB,IAAI,UAAU,IAAI,CAAC;AAEjG,QAAI,CAAC,iBAAiB,iBAAiB,IAAI,SAAS,CAAC,GAAG;AACpD,uBAAiB,iBAAiB,IAAI,SAAS,CAAC,IAAI,CAAC;AAAA,IACzD;AAEA,QAAI,GAAC,sBAAiB,iBAAiB,IAAI,SAAS,CAAC,MAAhD,mBAAmD,KAAK,aAAW,QAAQ,OAAO,MAAM,OAAM;AAC/F,uBAAiB,iBAAiB,IAAI,SAAS,CAAC,EAAE,KAAK;AAAA,QACnD,IAAI,MAAM;AAAA,QACV,MAAM,KAAK,IAAI;AAAA,QACf,SAAS,mCAAS;AAAA,MACtB,CAAC;AAAA,IACL;AAEA,uBAAmB,oBAAoB,kBAAkB,iBAAiB,IAAI,SAAS,CAAC;AACxF,UAAM,MAAM,SAAS,4BAA4B,KAAK,UAAU,gBAAgB,GAAG,IAAI;AAAA,EAC3F,SAAS,GAAQ;AACb,8BAAM;AAAA,MACF,EAAE,MAAM,yBAAyB,KAAK,EAAE,QAAQ;AAAA,MAChD,EAAE,MAAM,UAAU,KAAK,EAAE,MAAM;AAAA,IACnC,CAAC;AAAA,EACL;AACJ;AACA,SAAS,oBAAoB,UAAoB,QAA0B;AACvE,WAAS,MAAM,IAAI,SAAS,MAAM,EAAE,OAAO,aAAW;AAClD,WAAO,QAAQ,QAAQ,QAAQ,OAAO,KAAK,IAAI,IAAI,MAAO,KAAK,KAAK,KAAK;AAAA,EAC7E,CAAC;AACD,SAAO;AACX;AAEA,MAAM,wBAAwB,CAAC;AAAA,EAC3B;AAAA,EACA;AAAA,EACA;AACJ,MAIsB;AAClB,SAAO,eAAe,OAAO,EAAE,OAAO,aAAW,QAAQ,OAAO,QAAQ,EAAE;AAC9E;AAEA,eAAe,iBACX,MACA,oBACA,kBACA,kBACa;AACb,QAAM,QAAQ,YAAAA,QAAa,YAAY;AACvC,MAAI;AACA,UAAM,sBAAsB,MAAM,MAAM,cAAc,0BAA0B;AAChF,UAAM,gBAAgB,MAAM,MAAM,qBAAqB,GAAG,gBAAgB,+BAA+B;AAEzG,QACI,CAAC,uBACD,OAAO,oBAAoB,QAAQ,YACnC,CAAC,KAAK,MAAM,oBAAoB,GAAG,GACrC;AACE;AAAA,IACJ;AAEA,UAAM,cAAU,4BAAU,oBAAoB,IAAI;AAClD,UAAM,aAAuB,KAAK,MAAM,oBAAoB,GAAG;AAE/D,QAAI,iBAAiB,cAAc,KAAK;AACpC,iBAAW,OAAO,EAAE,KAAK,EAAE,IAAI,cAAc,IAAI,SAAS,EAAE,CAAC;AAAA,IACjE;AAEA,iBAAa;AACb,UAAM,qBAAiB,wBAAS,UAAU;AAC1C,eAAW,OAAO,EAAE,QAAQ,CAAC,SAAS,UAAU;AAvGxD;AAwGY,UAAI,qBAAqB,SAAS,QAAQ,IAAI;AAC1C;AAAA,UACI;AAAA,UACA;AAAA,UACA;AAAA,UACA,UAAS,aAAQ,OAAR,mBAAY,UAAU;AAAA,UAC/B;AAAA,QACJ;AAAA,MACJ;AACA,UAAI,qBAAqB,UAAU,UAAU,WAAW,OAAO,EAAE,SAAS,KAAK,QAAQ,IAAI;AACvF;AAAA,UACI;AAAA,UACA;AAAA,UACA;AAAA,UACA,UAAS,aAAQ,OAAR,mBAAY,UAAU;AAAA,UAC/B;AAAA,QACJ;AAAA,MACJ;AACA,UAAI,CAAC,gBAAgB;AACjB;AAAA,MACJ;AACA,qBAAe,OAAO,IAAI,sBAAsB,EAAE,SAAS,SAAS,eAAe,CAAC;AAAA,IACxF,CAAC;AAED,UAAM,MAAM,SAAS,4BAA4B,KAAK,UAAU,cAAc,GAAG,IAAI;AAAA,EACzF,SAAS,GAAQ;AACb,8BAAM;AAAA,MACF,EAAE,MAAM,2BAA2B,KAAK,EAAE,QAAQ;AAAA,MAClD,EAAE,MAAM,UAAU,KAAK,EAAE,MAAM;AAAA,IACnC,CAAC;AAAA,EACL;AACJ;",
   "names": ["TelegramMenu"]
 }

package/build/lib/object.js

@@ -0,0 +1,35 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var object_exports = {};
+__export(object_exports, {
+  removeDuplicates: () => removeDuplicates,
+  setStateIdsToIdArray: () => setStateIdsToIdArray,
+  trimAllItems: () => trimAllItems
+});
+module.exports = __toCommonJS(object_exports);
+const removeDuplicates = (arr) => arr.filter((item, index) => arr.indexOf(item) === index);
+const trimAllItems = (array) => array.map((item) => item.trim());
+const setStateIdsToIdArray = (setStateIds) => setStateIds.map((obj) => obj.id);
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  removeDuplicates,
+  setStateIdsToIdArray,
+  trimAllItems
+});
+//# sourceMappingURL=object.js.map

package/build/lib/object.js.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../src/lib/object.ts"],
+  "sourcesContent": ["import type { SetStateIds } from '../types/types';\n\nexport const removeDuplicates = (arr: string[]): string[] => arr.filter((item, index) => arr.indexOf(item) === index);\n\nexport const trimAllItems = (array: string[]): string[] => array.map(item => item.trim());\n\nexport const setStateIdsToIdArray = (setStateIds: SetStateIds[]): string[] => setStateIds.map(obj => obj.id);\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAEO,MAAM,mBAAmB,CAAC,QAA4B,IAAI,OAAO,CAAC,MAAM,UAAU,IAAI,QAAQ,IAAI,MAAM,KAAK;AAE7G,MAAM,eAAe,CAAC,UAA8B,MAAM,IAAI,UAAQ,KAAK,KAAK,CAAC;AAEjF,MAAM,uBAAuB,CAAC,gBAAyC,YAAY,IAAI,SAAO,IAAI,EAAE;",
+  "names": []
+}

package/build/lib/processData.js

@@ -1,9 +1,7 @@
 "use strict";
-var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
@@ -17,14 +15,6 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var processData_exports = {};
 __export(processData_exports, {
@@ -33,7 +23,7 @@ __export(processData_exports, {
   getTimeouts: () => getTimeouts
 });
 module.exports = __toCommonJS(processData_exports);
-var import_main = __toESM(require("../main"));
+var import_main = require("../main");
 var import_telegram = require("./telegram");
 var import_sendNav = require("./sendNav");
 var import_subMenu = require("./subMenu");
@@ -64,7 +54,6 @@ async function checkEveryMenuForData(obj) {
     directoryPicture,
     timeoutKey
   } = obj;
-  const _this = import_main.default.getInstance();
   for (const menu of menus) {
     const groupData = menuData.data[menu];
     (0, import_logging.debug)([
@@ -73,7 +62,6 @@ async function checkEveryMenuForData(obj) {
       { text: "Group:", val: menuData.data[menu] }
     ]);
     if (await processData({
-      _this,
       menuData,
       calledValue,
       userToSend,
@@ -90,7 +78,7 @@ async function checkEveryMenuForData(obj) {
       timeoutKey,
       groupData
     })) {
-      (0, import_logging.debug)([{ text: "CalledText found" }]);
+      import_main._this.log.debug("CalledText found");
       return true;
     }
   }
@@ -98,7 +86,6 @@ async function checkEveryMenuForData(obj) {
 }
 async function processData(obj) {
   const {
-    _this,
     menuData,
     calledValue,
     userToSend,
@@ -126,33 +113,33 @@ async function processData(obj) {
       } else {
         valueToSet = calledValue;
       }
-      if (valueToSet) {
-        await _this.setForeignStateAsync(res == null ? void 0 : res.id, valueToSet, res == null ? void 0 : res.ack);
+      if (valueToSet && (res == null ? void 0 : res.id)) {
+        await import_main._this.setForeignStateAsync(res == null ? void 0 : res.id, valueToSet, res == null ? void 0 : res.ack);
       } else {
-        await (0, import_telegram.sendToTelegram)(
-          userToSend,
-          `You insert a wrong Type of value, please insert type: ${res == null ? void 0 : res.valueType}`,
-          void 0,
-          instanceTelegram,
+        await (0, import_telegram.sendToTelegram)({
+          user: userToSend,
+          textToSend: `You insert a wrong Type of value, please insert type: ${res == null ? void 0 : res.valueType}`,
+          keyboard: void 0,
+          instance: instanceTelegram,
           resize_keyboard,
           one_time_keyboard,
           userListWithChatID,
-          "false"
-        );
+          parse_mode: "false"
+        });
       }
       (0, import_dynamicValue.removeUserFromDynamicValue)(userToSend);
       const result = await (0, import_backMenu.switchBack)(userToSend, allMenusWithData, menus, true);
       if (result) {
-        await (0, import_telegram.sendToTelegram)(
-          userToSend,
-          result.texttosend || "",
-          result.menuToSend,
-          instanceTelegram,
+        await (0, import_telegram.sendToTelegram)({
+          user: userToSend,
+          textToSend: result.texttosend || "",
+          keyboard: result.menuToSend,
+          instance: instanceTelegram,
           resize_keyboard,
           one_time_keyboard,
           userListWithChatID,
-          result.parseMode
-        );
+          parse_mode: result.parseMode
+        });
       } else {
         await (0, import_sendNav.sendNav)(
           part,
@@ -188,7 +175,8 @@ async function processData(obj) {
             part,
             allMenusWithData,
             menus,
-            setStateIdsToListenTo
+            setStateIdsToListenTo,
+            part.nav
           );
           if (result && result.setStateIdsToListenTo) {
             setStateIdsToListenTo = result.setStateIdsToListenTo;
@@ -311,7 +299,8 @@ async function processData(obj) {
         part,
         allMenusWithData,
         menus,
-        setStateIdsToListenTo
+        setStateIdsToListenTo,
+        part.nav
       );
       if (result && result.setStateIdsToListenTo) {
         setStateIdsToListenTo = result.setStateIdsToListenTo;

package/build/lib/processData.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/lib/processData.ts"],
-  "sourcesContent": ["import TelegramMenu from '../main';\nimport { sendLocationToTelegram, sendToTelegram } from './telegram';\nimport { sendNav } from './sendNav';\nimport { callSubMenu } from './subMenu';\nimport { backMenuFunc, switchBack } from './backMenu';\nimport { setState } from './setstate';\nimport { getState } from './getstate';\nimport { sendPic } from './sendpic';\nimport { getDynamicValue, removeUserFromDynamicValue } from './dynamicValue';\nimport { adjustValueType } from './action';\nimport { _subscribeAndUnSubscribeForeignStatesAsync } from './subscribeStates';\nimport { getChart } from './echarts';\nimport { httpRequest } from './httpRequest';\nimport { debug, error } from './logging';\nimport type {\n    CheckEveryMenuForDataType,\n    IsUserActiveCheckbox,\n    MenuData,\n    NewObjectNavStructure,\n    Part,\n    ProcessDataType,\n    SetStateIds,\n    Timeouts,\n} from './telegram-menu';\n\nlet setStateIdsToListenTo: SetStateIds[] = [];\nlet timeouts: Timeouts[] = [];\n\nasync function checkEveryMenuForData(obj: CheckEveryMenuForDataType): Promise<boolean> {\n    const {\n        menuData,\n        calledValue,\n        userToSend,\n        instanceTelegram,\n        resize_keyboard,\n        one_time_keyboard,\n        userListWithChatID,\n        menus,\n        isUserActiveCheckbox,\n        token,\n        directoryPicture,\n        timeoutKey,\n    } = obj;\n    const _this = TelegramMenu.getInstance();\n    for (const menu of menus) {\n        const groupData: NewObjectNavStructure = menuData.data[menu];\n        debug([\n            { text: 'Nav:', val: menuData.data[menu] },\n            { text: 'Menu:', val: menu },\n            { text: 'Group:', val: menuData.data[menu] },\n        ]);\n\n        if (\n            await processData({\n                _this,\n                menuData,\n                calledValue: calledValue,\n                userToSend,\n                groupWithUser: menu,\n                instanceTelegram,\n                resize_keyboard: resize_keyboard,\n                one_time_keyboard: one_time_keyboard,\n                userListWithChatID,\n                allMenusWithData: menuData.data,\n                menus,\n                isUserActiveCheckbox,\n                token,\n                directoryPicture,\n                timeoutKey,\n                groupData,\n            })\n        ) {\n            debug([{ text: 'CalledText found' }]);\n            return true;\n        }\n    }\n    return false;\n}\n\nasync function processData(obj: ProcessDataType): Promise<boolean | undefined> {\n    const {\n        _this,\n        menuData,\n        calledValue,\n        userToSend,\n        groupWithUser,\n        instanceTelegram,\n        resize_keyboard,\n        one_time_keyboard,\n        userListWithChatID,\n        allMenusWithData,\n        menus,\n        isUserActiveCheckbox,\n        token,\n        directoryPicture,\n        timeoutKey,\n        groupData,\n    } = obj;\n    try {\n        let part: Part = {} as Part;\n        let call: keyof NewObjectNavStructure = '';\n\n        if (getDynamicValue(userToSend)) {\n            const res = getDynamicValue(userToSend);\n            let valueToSet;\n            if (res && res.valueType) {\n                valueToSet = adjustValueType(calledValue, res.valueType);\n            } else {\n                valueToSet = calledValue;\n            }\n            if (valueToSet) {\n                await _this.setForeignStateAsync(res?.id, valueToSet, res?.ack);\n            } else {\n                await sendToTelegram(\n                    userToSend,\n                    `You insert a wrong Type of value, please insert type: ${res?.valueType}`,\n                    undefined,\n                    instanceTelegram,\n                    resize_keyboard,\n                    one_time_keyboard,\n                    userListWithChatID,\n                    'false',\n                );\n            }\n            removeUserFromDynamicValue(userToSend);\n            const result = await switchBack(userToSend, allMenusWithData, menus, true);\n\n            if (result) {\n                await sendToTelegram(\n                    userToSend,\n                    result.texttosend || '',\n                    result.menuToSend,\n                    instanceTelegram,\n                    resize_keyboard,\n                    one_time_keyboard,\n                    userListWithChatID,\n                    result.parseMode,\n                );\n            } else {\n                await sendNav(\n                    part,\n                    userToSend,\n                    instanceTelegram,\n                    userListWithChatID,\n                    resize_keyboard,\n                    one_time_keyboard,\n                );\n            }\n            return true;\n        }\n        if (calledValue.includes('menu:')) {\n            call = calledValue.split(':')[2] as keyof MenuData;\n        } else {\n            call = calledValue as keyof NewObjectNavStructure;\n        }\n        part = groupData[call];\n\n        if (\n            typeof call === 'string' &&\n            groupData &&\n            part &&\n            !calledValue.toString().includes('menu:') &&\n            userToSend &&\n            groupWithUser &&\n            isUserActiveCheckbox[groupWithUser as keyof IsUserActiveCheckbox]\n        ) {\n            if (part.nav) {\n                debug([{ text: 'Menu to Send:', val: part.nav }]);\n\n                backMenuFunc(call, part.nav, userToSend);\n\n                if (JSON.stringify(part.nav).includes('menu:')) {\n                    debug([{ text: 'Submenu' }]);\n                    const result = await callSubMenu(\n                        JSON.stringify(part.nav),\n                        groupData,\n                        userToSend,\n                        instanceTelegram,\n                        resize_keyboard,\n                        one_time_keyboard,\n                        userListWithChatID,\n                        part,\n                        allMenusWithData,\n                        menus,\n                        setStateIdsToListenTo,\n                    );\n                    if (result && result.setStateIdsToListenTo) {\n                        setStateIdsToListenTo = result.setStateIdsToListenTo;\n                    }\n                    if (result && result.newNav) {\n                        await checkEveryMenuForData({\n                            menuData,\n                            calledValue: result.newNav,\n                            userToSend,\n                            instanceTelegram,\n                            resize_keyboard,\n                            one_time_keyboard,\n                            userListWithChatID,\n                            menus,\n                            isUserActiveCheckbox,\n                            token,\n                            directoryPicture,\n                            timeoutKey,\n                        });\n                    }\n                } else {\n                    await sendNav(\n                        part,\n                        userToSend,\n                        instanceTelegram,\n                        userListWithChatID,\n                        resize_keyboard,\n                        one_time_keyboard,\n                    );\n                }\n                return true;\n            }\n\n            if (part.switch) {\n                const result = await setState(\n                    part,\n                    userToSend,\n                    0,\n                    false,\n                    instanceTelegram,\n                    resize_keyboard,\n                    one_time_keyboard,\n                    userListWithChatID,\n                );\n                if (result) {\n                    setStateIdsToListenTo = result;\n                }\n                if (Array.isArray(setStateIdsToListenTo)) {\n                    await _subscribeAndUnSubscribeForeignStatesAsync({ array: setStateIdsToListenTo });\n                }\n                return true;\n            }\n            if (part.getData) {\n                getState(part, userToSend, instanceTelegram, one_time_keyboard, resize_keyboard, userListWithChatID);\n                return true;\n            }\n            if (part.sendPic) {\n                const result = sendPic(\n                    part,\n                    userToSend,\n                    instanceTelegram,\n                    resize_keyboard,\n                    one_time_keyboard,\n                    userListWithChatID,\n                    token,\n                    directoryPicture,\n                    timeouts,\n                    timeoutKey,\n                );\n                if (result) {\n                    timeouts = result;\n                } else {\n                    debug([{ text: 'Timeouts not found' }]);\n                }\n                return true;\n            }\n            if (part.location) {\n                debug([{ text: 'Send Location' }]);\n                await sendLocationToTelegram(userToSend, part.location, instanceTelegram, userListWithChatID);\n                return true;\n            }\n            if (part.echarts) {\n                debug([{ text: 'Echarts' }]);\n                getChart(\n                    part.echarts,\n                    directoryPicture,\n                    userToSend,\n                    instanceTelegram,\n                    userListWithChatID,\n                    resize_keyboard,\n                    one_time_keyboard,\n                );\n                return true;\n            }\n            if (part.httpRequest) {\n                debug([{ text: 'HttpRequest' }]);\n                const result = await httpRequest(\n                    part,\n                    userToSend,\n                    instanceTelegram,\n                    resize_keyboard,\n                    one_time_keyboard,\n                    userListWithChatID,\n                    directoryPicture,\n                );\n                if (result) {\n                    return true;\n                }\n            }\n        }\n        if (\n            (calledValue.startsWith('menu') || calledValue.startsWith('submenu')) &&\n            menuData.data[groupWithUser][call]\n        ) {\n            debug([{ text: 'Call Submenu' }]);\n            const result = await callSubMenu(\n                calledValue,\n                menuData,\n                userToSend,\n                instanceTelegram,\n                resize_keyboard,\n                one_time_keyboard,\n                userListWithChatID,\n                part,\n                allMenusWithData,\n                menus,\n                setStateIdsToListenTo,\n            );\n            if (result && result.setStateIdsToListenTo) {\n                setStateIdsToListenTo = result.setStateIdsToListenTo;\n            }\n            return true;\n        }\n        return false;\n    } catch (e: any) {\n        error([\n            { text: 'Error processData:', val: e.message },\n            { text: 'Stack:', val: e.stack },\n        ]);\n    }\n}\n\nfunction getStateIdsToListenTo(): SetStateIds[] {\n    return setStateIdsToListenTo;\n}\n\nfunction getTimeouts(): Timeouts[] {\n    return timeouts;\n}\n\nexport { getStateIdsToListenTo, getTimeouts, checkEveryMenuForData };\n"],
-  "mappings": "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",
-  "names": ["TelegramMenu"]
+  "sourcesContent": ["import { _this } from '../main';\nimport { sendLocationToTelegram, sendToTelegram } from './telegram';\nimport { sendNav } from './sendNav';\nimport { callSubMenu } from './subMenu';\nimport { backMenuFunc, switchBack } from './backMenu';\nimport { setState } from './setstate';\nimport { getState } from './getstate';\nimport { sendPic } from './sendpic';\nimport { getDynamicValue, removeUserFromDynamicValue } from './dynamicValue';\nimport { adjustValueType } from './action';\nimport { _subscribeAndUnSubscribeForeignStatesAsync } from './subscribeStates';\nimport { getChart } from './echarts';\nimport { httpRequest } from './httpRequest';\nimport { debug, error } from './logging';\nimport type {\n    CheckEveryMenuForDataType,\n    IsUserActiveCheckbox,\n    MenuData,\n    NewObjectNavStructure,\n    Part,\n    ProcessDataType,\n    SetStateIds,\n    Timeouts,\n} from '../types/types';\n\nlet setStateIdsToListenTo: SetStateIds[] = [];\nlet timeouts: Timeouts[] = [];\n\nasync function checkEveryMenuForData(obj: CheckEveryMenuForDataType): Promise<boolean> {\n    const {\n        menuData,\n        calledValue,\n        userToSend,\n        instanceTelegram,\n        resize_keyboard,\n        one_time_keyboard,\n        userListWithChatID,\n        menus,\n        isUserActiveCheckbox,\n        token,\n        directoryPicture,\n        timeoutKey,\n    } = obj;\n\n    for (const menu of menus) {\n        const groupData: NewObjectNavStructure = menuData.data[menu];\n        debug([\n            { text: 'Nav:', val: menuData.data[menu] },\n            { text: 'Menu:', val: menu },\n            { text: 'Group:', val: menuData.data[menu] },\n        ]);\n\n        if (\n            await processData({\n                menuData,\n                calledValue,\n                userToSend,\n                groupWithUser: menu,\n                instanceTelegram,\n                resize_keyboard: resize_keyboard,\n                one_time_keyboard: one_time_keyboard,\n                userListWithChatID,\n                allMenusWithData: menuData.data,\n                menus,\n                isUserActiveCheckbox,\n                token,\n                directoryPicture,\n                timeoutKey,\n                groupData,\n            })\n        ) {\n            _this.log.debug('CalledText found');\n            return true;\n        }\n    }\n    return false;\n}\n\nasync function processData(obj: ProcessDataType): Promise<boolean | undefined> {\n    const {\n        menuData,\n        calledValue,\n        userToSend,\n        groupWithUser,\n        instanceTelegram,\n        resize_keyboard,\n        one_time_keyboard,\n        userListWithChatID,\n        allMenusWithData,\n        menus,\n        isUserActiveCheckbox,\n        token,\n        directoryPicture,\n        timeoutKey,\n        groupData,\n    } = obj;\n    try {\n        let part: Part = {} as Part;\n        let call: keyof NewObjectNavStructure = '';\n\n        if (getDynamicValue(userToSend)) {\n            const res = getDynamicValue(userToSend);\n            let valueToSet;\n            if (res && res.valueType) {\n                valueToSet = adjustValueType(calledValue, res.valueType);\n            } else {\n                valueToSet = calledValue;\n            }\n            if (valueToSet && res?.id) {\n                await _this.setForeignStateAsync(res?.id, valueToSet, res?.ack);\n            } else {\n                await sendToTelegram({\n                    user: userToSend,\n                    textToSend: `You insert a wrong Type of value, please insert type: ${res?.valueType}`,\n                    keyboard: undefined,\n                    instance: instanceTelegram,\n                    resize_keyboard: resize_keyboard,\n                    one_time_keyboard: one_time_keyboard,\n                    userListWithChatID: userListWithChatID,\n                    parse_mode: 'false',\n                });\n            }\n            removeUserFromDynamicValue(userToSend);\n            const result = await switchBack(userToSend, allMenusWithData, menus, true);\n\n            if (result) {\n                await sendToTelegram({\n                    user: userToSend,\n                    textToSend: result.texttosend || '',\n                    keyboard: result.menuToSend,\n                    instance: instanceTelegram,\n                    resize_keyboard: resize_keyboard,\n                    one_time_keyboard: one_time_keyboard,\n                    userListWithChatID: userListWithChatID,\n                    parse_mode: result.parseMode,\n                });\n            } else {\n                await sendNav(\n                    part,\n                    userToSend,\n                    instanceTelegram,\n                    userListWithChatID,\n                    resize_keyboard,\n                    one_time_keyboard,\n                );\n            }\n            return true;\n        }\n        if (calledValue.includes('menu:')) {\n            call = calledValue.split(':')[2] as keyof MenuData;\n        } else {\n            call = calledValue as keyof NewObjectNavStructure;\n        }\n        part = groupData[call];\n\n        if (\n            typeof call === 'string' &&\n            groupData &&\n            part &&\n            !calledValue.toString().includes('menu:') &&\n            userToSend &&\n            groupWithUser &&\n            isUserActiveCheckbox[groupWithUser as keyof IsUserActiveCheckbox]\n        ) {\n            if (part.nav) {\n                debug([{ text: 'Menu to Send:', val: part.nav }]);\n\n                backMenuFunc(call, part.nav, userToSend);\n\n                if (JSON.stringify(part.nav).includes('menu:')) {\n                    debug([{ text: 'Submenu' }]);\n                    const result = await callSubMenu(\n                        JSON.stringify(part.nav),\n                        groupData,\n                        userToSend,\n                        instanceTelegram,\n                        resize_keyboard,\n                        one_time_keyboard,\n                        userListWithChatID,\n                        part,\n                        allMenusWithData,\n                        menus,\n                        setStateIdsToListenTo,\n                        part.nav,\n                    );\n                    if (result && result.setStateIdsToListenTo) {\n                        setStateIdsToListenTo = result.setStateIdsToListenTo;\n                    }\n                    if (result && result.newNav) {\n                        await checkEveryMenuForData({\n                            menuData,\n                            calledValue: result.newNav,\n                            userToSend,\n                            instanceTelegram,\n                            resize_keyboard,\n                            one_time_keyboard,\n                            userListWithChatID,\n                            menus,\n                            isUserActiveCheckbox,\n                            token,\n                            directoryPicture,\n                            timeoutKey,\n                        });\n                    }\n                } else {\n                    await sendNav(\n                        part,\n                        userToSend,\n                        instanceTelegram,\n                        userListWithChatID,\n                        resize_keyboard,\n                        one_time_keyboard,\n                    );\n                }\n                return true;\n            }\n\n            if (part.switch) {\n                const result = await setState(\n                    part,\n                    userToSend,\n                    0,\n                    false,\n                    instanceTelegram,\n                    resize_keyboard,\n                    one_time_keyboard,\n                    userListWithChatID,\n                );\n                if (result) {\n                    setStateIdsToListenTo = result;\n                }\n                if (Array.isArray(setStateIdsToListenTo)) {\n                    await _subscribeAndUnSubscribeForeignStatesAsync({ array: setStateIdsToListenTo });\n                }\n                return true;\n            }\n            if (part.getData) {\n                getState(part, userToSend, instanceTelegram, one_time_keyboard, resize_keyboard, userListWithChatID);\n                return true;\n            }\n            if (part.sendPic) {\n                const result = sendPic(\n                    part,\n                    userToSend,\n                    instanceTelegram,\n                    resize_keyboard,\n                    one_time_keyboard,\n                    userListWithChatID,\n                    token,\n                    directoryPicture,\n                    timeouts,\n                    timeoutKey,\n                );\n                if (result) {\n                    timeouts = result;\n                } else {\n                    debug([{ text: 'Timeouts not found' }]);\n                }\n                return true;\n            }\n            if (part.location) {\n                debug([{ text: 'Send Location' }]);\n                await sendLocationToTelegram(userToSend, part.location, instanceTelegram, userListWithChatID);\n                return true;\n            }\n            if (part.echarts) {\n                debug([{ text: 'Echarts' }]);\n                getChart(\n                    part.echarts,\n                    directoryPicture,\n                    userToSend,\n                    instanceTelegram,\n                    userListWithChatID,\n                    resize_keyboard,\n                    one_time_keyboard,\n                );\n                return true;\n            }\n            if (part.httpRequest) {\n                debug([{ text: 'HttpRequest' }]);\n                const result = await httpRequest(\n                    part,\n                    userToSend,\n                    instanceTelegram,\n                    resize_keyboard,\n                    one_time_keyboard,\n                    userListWithChatID,\n                    directoryPicture,\n                );\n                if (result) {\n                    return true;\n                }\n            }\n        }\n        if (\n            (calledValue.startsWith('menu') || calledValue.startsWith('submenu')) &&\n            menuData.data[groupWithUser][call]\n        ) {\n            debug([{ text: 'Call Submenu' }]);\n            const result = await callSubMenu(\n                calledValue,\n                menuData,\n                userToSend,\n                instanceTelegram,\n                resize_keyboard,\n                one_time_keyboard,\n                userListWithChatID,\n                part,\n                allMenusWithData,\n                menus,\n                setStateIdsToListenTo,\n                part.nav,\n            );\n            if (result && result.setStateIdsToListenTo) {\n                setStateIdsToListenTo = result.setStateIdsToListenTo;\n            }\n            return true;\n        }\n        return false;\n    } catch (e: any) {\n        error([\n            { text: 'Error processData:', val: e.message },\n            { text: 'Stack:', val: e.stack },\n        ]);\n    }\n}\n\nfunction getStateIdsToListenTo(): SetStateIds[] {\n    return setStateIdsToListenTo;\n}\n\nfunction getTimeouts(): Timeouts[] {\n    return timeouts;\n}\n\nexport { getStateIdsToListenTo, getTimeouts, checkEveryMenuForData };\n"],
+  "mappings": "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",
+  "names": []
 }

package/build/lib/sendNav.js

@@ -31,16 +31,16 @@ async function sendNav(part, userToSend, instanceTelegram, userListWithChatID, r
       (0, import_logging.debug)([{ text: "Send Nav to Telegram" }]);
       const nav = part.nav;
       const text = await (0, import_utilities.checkStatusInfo)(part.text);
-      await (0, import_telegram.sendToTelegram)(
-        userToSend,
-        text,
-        nav,
-        instanceTelegram,
+      await (0, import_telegram.sendToTelegram)({
+        user: userToSend,
+        textToSend: text,
+        keyboard: nav,
+        instance: instanceTelegram,
         resize_keyboard,
         one_time_keyboard,
         userListWithChatID,
-        part.parse_mode || "false"
-      );
+        parse_mode: part.parse_mode || "false"
+      });
     }
   } catch (e) {
     (0, import_console.error)([

package/build/lib/sendNav.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/lib/sendNav.ts"],
-  "sourcesContent": ["import { error } from 'console';\nimport { debug } from './logging';\nimport { sendToTelegram } from './telegram';\nimport { checkStatusInfo } from './utilities';\nimport type { Part, UserListWithChatId } from './telegram-menu';\n\nasync function sendNav(\n    part: Part,\n    userToSend: string,\n    instanceTelegram: string,\n    userListWithChatID: UserListWithChatId[],\n    resize_keyboard: boolean,\n    one_time_keyboard: boolean,\n): Promise<void> {\n    try {\n        if (userToSend) {\n            debug([{ text: 'Send Nav to Telegram' }]);\n            const nav = part.nav;\n            const text = await checkStatusInfo(part.text as string);\n\n            await sendToTelegram(\n                userToSend,\n                text as string,\n                nav,\n                instanceTelegram,\n                resize_keyboard,\n                one_time_keyboard,\n                userListWithChatID,\n                part.parse_mode || 'false',\n            );\n        }\n    } catch (e: any) {\n        error([\n            { text: 'Error sendNav:', val: e.message },\n            { text: 'Stack:', val: e.stack },\n        ]);\n    }\n}\n\nexport { sendNav };\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,qBAAsB;AACtB,qBAAsB;AACtB,sBAA+B;AAC/B,uBAAgC;AAGhC,eAAe,QACX,MACA,YACA,kBACA,oBACA,iBACA,mBACa;AACb,MAAI;AACA,QAAI,YAAY;AACZ,gCAAM,CAAC,EAAE,MAAM,uBAAuB,CAAC,CAAC;AACxC,YAAM,MAAM,KAAK;AACjB,YAAM,OAAO,UAAM,kCAAgB,KAAK,IAAc;AAEtD,gBAAM;AAAA,QACF;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA,KAAK,cAAc;AAAA,MACvB;AAAA,IACJ;AAAA,EACJ,SAAS,GAAQ;AACb,8BAAM;AAAA,MACF,EAAE,MAAM,kBAAkB,KAAK,EAAE,QAAQ;AAAA,MACzC,EAAE,MAAM,UAAU,KAAK,EAAE,MAAM;AAAA,IACnC,CAAC;AAAA,EACL;AACJ;",
+  "sourcesContent": ["import { error } from 'console';\nimport { debug } from './logging';\nimport { sendToTelegram } from './telegram';\nimport { checkStatusInfo } from './utilities';\nimport type { Part, UserListWithChatId } from '../types/types';\n\nasync function sendNav(\n    part: Part,\n    userToSend: string,\n    instanceTelegram: string,\n    userListWithChatID: UserListWithChatId[],\n    resize_keyboard: boolean,\n    one_time_keyboard: boolean,\n): Promise<void> {\n    try {\n        if (userToSend) {\n            debug([{ text: 'Send Nav to Telegram' }]);\n            const nav = part.nav;\n            const text = await checkStatusInfo(part.text as string);\n\n            await sendToTelegram({\n                user: userToSend,\n                textToSend: text as string,\n                keyboard: nav,\n                instance: instanceTelegram,\n                resize_keyboard: resize_keyboard,\n                one_time_keyboard: one_time_keyboard,\n                userListWithChatID: userListWithChatID,\n                parse_mode: part.parse_mode || 'false',\n            });\n        }\n    } catch (e: any) {\n        error([\n            { text: 'Error sendNav:', val: e.message },\n            { text: 'Stack:', val: e.stack },\n        ]);\n    }\n}\n\nexport { sendNav };\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,qBAAsB;AACtB,qBAAsB;AACtB,sBAA+B;AAC/B,uBAAgC;AAGhC,eAAe,QACX,MACA,YACA,kBACA,oBACA,iBACA,mBACa;AACb,MAAI;AACA,QAAI,YAAY;AACZ,gCAAM,CAAC,EAAE,MAAM,uBAAuB,CAAC,CAAC;AACxC,YAAM,MAAM,KAAK;AACjB,YAAM,OAAO,UAAM,kCAAgB,KAAK,IAAc;AAEtD,gBAAM,gCAAe;AAAA,QACjB,MAAM;AAAA,QACN,YAAY;AAAA,QACZ,UAAU;AAAA,QACV,UAAU;AAAA,QACV;AAAA,QACA;AAAA,QACA;AAAA,QACA,YAAY,KAAK,cAAc;AAAA,MACnC,CAAC;AAAA,IACL;AAAA,EACJ,SAAS,GAAQ;AACb,8BAAM;AAAA,MACF,EAAE,MAAM,kBAAkB,KAAK,EAAE,QAAQ;AAAA,MACzC,EAAE,MAAM,UAAU,KAAK,EAAE,MAAM;AAAA,IACnC,CAAC;AAAA,EACL;AACJ;",
   "names": []
 }

package/build/lib/sendpic.js

@@ -32,11 +32,10 @@ __export(sendpic_exports, {
 });
 module.exports = __toCommonJS(sendpic_exports);
 var import_telegram = require("./telegram");
-var import_utilities = require("./utilities");
+var import_global = require("./global");
 var import_child_process = require("child_process");
 var import_logging = require("./logging");
 var import_main = __toESM(require("../main"));
-var import_global = require("./global");
 function sendPic(part, userToSend, instanceTelegram, resize_keyboard, one_time_keyboard, userListWithChatID, token, directoryPicture, timeouts, timeoutKey) {
   var _a;
   try {
@@ -45,7 +44,7 @@ function sendPic(part, userToSend, instanceTelegram, resize_keyboard, one_time_k
       let path = "";
       if (element.id != "-") {
         const url = element.id;
-        const newUrl = (0, import_utilities.replaceAll)(url, "&", "&");
+        const newUrl = (0, import_global.replaceAll)(url, "&", "&");
         (0, import_child_process.exec)(
           `curl -H "Autorisation: Bearer ${token.trim()}" "${newUrl}" > ${directoryPicture}${element.fileName}`,
           (error2, stdout, stderr) => {
@@ -71,25 +70,27 @@ function sendPic(part, userToSend, instanceTelegram, resize_keyboard, one_time_k
       } else {
         return;
       }
-      const timeout = _this.setTimeout(async () => {
-        await (0, import_telegram.sendToTelegram)(
-          userToSend,
-          path,
-          void 0,
-          instanceTelegram,
-          resize_keyboard,
-          one_time_keyboard,
-          userListWithChatID,
-          "false"
-        );
-        let timeoutToClear = [];
-        timeoutToClear = timeouts.filter((item) => item.key == timeoutKey);
-        timeoutToClear.forEach((item) => {
-          clearTimeout(item.timeout);
-        });
-        timeouts = timeouts.filter((item) => item.key !== timeoutKey);
-        (0, import_logging.debug)([{ text: "Picture sent" }]);
-      }, parseInt(element.delay));
+      const timeout = _this.setTimeout(
+        async () => {
+          await (0, import_telegram.sendToTelegram)({
+            user: userToSend,
+            textToSend: path,
+            instance: instanceTelegram,
+            resize_keyboard,
+            one_time_keyboard,
+            userListWithChatID,
+            parse_mode: "false"
+          });
+          let timeoutToClear = [];
+          timeoutToClear = timeouts.filter((item) => item.key == timeoutKey);
+          timeoutToClear.forEach((item) => {
+            _this.clearTimeout(item.timeout);
+          });
+          timeouts = timeouts.filter((item) => item.key !== timeoutKey);
+          (0, import_logging.debug)([{ text: "Picture sent" }]);
+        },
+        parseInt(String(element.delay))
+      );
       if (timeout) {
         timeouts.push({ key: timeoutKey, timeout });
       }

package/build/lib/sendpic.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/lib/sendpic.ts"],
-  "sourcesContent": ["import { sendToTelegram } from './telegram';\nimport { replaceAll } from './utilities';\nimport { exec } from 'child_process';\nimport { debug, error } from './logging';\nimport TelegramMenu from '../main';\nimport type { Part, UserListWithChatId, Timeouts } from './telegram-menu';\nimport { checkDirectoryIsOk } from './global';\n\nfunction sendPic(\n    part: Part,\n    userToSend: string,\n    instanceTelegram: string,\n    resize_keyboard: boolean,\n    one_time_keyboard: boolean,\n    userListWithChatID: UserListWithChatId[],\n    token: string,\n    directoryPicture: string,\n    timeouts: Timeouts[],\n    timeoutKey: string,\n): Timeouts[] {\n    try {\n        part.sendPic?.forEach(element => {\n            const _this = TelegramMenu.getInstance();\n            let path = '';\n            if (element.id != '-') {\n                const url = element.id;\n                const newUrl = replaceAll(url, '&', '&');\n\n                exec(\n                    `curl -H \"Autorisation: Bearer ${token.trim()}\" \"${newUrl}\" > ${directoryPicture}${element.fileName}`,\n                    (error: any, stdout: any, stderr: any) => {\n                        if (stdout) {\n                            debug([{ text: 'Stdout:', val: stdout }]);\n                        }\n                        if (stderr) {\n                            debug([{ text: 'Stderr:', val: stderr }]);\n                        }\n                        if (error) {\n                            error([{ text: 'Error:', val: error }]);\n                            return;\n                        }\n                    },\n                );\n\n                debug([{ text: 'Delay Time:', val: element.delay }]);\n                timeoutKey += 1;\n\n                if (!checkDirectoryIsOk(directoryPicture)) {\n                    return;\n                }\n\n                path = `${directoryPicture}${element.fileName}`;\n                debug([{ text: 'Path : ', val: path }]);\n            } else {\n                return;\n            }\n\n            const timeout = _this.setTimeout(async () => {\n                await sendToTelegram(\n                    userToSend,\n                    path,\n                    undefined,\n                    instanceTelegram,\n                    resize_keyboard,\n                    one_time_keyboard,\n                    userListWithChatID,\n                    'false',\n                );\n                let timeoutToClear: Timeouts[] = [];\n                timeoutToClear = timeouts.filter(item => item.key == timeoutKey);\n                timeoutToClear.forEach(item => {\n                    clearTimeout(item.timeout);\n                });\n\n                timeouts = timeouts.filter(item => item.key !== timeoutKey);\n                debug([{ text: 'Picture sent' }]);\n            }, parseInt(element.delay));\n\n            if (timeout) {\n                timeouts.push({ key: timeoutKey, timeout: timeout });\n            }\n        });\n        return timeouts;\n    } catch (e: any) {\n        error([\n            { text: 'Error:', val: e.message },\n            { text: 'Stack:', val: e.stack },\n        ]);\n    }\n    return timeouts;\n}\n\nexport { sendPic };\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,sBAA+B;AAC/B,uBAA2B;AAC3B,2BAAqB;AACrB,qBAA6B;AAC7B,kBAAyB;AAEzB,oBAAmC;AAEnC,SAAS,QACL,MACA,YACA,kBACA,iBACA,mBACA,oBACA,OACA,kBACA,UACA,YACU;AAnBd;AAoBI,MAAI;AACA,eAAK,YAAL,mBAAc,QAAQ,aAAW;AAC7B,YAAM,QAAQ,YAAAA,QAAa,YAAY;AACvC,UAAI,OAAO;AACX,UAAI,QAAQ,MAAM,KAAK;AACnB,cAAM,MAAM,QAAQ;AACpB,cAAM,aAAS,6BAAW,KAAK,SAAS,GAAG;AAE3C;AAAA,UACI,iCAAiC,MAAM,KAAK,CAAC,MAAM,MAAM,OAAO,gBAAgB,GAAG,QAAQ,QAAQ;AAAA,UACnG,CAACC,QAAY,QAAa,WAAgB;AACtC,gBAAI,QAAQ;AACR,wCAAM,CAAC,EAAE,MAAM,WAAW,KAAK,OAAO,CAAC,CAAC;AAAA,YAC5C;AACA,gBAAI,QAAQ;AACR,wCAAM,CAAC,EAAE,MAAM,WAAW,KAAK,OAAO,CAAC,CAAC;AAAA,YAC5C;AACA,gBAAIA,QAAO;AACP,cAAAA,OAAM,CAAC,EAAE,MAAM,UAAU,KAAKA,OAAM,CAAC,CAAC;AACtC;AAAA,YACJ;AAAA,UACJ;AAAA,QACJ;AAEA,kCAAM,CAAC,EAAE,MAAM,eAAe,KAAK,QAAQ,MAAM,CAAC,CAAC;AACnD,sBAAc;AAEd,YAAI,KAAC,kCAAmB,gBAAgB,GAAG;AACvC;AAAA,QACJ;AAEA,eAAO,GAAG,gBAAgB,GAAG,QAAQ,QAAQ;AAC7C,kCAAM,CAAC,EAAE,MAAM,WAAW,KAAK,KAAK,CAAC,CAAC;AAAA,MAC1C,OAAO;AACH;AAAA,MACJ;AAEA,YAAM,UAAU,MAAM,WAAW,YAAY;AACzC,kBAAM;AAAA,UACF;AAAA,UACA;AAAA,UACA;AAAA,UACA;AAAA,UACA;AAAA,UACA;AAAA,UACA;AAAA,UACA;AAAA,QACJ;AACA,YAAI,iBAA6B,CAAC;AAClC,yBAAiB,SAAS,OAAO,UAAQ,KAAK,OAAO,UAAU;AAC/D,uBAAe,QAAQ,UAAQ;AAC3B,uBAAa,KAAK,OAAO;AAAA,QAC7B,CAAC;AAED,mBAAW,SAAS,OAAO,UAAQ,KAAK,QAAQ,UAAU;AAC1D,kCAAM,CAAC,EAAE,MAAM,eAAe,CAAC,CAAC;AAAA,MACpC,GAAG,SAAS,QAAQ,KAAK,CAAC;AAE1B,UAAI,SAAS;AACT,iBAAS,KAAK,EAAE,KAAK,YAAY,QAAiB,CAAC;AAAA,MACvD;AAAA,IACJ;AACA,WAAO;AAAA,EACX,SAAS,GAAQ;AACb,8BAAM;AAAA,MACF,EAAE,MAAM,UAAU,KAAK,EAAE,QAAQ;AAAA,MACjC,EAAE,MAAM,UAAU,KAAK,EAAE,MAAM;AAAA,IACnC,CAAC;AAAA,EACL;AACA,SAAO;AACX;",
+  "sourcesContent": ["import { sendToTelegram } from './telegram';\nimport { checkDirectoryIsOk, replaceAll } from './global';\nimport { exec } from 'child_process';\nimport { debug, error } from './logging';\nimport TelegramMenu from '../main';\nimport type { Part, Timeouts, UserListWithChatId } from '../types/types';\n\nfunction sendPic(\n    part: Part,\n    userToSend: string,\n    instanceTelegram: string,\n    resize_keyboard: boolean,\n    one_time_keyboard: boolean,\n    userListWithChatID: UserListWithChatId[],\n    token: string,\n    directoryPicture: string,\n    timeouts: Timeouts[],\n    timeoutKey: string,\n): Timeouts[] {\n    try {\n        part.sendPic?.forEach(element => {\n            const _this = TelegramMenu.getInstance();\n            let path = '';\n            if (element.id != '-') {\n                const url = element.id;\n                const newUrl = replaceAll(url, '&', '&');\n\n                exec(\n                    `curl -H \"Autorisation: Bearer ${token.trim()}\" \"${newUrl}\" > ${directoryPicture}${element.fileName}`,\n                    (error: any, stdout: any, stderr: any) => {\n                        if (stdout) {\n                            debug([{ text: 'Stdout:', val: stdout }]);\n                        }\n                        if (stderr) {\n                            debug([{ text: 'Stderr:', val: stderr }]);\n                        }\n                        if (error) {\n                            error([{ text: 'Error:', val: error }]);\n                            return;\n                        }\n                    },\n                );\n\n                debug([{ text: 'Delay Time:', val: element.delay }]);\n                timeoutKey += 1;\n\n                if (!checkDirectoryIsOk(directoryPicture)) {\n                    return;\n                }\n\n                path = `${directoryPicture}${element.fileName}`;\n                debug([{ text: 'Path : ', val: path }]);\n            } else {\n                return;\n            }\n\n            const timeout = _this.setTimeout(\n                async () => {\n                    await sendToTelegram({\n                        user: userToSend,\n                        textToSend: path,\n                        instance: instanceTelegram,\n                        resize_keyboard: resize_keyboard,\n                        one_time_keyboard: one_time_keyboard,\n                        userListWithChatID: userListWithChatID,\n                        parse_mode: 'false',\n                    });\n                    let timeoutToClear: Timeouts[] = [];\n                    timeoutToClear = timeouts.filter(item => item.key == timeoutKey);\n                    timeoutToClear.forEach(item => {\n                        _this.clearTimeout(item.timeout);\n                    });\n\n                    timeouts = timeouts.filter(item => item.key !== timeoutKey);\n                    debug([{ text: 'Picture sent' }]);\n                },\n                parseInt(String(element.delay)),\n            );\n\n            if (timeout) {\n                timeouts.push({ key: timeoutKey, timeout: timeout });\n            }\n        });\n        return timeouts;\n    } catch (e: any) {\n        error([\n            { text: 'Error:', val: e.message },\n            { text: 'Stack:', val: e.stack },\n        ]);\n    }\n    return timeouts;\n}\n\nexport { sendPic };\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,sBAA+B;AAC/B,oBAA+C;AAC/C,2BAAqB;AACrB,qBAA6B;AAC7B,kBAAyB;AAGzB,SAAS,QACL,MACA,YACA,kBACA,iBACA,mBACA,oBACA,OACA,kBACA,UACA,YACU;AAlBd;AAmBI,MAAI;AACA,eAAK,YAAL,mBAAc,QAAQ,aAAW;AAC7B,YAAM,QAAQ,YAAAA,QAAa,YAAY;AACvC,UAAI,OAAO;AACX,UAAI,QAAQ,MAAM,KAAK;AACnB,cAAM,MAAM,QAAQ;AACpB,cAAM,aAAS,0BAAW,KAAK,SAAS,GAAG;AAE3C;AAAA,UACI,iCAAiC,MAAM,KAAK,CAAC,MAAM,MAAM,OAAO,gBAAgB,GAAG,QAAQ,QAAQ;AAAA,UACnG,CAACC,QAAY,QAAa,WAAgB;AACtC,gBAAI,QAAQ;AACR,wCAAM,CAAC,EAAE,MAAM,WAAW,KAAK,OAAO,CAAC,CAAC;AAAA,YAC5C;AACA,gBAAI,QAAQ;AACR,wCAAM,CAAC,EAAE,MAAM,WAAW,KAAK,OAAO,CAAC,CAAC;AAAA,YAC5C;AACA,gBAAIA,QAAO;AACP,cAAAA,OAAM,CAAC,EAAE,MAAM,UAAU,KAAKA,OAAM,CAAC,CAAC;AACtC;AAAA,YACJ;AAAA,UACJ;AAAA,QACJ;AAEA,kCAAM,CAAC,EAAE,MAAM,eAAe,KAAK,QAAQ,MAAM,CAAC,CAAC;AACnD,sBAAc;AAEd,YAAI,KAAC,kCAAmB,gBAAgB,GAAG;AACvC;AAAA,QACJ;AAEA,eAAO,GAAG,gBAAgB,GAAG,QAAQ,QAAQ;AAC7C,kCAAM,CAAC,EAAE,MAAM,WAAW,KAAK,KAAK,CAAC,CAAC;AAAA,MAC1C,OAAO;AACH;AAAA,MACJ;AAEA,YAAM,UAAU,MAAM;AAAA,QAClB,YAAY;AACR,oBAAM,gCAAe;AAAA,YACjB,MAAM;AAAA,YACN,YAAY;AAAA,YACZ,UAAU;AAAA,YACV;AAAA,YACA;AAAA,YACA;AAAA,YACA,YAAY;AAAA,UAChB,CAAC;AACD,cAAI,iBAA6B,CAAC;AAClC,2BAAiB,SAAS,OAAO,UAAQ,KAAK,OAAO,UAAU;AAC/D,yBAAe,QAAQ,UAAQ;AAC3B,kBAAM,aAAa,KAAK,OAAO;AAAA,UACnC,CAAC;AAED,qBAAW,SAAS,OAAO,UAAQ,KAAK,QAAQ,UAAU;AAC1D,oCAAM,CAAC,EAAE,MAAM,eAAe,CAAC,CAAC;AAAA,QACpC;AAAA,QACA,SAAS,OAAO,QAAQ,KAAK,CAAC;AAAA,MAClC;AAEA,UAAI,SAAS;AACT,iBAAS,KAAK,EAAE,KAAK,YAAY,QAAiB,CAAC;AAAA,MACvD;AAAA,IACJ;AACA,WAAO;AAAA,EACX,SAAS,GAAQ;AACb,8BAAM;AAAA,MACF,EAAE,MAAM,UAAU,KAAK,EAAE,QAAQ;AAAA,MACjC,EAAE,MAAM,UAAU,KAAK,EAAE,MAAM;AAAA,IACnC,CAAC;AAAA,EACL;AACA,SAAO;AACX;",
   "names": ["TelegramMenu", "error"]
 }

package/build/lib/setstate.js

@@ -122,16 +122,16 @@ const setState = async (part, userToSend, valueFromSubmenu, SubmenuValuePriority
         const returnObj = JSON.parse(returnText.slice(returnText.indexOf("{"), returnText.indexOf("}") + 1));
         returnObj.text = returnObj.text + returnText.slice(returnText.indexOf("}") + 1);
         if (textToSend && textToSend !== "") {
-          await (0, import_telegram.sendToTelegram)(
-            userToSend,
+          await (0, import_telegram.sendToTelegram)({
+            user: userToSend,
             textToSend,
-            void 0,
-            telegramInstance,
-            one_time_keyboard,
-            resize_keyboard,
+            keyboard: void 0,
+            instance: telegramInstance,
+            resize_keyboard: one_time_keyboard,
+            one_time_keyboard: resize_keyboard,
             userListWithChatID,
-            element.parse_mode
-          );
+            parse_mode: element.parse_mode
+          });
         }
         setStateIds.push({
           id: returnObj.id,

package/build/lib/setstate.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/lib/setstate.ts"],
-  "sourcesContent": ["import { sendToTelegram } from './telegram';\nimport { checkTypeOfId } from './utilities';\nimport { setDynamicValue } from './dynamicValue';\nimport { decomposeText } from './global';\nimport TelegramMenu from '../main';\nimport { debug, error } from './logging';\nimport type { Part, UserListWithChatId, SetStateIds } from './telegram-menu';\n\nconst modifiedValue = (valueFromSubmenu: string, value: string): string => {\n    if (value && value.includes('{value}')) {\n        return value.replace('{value}', valueFromSubmenu);\n    }\n    return valueFromSubmenu;\n};\nconst isDynamicValueToSet = async (value: string | number | boolean): Promise<string | number | boolean> => {\n    const _this = TelegramMenu.getInstance();\n    if (typeof value === 'string' && value.includes('{id:')) {\n        const result = decomposeText(value, '{id:', '}');\n        const id = result.substring.replace('{id:', '').replace('}', '');\n        const newValue = await _this.getForeignStateAsync(id);\n        if (newValue && newValue.val && typeof newValue.val === 'string') {\n            return value.replace(result.substring, newValue.val);\n        }\n    }\n    return value;\n};\nconst setValue = async (\n    id: string,\n    value: string,\n    SubmenuValuePriority: boolean,\n    valueFromSubmenu: string | number,\n    ack: boolean,\n): Promise<void> => {\n    try {\n        const _this = TelegramMenu.getInstance();\n        let valueToSet;\n        SubmenuValuePriority\n            ? (valueToSet = modifiedValue(valueFromSubmenu as string, value))\n            : (valueToSet = await isDynamicValueToSet(value));\n        await checkTypeOfId(id, valueToSet).then((val: ioBroker.StateValue | ioBroker.SettableState | undefined) => {\n            valueToSet = val;\n            debug([{ text: 'Value to Set:', val: valueToSet }]);\n            if (valueToSet !== undefined && valueToSet !== null) {\n                _this.setForeignState(id, valueToSet, ack);\n            }\n        });\n    } catch (error: any) {\n        error([\n            { text: 'Error setValue', val: error.message },\n            { text: 'Stack', val: error.stack },\n        ]);\n    }\n};\n\nexport const setState = async (\n    part: Part,\n    userToSend: string,\n    valueFromSubmenu: string | number,\n    SubmenuValuePriority: boolean,\n    telegramInstance: string,\n    resize_keyboard: boolean,\n    one_time_keyboard: boolean,\n    userListWithChatID: UserListWithChatId[],\n): Promise<SetStateIds[] | undefined> => {\n    const _this = TelegramMenu.getInstance();\n    try {\n        const setStateIds: SetStateIds[] = [];\n        if (!part.switch) {\n            return;\n        }\n        for (const element of part.switch) {\n            let ack = false;\n            let returnText = element.returnText;\n\n            ack = element?.ack ? element.ack === 'true' : false;\n\n            if (returnText.includes('{setDynamicValue')) {\n                const { confirmText, id } = await setDynamicValue(\n                    returnText,\n                    ack,\n                    element.id,\n                    userToSend,\n                    telegramInstance,\n                    one_time_keyboard,\n                    resize_keyboard,\n                    userListWithChatID,\n                    element.parse_mode,\n                    element.confirm,\n                );\n\n                if (element.confirm) {\n                    setStateIds.push({\n                        id: id || element.id,\n                        confirm: element.confirm,\n                        returnText: confirmText,\n                        userToSend: userToSend,\n                    });\n                    return setStateIds;\n                }\n            }\n\n            if (!returnText.includes(\"{'id':'\")) {\n                setStateIds.push({\n                    id: element.id,\n                    confirm: element.confirm,\n                    returnText: returnText,\n                    userToSend: userToSend,\n                    parse_mode: element.parse_mode,\n                });\n            } else {\n                returnText = returnText.replace(/'/g, '\"');\n                const textToSend = returnText.slice(0, returnText.indexOf('{')).trim();\n                const returnObj = JSON.parse(returnText.slice(returnText.indexOf('{'), returnText.indexOf('}') + 1));\n\n                returnObj.text = returnObj.text + returnText.slice(returnText.indexOf('}') + 1);\n                if (textToSend && textToSend !== '') {\n                    await sendToTelegram(\n                        userToSend,\n                        textToSend,\n                        undefined,\n                        telegramInstance,\n                        one_time_keyboard,\n                        resize_keyboard,\n                        userListWithChatID,\n                        element.parse_mode,\n                    );\n                }\n\n                setStateIds.push({\n                    id: returnObj.id,\n                    confirm: true,\n                    returnText: returnObj.text,\n                    userToSend: userToSend,\n                });\n            }\n            if (element.toggle) {\n                _this\n                    .getForeignStateAsync(element.id)\n                    .then(val => {\n                        if (val) {\n                            _this.setForeignStateAsync(element.id, !val.val, ack).catch((e: any) => {\n                                error([\n                                    { text: 'Error', val: e.message },\n                                    { text: 'Stack', val: e.stack },\n                                ]);\n                            });\n                        }\n                    })\n                    .catch((e: any) => {\n                        error([\n                            { text: 'Error', val: e.message },\n                            { text: 'Stack', val: e.stack },\n                        ]);\n                    });\n            } else {\n                await setValue(element.id, element.value, SubmenuValuePriority, valueFromSubmenu, ack);\n            }\n        }\n        return setStateIds;\n    } catch (error: any) {\n        error([\n            { text: 'Error Switch', val: error.message },\n            { text: 'Stack', val: error.stack },\n        ]);\n    }\n};\n"],
-  "mappings": "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",
+  "sourcesContent": ["import { sendToTelegram } from './telegram';\nimport { checkTypeOfId } from './utilities';\nimport { setDynamicValue } from './dynamicValue';\nimport { decomposeText } from './global';\nimport TelegramMenu from '../main';\nimport { debug, error } from './logging';\nimport type { Part, UserListWithChatId, SetStateIds } from '../types/types';\n\nconst modifiedValue = (valueFromSubmenu: string, value: string): string => {\n    if (value && value.includes('{value}')) {\n        return value.replace('{value}', valueFromSubmenu);\n    }\n    return valueFromSubmenu;\n};\nconst isDynamicValueToSet = async (value: string | number | boolean): Promise<string | number | boolean> => {\n    const _this = TelegramMenu.getInstance();\n    if (typeof value === 'string' && value.includes('{id:')) {\n        const result = decomposeText(value, '{id:', '}');\n        const id = result.substring.replace('{id:', '').replace('}', '');\n        const newValue = await _this.getForeignStateAsync(id);\n        if (newValue && newValue.val && typeof newValue.val === 'string') {\n            return value.replace(result.substring, newValue.val);\n        }\n    }\n    return value;\n};\nconst setValue = async (\n    id: string,\n    value: string,\n    SubmenuValuePriority: boolean,\n    valueFromSubmenu: string | number,\n    ack: boolean,\n): Promise<void> => {\n    try {\n        const _this = TelegramMenu.getInstance();\n        let valueToSet;\n        SubmenuValuePriority\n            ? (valueToSet = modifiedValue(valueFromSubmenu as string, value))\n            : (valueToSet = await isDynamicValueToSet(value));\n        await checkTypeOfId(id, valueToSet).then((val: ioBroker.StateValue | ioBroker.SettableState | undefined) => {\n            valueToSet = val;\n            debug([{ text: 'Value to Set:', val: valueToSet }]);\n            if (valueToSet !== undefined && valueToSet !== null) {\n                _this.setForeignState(id, valueToSet, ack);\n            }\n        });\n    } catch (error: any) {\n        error([\n            { text: 'Error setValue', val: error.message },\n            { text: 'Stack', val: error.stack },\n        ]);\n    }\n};\n\nexport const setState = async (\n    part: Part,\n    userToSend: string,\n    valueFromSubmenu: string | number,\n    SubmenuValuePriority: boolean,\n    telegramInstance: string,\n    resize_keyboard: boolean,\n    one_time_keyboard: boolean,\n    userListWithChatID: UserListWithChatId[],\n): Promise<SetStateIds[] | undefined> => {\n    const _this = TelegramMenu.getInstance();\n    try {\n        const setStateIds: SetStateIds[] = [];\n        if (!part.switch) {\n            return;\n        }\n        for (const element of part.switch) {\n            let ack = false;\n            let returnText = element.returnText;\n\n            ack = element?.ack ? element.ack === 'true' : false;\n\n            if (returnText.includes('{setDynamicValue')) {\n                const { confirmText, id } = await setDynamicValue(\n                    returnText,\n                    ack,\n                    element.id,\n                    userToSend,\n                    telegramInstance,\n                    one_time_keyboard,\n                    resize_keyboard,\n                    userListWithChatID,\n                    element.parse_mode,\n                    element.confirm,\n                );\n\n                if (element.confirm) {\n                    setStateIds.push({\n                        id: id || element.id,\n                        confirm: element.confirm,\n                        returnText: confirmText,\n                        userToSend: userToSend,\n                    });\n                    return setStateIds;\n                }\n            }\n\n            if (!returnText.includes(\"{'id':'\")) {\n                setStateIds.push({\n                    id: element.id,\n                    confirm: element.confirm,\n                    returnText: returnText,\n                    userToSend: userToSend,\n                    parse_mode: element.parse_mode,\n                });\n            } else {\n                returnText = returnText.replace(/'/g, '\"');\n                const textToSend = returnText.slice(0, returnText.indexOf('{')).trim();\n                const returnObj = JSON.parse(returnText.slice(returnText.indexOf('{'), returnText.indexOf('}') + 1));\n\n                returnObj.text = returnObj.text + returnText.slice(returnText.indexOf('}') + 1);\n                if (textToSend && textToSend !== '') {\n                    await sendToTelegram({\n                        user: userToSend,\n                        textToSend: textToSend,\n                        keyboard: undefined,\n                        instance: telegramInstance,\n                        resize_keyboard: one_time_keyboard,\n                        one_time_keyboard: resize_keyboard,\n                        userListWithChatID: userListWithChatID,\n                        parse_mode: element.parse_mode,\n                    });\n                }\n\n                setStateIds.push({\n                    id: returnObj.id,\n                    confirm: true,\n                    returnText: returnObj.text,\n                    userToSend: userToSend,\n                });\n            }\n            if (element.toggle) {\n                _this\n                    .getForeignStateAsync(element.id)\n                    .then(val => {\n                        if (val) {\n                            _this.setForeignStateAsync(element.id, !val.val, ack).catch((e: any) => {\n                                error([\n                                    { text: 'Error', val: e.message },\n                                    { text: 'Stack', val: e.stack },\n                                ]);\n                            });\n                        }\n                    })\n                    .catch((e: any) => {\n                        error([\n                            { text: 'Error', val: e.message },\n                            { text: 'Stack', val: e.stack },\n                        ]);\n                    });\n            } else {\n                await setValue(element.id, element.value, SubmenuValuePriority, valueFromSubmenu, ack);\n            }\n        }\n        return setStateIds;\n    } catch (error: any) {\n        error([\n            { text: 'Error Switch', val: error.message },\n            { text: 'Stack', val: error.stack },\n        ]);\n    }\n};\n"],
+  "mappings": "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",
   "names": ["TelegramMenu", "error"]
 }

package/build/lib/shoppingList.js

@@ -65,16 +65,16 @@ async function shoppingListSubscribeStateAndDeleteItem(val, instanceTelegram, us
         );
         return;
       }
-      await (0, import_telegram.sendToTelegram)(
+      await (0, import_telegram.sendToTelegram)({
         user,
-        "Cannot delete the Item",
-        void 0,
-        instanceTelegram,
+        textToSend: "Cannot delete the Item",
+        keyboard: void 0,
+        instance: instanceTelegram,
         resize_keyboard,
         one_time_keyboard,
         userListWithChatID,
-        "true"
-      );
+        parse_mode: "true"
+      });
       (0, import_logging.debug)([{ text: "Cannot delete the Item" }]);
       return;
     }