iobroker.telegram-menu 0.4.0 → 0.4.1

package/README.md

@@ -33,6 +33,10 @@ You can create different groups with separate menus, and then assign users to th
 	Placeholder for the next version (at the beginning of the line):
 	### **WORK IN PROGRESS**
 -->
+### 0.4.1 (2023-07-30)
+
+-   Return text for submenus adjusted
+
 ### 0.4.0 (2023-07-28)
 
 -   change output value for getState

package/io-package.json

@@ -1,8 +1,21 @@
 {
   "common": {
     "name": "telegram-menu",
-    "version": "0.4.0",
+    "version": "0.4.1",
     "news": {
+      "0.4.1": {
+        "en": "Return text for submenus adjusted",
+        "de": "Rückgabetext für submenus angepasst",
+        "ru": "Вернуться текст для подменю скорректирован",
+        "pt": "Texto de retorno para submenus ajustado",
+        "nl": "Een terugkeer sms voor submenus aangepast",
+        "fr": "Texte de retour pour les sous-menus ajustés",
+        "it": "Testo di ritorno per submenus regolato",
+        "es": "Texto de retorno para submenú ajustado",
+        "pl": "Powtórne teksty do podmenu poprawiły",
+        "uk": "Повернення тексту для підменю",
+        "zh-cn": "调整的分遣案文"
+      },
       "0.4.0": {
         "en": "change output value for getState\ncheckbox to disbale Text No Entry found in the settings #34\nsubmenu\n**changed!!!**, states are always set with ack false\nadapter does not restart when telegram restarts #35",
         "de": "ausgabewert ändern für getState\ncheckbox zum Ausbalieren Text Kein Eintrag gefunden in den Einstellungen #34\nunterpositionen\ngeändert! zustände werden immer mit ack false gesetzt\nadapter startet nicht neu, wenn telegramm neu gestartet #35",
@@ -80,19 +93,6 @@
         "pl": "Senna Diagram",
         "uk": "Відправити граматику Grafana",
         "zh-cn": "Send Grafana Diagram"
-      },
-      "0.0.7": {
-        "en": "Bugs fixed\nTranslate",
-        "de": "Fehler behoben\nÜbersetzung",
-        "ru": "Баги фиксированные\nПеревести",
-        "pt": "Bugs corrigidos\nTraduzir",
-        "nl": "Bugs gemaakt\nVertaling:",
-        "fr": "Bugs corrigés\nTraduire",
-        "it": "Bug fissi\nTraduttore",
-        "es": "Errores fijos\nTraducir",
-        "pl": "Bug\nTranslat",
-        "uk": "Виправлені помилки\nПереклад",
-        "zh-cn": "固定的黑体\n笔译"
       }
     },
     "titleLang": {

package/lib/js/subMenu.js

@@ -1,6 +1,7 @@
 const setstate = require("./setstate").setstate;
 let step = 0;
 let device2Switch = "";
+let returnIDToListenTo;
 /**
  *
  * @param {*} _this
@@ -34,9 +35,11 @@ function subMenu(_this, text, groupData, userToSend) {
 		};
 		return ["Wähle eine Option", JSON.stringify(keyboard), device2Switch];
 	} else if (callbackData === "yes") {
-		setstate(_this, groupData[device2Switch], userToSend, true);
+		returnIDToListenTo = setstate(_this, groupData[device2Switch], userToSend, true);
+		return [null, null, null, returnIDToListenTo];
 	} else if (callbackData === "no") {
-		setstate(_this, groupData[device2Switch], userToSend, false);
+		returnIDToListenTo = setstate(_this, groupData[device2Switch], userToSend, false);
+		return [null, null, null, returnIDToListenTo];
 	} else if (callbackData === "on-off") {
 		const keyboard = {
 			inline_keyboard: [
@@ -55,9 +58,12 @@ function subMenu(_this, text, groupData, userToSend) {
 		device2Switch = splittetText[2];
 		return ["Wähle eine Option", JSON.stringify(keyboard), device2Switch];
 	} else if (callbackData === "on") {
-		setstate(_this, groupData[device2Switch], userToSend, true, true);
+		returnIDToListenTo = setstate(_this, groupData[device2Switch], userToSend, true, true);
+		return [null, null, null, returnIDToListenTo];
 	} else if (callbackData === "off") {
-		setstate(_this, groupData[device2Switch], userToSend, false, true);
+		returnIDToListenTo = setstate(_this, groupData[device2Switch], userToSend, false, true);
+		return [null, null, null, returnIDToListenTo];
+		//SECTION - Percent
 	} else if (!text.includes("submenu") && callbackData.includes("percent")) {
 		step = parseInt(callbackData.replace("percent", ""));
 		let rowEntrys = 0;
@@ -75,8 +81,6 @@ function subMenu(_this, text, groupData, userToSend) {
 					text: `0%`,
 					callback_data: `submenu:percent${step}:${0}:`,
 				});
-			// _this.log.debug("menu " + JSON.stringify(menu));
-			// _this.log.debug("keyboard " + JSON.stringify(keyboard.inline_keyboard));
 			rowEntrys++;
 			if (rowEntrys == 8) {
 				// @ts-ignore
@@ -92,7 +96,9 @@ function subMenu(_this, text, groupData, userToSend) {
 		return ["Welcher Wert soll gesetzt werden?", JSON.stringify(keyboard), device2Switch];
 	} else if (text.includes(`submenu:percent${step}`)) {
 		const value = parseInt(text.split(":")[2]);
-		setstate(_this, groupData[device2Switch], userToSend, value, true);
+		returnIDToListenTo = setstate(_this, groupData[device2Switch], userToSend, value, true);
+		return [null, null, null, returnIDToListenTo];
+		//SECTION - Number
 	} else if (!text.includes("submenu") && callbackData.includes("number")) {
 		const splittedData = callbackData.replace("number", "").split("-");
 		let rowEntrys = 0;
@@ -123,8 +129,8 @@ function subMenu(_this, text, groupData, userToSend) {
 		return ["Welcher Wert soll gesetzt werden?", JSON.stringify(keyboard), device2Switch];
 	} else if (text.includes(`submenu:${callbackData}`)) {
 		const value = parseInt(text.split(":")[2]);
-		setstate(_this, groupData[device2Switch], userToSend, value, true);
-		_this.log.debug("cal 	" + JSON.stringify(callbackData));
+		returnIDToListenTo = setstate(_this, groupData[device2Switch], userToSend, value, true);
+		return [null, null, null, returnIDToListenTo];
 	}
 }
 module.exports = {

package/main.js

@@ -1,5 +1,9 @@
 "use strict";
 
+let setStateIdsToListenTo;
+function sendIdToOtherFile(Ids) {
+	setStateIdsToListenTo = Ids;
+}
 /*
  * Created with @iobroker/create-adapter v2.3.0
  */
@@ -22,8 +26,7 @@ const sendToTelegramSubmenu = require("./lib/js/telegram").sendToTelegramSubmenu
 
 let timeouts = [];
 let timeoutKey = 0;
-let setStateIds;
-let setStateIdsToListenTo;
+let subscribeForeignStateIds;
 
 // Load your modules here, e.g.:
 // const fs = require("fs");
@@ -103,10 +106,10 @@ class TelegramMenu extends utils.Adapter {
 							this.log.debug("New Structure: " + JSON.stringify(menu.data[name]));
 							const returnValue = generateActions(_this, action[name], menu.data[name]);
 							menu.data[name] = returnValue?.obj;
-							setStateIds = returnValue?.ids;
-							if (setStateIds && setStateIds?.length > 0)
-								_subscribeForeignStatesAsync(setStateIds, _this);
-							this.log.debug("SetForeignStates: " + JSON.stringify(setStateIds));
+							subscribeForeignStateIds = returnValue?.ids;
+							if (subscribeForeignStateIds && subscribeForeignStateIds?.length > 0)
+								_subscribeForeignStatesAsync(subscribeForeignStateIds, _this);
+							this.log.debug("SetForeignStates: " + JSON.stringify(subscribeForeignStateIds));
 							this.log.debug("Name " + JSON.stringify(name));
 							this.log.debug("Array Buttons: " + JSON.stringify(value));
 							this.log.debug("Gen. Actions: " + JSON.stringify(menu.data[name]));
@@ -278,6 +281,9 @@ class TelegramMenu extends utils.Adapter {
 										}
 									}
 								});
+							} else {
+								this.log.debug("else " + JSON.stringify(id));
+								this.log.debug("else " + JSON.stringify(setStateIdsToListenTo));
 							}
 						}
 
@@ -287,11 +293,12 @@ class TelegramMenu extends utils.Adapter {
 							if (!state.val) telegramAktiv = false;
 						}
 					} catch (e) {
-						this.log.debug("Error " + JSON.stringify(e));
+						this.log.debug("Error1 " + JSON.stringify(e));
 					}
 				});
 			}
 		});
+
 		/**
 		 *
 		 * @param {*} _this
@@ -301,6 +308,8 @@ class TelegramMenu extends utils.Adapter {
 		 */
 		function callSubMenu(_this, part, groupData, userToSend) {
 			const subMenuData = subMenu(_this, part, groupData, userToSend);
+			if (subMenuData && subMenuData[3]) setStateIdsToListenTo = subMenuData[3];
+
 			_this.log.debug("SubMenuData " + JSON.stringify(subMenuData));
 			if (subMenuData && subMenuData[0]) sendToTelegramSubmenu(_this, userToSend, subMenuData[0], subMenuData[1]);
 		}
@@ -353,6 +362,7 @@ class TelegramMenu extends utils.Adapter {
 	}
 }
 
+module.exports = { sendIdToOtherFile };
 if (require.main !== module) {
 	// Export the constructor in compact mode
 	/**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iobroker.telegram-menu",
-  "version": "0.4.0",
+  "version": "0.4.1",
   "description": "Easily create Telegram Menus",
   "author": {
     "name": "MiRo1310",