iobroker.telegram-menu 0.3.0 → 0.4.0

package/README.md

@@ -15,7 +15,7 @@
 
 Easily create Telegram Menus
 
-You can create a separate menu for each user, or you can use the global user to generate the same menu for all users.
+You can create different groups with separate menus, and then assign users to them.
 
 **If you like it, please consider a donation:**
 
@@ -33,6 +33,14 @@ You can create a separate menu for each user, or you can use the global user to
 	Placeholder for the next version (at the beginning of the line):
 	### **WORK IN PROGRESS**
 -->
+### 0.4.0 (2023-07-28)
+
+-   change output value for getState
+-   checkbox to disbale Text No Entry found in the settings #34
+-   submenu
+-   **changed!!!**, states are always set with ack false
+-   adapter does not restart when telegram restarts #35
+
 ### 0.3.0 (2023-07-02)
 
 -   add ack Flag

package/admin/i18n/de/translations.json

@@ -1,6 +1,7 @@
 {
     " No entry, send to all Users.": "Kein Eintrag, an alle Benutzer senden.",
     "Action": "Aktion",
+    "Active": "Aktiv",
     "Add": "hinzufügen",
     "Add && as a placeholder for the value in the text": "Fügen Sie && als Platzhalter für den Wert im Text hinzu",
     "Add && as a placeholder for the value in the text": "Fügen Sie && als Platzhalter für den Wert im Text hinzu",

package/admin/i18n/en/translations.json

@@ -1,6 +1,7 @@
 {
     " No entry, send to all Users.": " No entry, send to all Users.",
     "Action": "Action",
+    "Active": "Active",
     "Add": "add",
     "Add && as a placeholder for the value in the text": "Add && as a placeholder for the value in the text",
     "Add && as a placeholder for the value in the text": "Add && as a placeholder for the value in the text",

package/admin/i18n/es/translations.json

@@ -1,6 +1,7 @@
 {
     " No entry, send to all Users.": "Sin entrada, enviar a todos los usuarios.",
     "Action": "Acción",
+    "Active": "Activo",
     "Add": "agregar",
     "Add && as a placeholder for the value in the text": "Agregue && como marcador de posición para el valor en el texto",
     "Add && as a placeholder for the value in the text": "Agregue && como marcador de posición para el valor en el texto",

package/admin/i18n/fr/translations.json

@@ -1,6 +1,7 @@
 {
     " No entry, send to all Users.": "Aucune entrée, envoyer à tous les utilisateurs.",
     "Action": "Action",
+    "Active": "Actif",
     "Add": "ajouter",
     "Add && as a placeholder for the value in the text": "Ajouter && comme espace réservé pour la valeur dans le texte",
     "Add && as a placeholder for the value in the text": "Ajouter && comme espace réservé pour la valeur dans le texte",

package/admin/i18n/it/translations.json

@@ -1,6 +1,7 @@
 {
     " No entry, send to all Users.": "Nessuna voce, invia a tutti gli utenti.",
     "Action": "Azione",
+    "Active": "Attivo",
     "Add": "aggiungere",
     "Add && as a placeholder for the value in the text": "Aggiungi && come segnaposto per il valore nel testo",
     "Add && as a placeholder for the value in the text": "Aggiungi && come segnaposto per il valore nel testo",

package/admin/i18n/nl/translations.json

@@ -1,6 +1,7 @@
 {
     " No entry, send to all Users.": "Geen invoer, verzenden naar alle gebruikers.",
     "Action": "Actie",
+    "Active": "Actief",
     "Add": "toevoegen",
     "Add && as a placeholder for the value in the text": "Voeg && toe als tijdelijke aanduiding voor de waarde in de tekst",
     "Add && as a placeholder for the value in the text": "Voeg && toe als tijdelijke aanduiding voor de waarde in de tekst",

package/admin/i18n/pl/translations.json

@@ -1,6 +1,7 @@
 {
     " No entry, send to all Users.": "Brak wpisu, wyślij do wszystkich Użytkowników.",
     "Action": "Działanie",
+    "Active": "Aktywny",
     "Add": "dodać",
     "Add && as a placeholder for the value in the text": "Dodaj && jako symbol zastępczy wartości w tekście",
     "Add && as a placeholder for the value in the text": "Dodaj && jako symbol zastępczy wartości w tekście",

package/admin/i18n/pt/translations.json

@@ -1,6 +1,7 @@
 {
     " No entry, send to all Users.": "Sem entrada, envie para todos os usuários.",
     "Action": "Ação",
+    "Active": "Ativo",
     "Add": "adicionar",
     "Add && as a placeholder for the value in the text": "Adicionar && como espaço reservado para o valor no texto",
     "Add && as a placeholder for the value in the text": "Adicionar && como espaço reservado para o valor no texto",

package/admin/i18n/ru/translations.json

@@ -1,6 +1,7 @@
 {
     " No entry, send to all Users.": "Нет записи, отправить всем пользователям.",
     "Action": "Действие",
+    "Active": "Активный",
     "Add": "добавлять",
     "Add && as a placeholder for the value in the text": "Добавьте && в качестве заполнителя для значения в тексте",
     "Add && as a placeholder for the value in the text": "Добавьте && в качестве заполнителя для значения в тексте",

package/admin/i18n/uk/translations.json

@@ -1,6 +1,7 @@
 {
     " No entry, send to all Users.": "Заборонено, відправити всім користувачам.",
     "Action": "Дія",
+    "Active": "Активний",
     "Add": "додати",
     "Add && as a placeholder for the value in the text": "Додайте && як заповнювач для значення в тексті",
     "Add && as a placeholder for the value in the text": "Додайте && як заповнювач для значення в тексті",

package/admin/i18n/zh-cn/translations.json

@@ -1,6 +1,7 @@
 {
     " No entry, send to all Users.": "没有条目，发送给所有用户。",
     "Action": "行动",
+    "Active": "积极的",
     "Add": "添加",
     "Add && as a placeholder for the value in the text": "添加 && 作为文本中值的占位符",
     "Add && as a placeholder for the value in the text": "添加 && 作为文本中值的占位符",

package/admin/index_m.html

@@ -52,6 +52,7 @@
 			setCheckbox(settings.checkbox)
 			generateSelectTrigger(activeGroup)
 			checkUpAndDownArrowBtn(activeGroup)
+			disableEnableInputField("#checkboxNoValueFound", "#textNoEntry")
 			// When import from old Version import Username
 			if (settings.usersForGlobal) $("#group_UserInput input[name='Global']").val(settings.usersForGlobal)
 			if (settings.instance) telegramInstance = settings.instance
@@ -359,6 +360,13 @@
 				$(`#tab_${$("#select_action").val()} tbody`).append(newTrInAction($("#select_action").val(), undefined, rows))
 				$("#btn_action_set").attr("disabled", "disabled")
 			})
+
+			// Settings--------------------------------------------------------------------
+			$("#tab-settings").on("change", "#checkboxNoValueFound", function () {
+				disableEnableInputField("#checkboxNoValueFound", "#textNoEntry")
+
+			})
+
 			// --------------------------------------------------------------------------------
 			// Global Disable delete Button in Tables
 			$("div.adapter-container").on("DOMSubtreeModified", "table tbody", function () {
@@ -507,16 +515,6 @@
 					findElementsToCopy("#tab-nav tbody", "nav")
 				}
 				else findElementsToCopy(`#tab-action tbody[data-name='${$(this).val()}']`, $(this).val())
-
-				// if ($(this).val() == "set") {
-				// 	)
-				// }
-				// else if ($(this).val() == "get") {
-				// 	findElementsToCopy("#tab-action tbody[data-name='get']", "get")
-				// }
-				// else if ($(this).val() == "pic") {
-				// 	findElementsToCopy("#tab-action tbody[data-name='pic']", "pic")
-				// }
 			})
 			function findElementsToCopy(selektor, toDo) {
 				const $bodys = $(selektor).map((index, tbody) => {
@@ -799,6 +797,7 @@
 			</div>
 		</div>
 		<div id="tab-action"></div>
+		<!-- //SECTION - Settings -->
 		<div id="tab-settings">
 			<div class=" row">
 				<div class="col s12">
@@ -815,6 +814,13 @@
 							<input id="textNoEntry" type="text" class="value translateV" value="Entry not found!">
 							<label for="textNoEntry" class="translate">Text will be send if no entry was found!</label>
 						</div>
+						<div class="input-field col s3">
+							<label>
+								<input id="checkboxNoValueFound" type="checkbox" class="filled-in valCheckbox"
+									checked />
+								<span class="translate">Active</span>
+							</label>
+						</div>
 					</div>
 					<div class="row">
 						<div class="input-field col s3">

package/admin/js/component.js

@@ -70,10 +70,11 @@ function userActivCheckbox(user, val) {
   <span class="marginTop">${user} <span> </span><span class="translate">active</span>
   </span></div> `;
 }
-
+//SECTION - Trigger
 function createSelectTrigger(list) {
 	let element = '<option value="" disabled selected class="translate">Choose a trigger</option>';
 	list.forEach(function (e) {
+		if (e.includes("menu:")) e = e.split(":")[2];
 		const dynamicChild = `<option value="${e}" >${e}</option>`;
 		element += dynamicChild;
 	});

package/admin/js/main.js

@@ -1,13 +1,25 @@
-/*global newUserBtn,navElement ,actionElement,createSelectTrigger,newTableRow_Action,newTableRow_Action,newTrInAction, newSelectInstanceRow,userActivCheckbox,$, groupUserInput*/
-/*eslint no-unused-vars: ["error", { "varsIgnorePattern": "isStringEmty|generate|create|set|fill|reset|add|show|ins|table|get|new|show|checkValueModal|disable|checkUpAndDownArrowBtn"}]*/
+/*global newUserBtn ,navElement ,actionElement,createSelectTrigger,newTableRow_Action,newTableRow_Action,newTrInAction, newSelectInstanceRow,userActivCheckbox,$, groupUserInput*/
+/*eslint no-unused-vars: ["error", { "varsIgnorePattern": "disableEnableInputField|isStringEmty|generate|create|set|fill|reset|add|show|ins|table|get|new|show|checkValueModal|disable|checkUpAndDownArrowBtn|"}]*/
 
+/**
+ *
+ * @param {string} checkbox ID of the checkbox
+ * @param {string} inputfield ID of the Input Field
+ */
+function disableEnableInputField(checkbox, inputfield) {
+	const active = $(checkbox).is(":checked");
+	if (active) $(inputfield).removeAttr("disabled");
+	else $(inputfield).attr("disabled", "disabled");
+}
 /**
  *
  * @param {string} classes Class to browse for empty String
  * @returns boolean True Everything is ok
  */
+// @ts-ignore
 function isStringEmty(classes) {
 	let allOk = true;
+	// @ts-ignore
 	$(classes).each(function (key, element) {
 		if (element.value == "") {
 			$(element).parent().addClass("bg-error");
@@ -18,6 +30,7 @@ function isStringEmty(classes) {
 	});
 	return allOk;
 }
+// @ts-ignore
 function checkUpAndDownArrowBtn(activeuser) {
 	const lengthOfNavList = $(`tbody#${activeuser}.visibilityArrowBtn tr`).length - 1;
 	$(`tbody#${activeuser}.visibilityArrowBtn tr`).each(function (key) {
@@ -31,13 +44,16 @@ function checkUpAndDownArrowBtn(activeuser) {
 	});
 }
 
+// @ts-ignore
 function generateNav() {
 	const navigationArray = {};
 	const ids = [];
 	const nav = [];
+	// @ts-ignore
 	$(".nav-id").each((key, element) => {
 		ids.push(element.value);
 	});
+	// @ts-ignore
 	$(".nav-value").each((key, element) => {
 		nav.push(element.value);
 	});
@@ -63,20 +79,26 @@ function generateNav() {
  */
 function createGroup(id, users, activeGroup, userActiveCheckbox, usersInGroup) {
 	users.forEach((user) => {
+		// @ts-ignore
 		$(id).append(newUserBtn(user));
+		// @ts-ignore
 		$("#table_nav").append(navElement(user));
+		// @ts-ignore
 		$("#tab-action").append(actionElement(user));
 		let val;
 		if (userActiveCheckbox && userActiveCheckbox[user] != undefined) val = userActiveCheckbox[user];
 		else val = "";
+		// @ts-ignore
 		$("#group_active_checkbox").append(userActivCheckbox(user, val));
 		if (usersInGroup && usersInGroup[user] != undefined) val = usersInGroup[user];
 		else val = "";
+		// @ts-ignore
 		$("#group_UserInput").append(groupUserInput(user, val));
 	});
 	if (activeGroup) $(`#group_active_checkbox div.${activeGroup}`).show();
 }
 //SECTION - Save 5 Save to Object
+// @ts-ignore
 function table2Values(id) {
 	let oldName;
 	const $tbodys = $(id).find("tbody");
@@ -176,6 +198,7 @@ function showHideUserEntry(activeGroup) {
  *
  * @param {Array} checkbox Entrys with Checkbox Values
  */
+// @ts-ignore
 function setCheckbox(checkbox) {
 	Object.keys(checkbox).forEach((key) => {
 		if (checkbox[key]) {
@@ -199,12 +222,15 @@ function splitTextInArray(activeGroup) {
 	return value_list;
 }
 
+// @ts-ignore
 function generateSelectTrigger(activeGroup) {
 	const list = splitTextInArray(activeGroup);
 	// HTML Elemente löschen und neu aufbauen
+	// @ts-ignore
 	$("#select_trigger").empty().append(createSelectTrigger(list));
 }
 
+// @ts-ignore
 function fillTable(id, data, newTableRow_Nav, users) {
 	if (data) {
 		for (const name in data) {
@@ -220,6 +246,7 @@ function fillTable(id, data, newTableRow_Nav, users) {
 	}
 }
 
+// @ts-ignore
 function fillTableAction(data) {
 	if (data) {
 		for (const name in data) {
@@ -234,10 +261,13 @@ function fillTableAction(data) {
 
 function generatActionRow(user, action, result, editedRowUpdate) {
 	if (editedRowUpdate) {
+		// @ts-ignore
 		$(editedRowUpdate).empty().html(newTableRow_Action(action, result)?.replace("<tr>", "").replace("</tr>", ""));
+		// @ts-ignore
 	} else $(`.user_${user} .table_${action}`).append(newTableRow_Action(action, result));
 }
 
+// @ts-ignore
 function resetModal() {
 	$(".reset").each(function () {
 		$(this).val("");
@@ -269,6 +299,7 @@ function showSelectModal(showTrigger, show) {
 	else $("#btn_action_set").attr("disabled", "disabled");
 }
 //SECTION - Save 4 edit Values
+// @ts-ignore
 function insertEditValues(action, $this) {
 	const IDs = valuesToArray($this, "p[data-name='IDs']");
 	let newline, switchs, confirm, returnText, values, texts, picSendDelay, fileName;
@@ -287,6 +318,7 @@ function insertEditValues(action, $this) {
 		picSendDelay = valuesToArray($this, "p[data-name='picSendDelay']");
 		fileName = valuesToArray($this, "p[data-name='fileName']");
 	}
+	// @ts-ignore
 	IDs.forEach(function (element, key) {
 		if (key == 0) {
 			$(`#tab_${action} tbody input.set_id`).val(IDs[0].trim());
@@ -338,6 +370,7 @@ function insertEditValues(action, $this) {
 				_confirm,
 				_returnText,
 			];
+			// @ts-ignore
 			$(`#tab_${$("#select_action").val()} tbody`).append(newTrInAction($("#select_action").val(), array));
 		}
 	});
@@ -355,6 +388,7 @@ function valuesToArray($this, selector) {
 	return val;
 }
 
+// @ts-ignore
 function addNewGroup(users, newUser, _onChange) {
 	users.push(newUser);
 	createGroup("#group_list", [newUser], null, null, null);
@@ -367,6 +401,7 @@ function addNewGroup(users, newUser, _onChange) {
  *
  * @param {array} users Array of Users
  */
+// @ts-ignore
 function generateStartside(users) {
 	const obj = {};
 	users.forEach(function (user) {
@@ -380,6 +415,7 @@ function generateStartside(users) {
  * @param {*} socket
  * @returns
  */
+// @ts-ignore
 function getAllTelegramInstances(socket, _this) {
 	const id = [];
 	try {
@@ -403,6 +439,7 @@ function getAllTelegramInstances(socket, _this) {
 						}
 						if (i == doc.rows.length - 1) {
 							id.forEach((id) => {
+								// @ts-ignore
 								$("#select_instance").append(newSelectInstanceRow(id));
 							});
 						}
@@ -414,6 +451,7 @@ function getAllTelegramInstances(socket, _this) {
 		_this.log.debug("Error getAllTelegramInstance: " + JSON.stringify(err));
 	}
 }
+// @ts-ignore
 function showUser(activeGroup, showHideUserCheckbox) {
 	showHideUserEntry(activeGroup);
 
@@ -423,6 +461,7 @@ function showUser(activeGroup, showHideUserCheckbox) {
 	$(`#group_list li a[name=${activeGroup}]`).addClass("active");
 	if (showHideUserCheckbox) showHideUserCheckbox(activeGroup);
 }
+// @ts-ignore
 function checkValueModal(showTrigger) {
 	let show = true;
 	$(".checkValue").each(function () {
@@ -449,6 +488,7 @@ function checkValueModal(showTrigger) {
 
 	showSelectModal(showTrigger, show);
 }
+// @ts-ignore
 function disableValueInput() {
 	$(".switch_checkbox").each(function () {
 		if ($(this).is(":checked")) {

package/admin/words.js

@@ -56,4 +56,5 @@ systemDictionary = {
     "What is to do?": {                               "en": "What is to do?",                                   "de": "Was ist zu tun?",                                  "ru": "Что делать?",                                      "pt": "O que fazer?",                                     "nl": "Wat is er te doen?",                               "fr": "Que faire ?",                                      "it": "Cosa fare?",                                       "es": "¿Qué hay que hacer?",                              "pl": "Co robić?",                                        "uk": "Що робити?",                                       "zh-cn": "怎么办？"},
     "active": {                                       "en": "active",                                           "de": "aktiv",                                            "ru": "активный",                                         "pt": "ativo",                                            "nl": "actief",                                           "fr": "actif",                                            "it": "attivo",                                           "es": "activo",                                           "pl": "aktywny",                                          "uk": "активний",                                         "zh-cn": "积极的"},
     "telegram-menu adapter settings": {               "en": "Adapter settings for telegram-menu",               "de": "Adaptereinstellungen für Telegram-Menü",           "ru": "Настройки адаптера для телеграм-меню",             "pt": "Configurações do adaptador para menu de telegrama", "nl": "Adapterinstellingen voor telegrammenu",            "fr": "Paramètres de l'adaptateur pour le menu télégramme", "it": "Impostazioni dell'adattatore per il menu del telegramma", "es": "Configuración del adaptador para el menú de telegramas", "pl": "Ustawienia adaptera dla menu telegramu",           "uk": "Налаштування адаптера для telegram-меню",          "zh-cn": "电报菜单的适配器设置"},
+    "Active": {                                       "en": "Active",                                           "de": "Aktiv",                                            "ru": "Активный",                                         "pt": "Ativo",                                            "nl": "Actief",                                           "fr": "Actif",                                            "it": "Attivo",                                           "es": "Activo",                                           "pl": "Aktywny",                                          "uk": "Активний",                                         "zh-cn": "积极的"},
 };

package/io-package.json

@@ -1,8 +1,21 @@
 {
   "common": {
     "name": "telegram-menu",
-    "version": "0.3.0",
+    "version": "0.4.0",
     "news": {
+      "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",
+        "ru": "изменить значение вывода для getState\ncheckbox на disbale Текст Не найдено записей в настройках #34\nподменю\nизменено! государства всегда установлены с ack false\nадаптер не перезапускается при перезагрузке телеграмм #35",
+        "pt": "mudar o valor de saída para getState\ncaixa de seleção para debalar Texto Nenhuma entrada encontrada nas configurações #34\nsubmenu\nmudou! estados são sempre definidos com ack false\nadaptador não reinicia quando o telegrama reinicia #35",
+        "nl": "veranderingswaarde voor het krijgen van\ncontrolebox om te disbaliseren Sms No Entry gevonden in de settings 34\nsubmenu\nverander. er zijn altijd valse staten\n#355",
+        "fr": "valeur de sortie de changement pour getState\ncheckbox to disbale Texte Aucune entrée trouvée dans les paramètres #34\nsous-menu\nchangé ! les états sont toujours fixés avec ack false\nadaptateur ne redémarre pas lorsque le télégramme redémarre #35",
+        "it": "cambio valore di uscita per getState\ncasella di controllo per sbilanciare Testo Nessuna Entrata trovata nelle impostazioni #34\nsottomenu\ncambiato! stati sono sempre impostati con ack falso\nadattatore non riavvia quando il telegramma riavvia #35",
+        "es": "cambio de valor de salida para getState\ncheckbox to disbale Texto No Entrada encontrada en la configuración #34\nsubmenú\n¡cambiado! estados siempre están establecidos con ack falso\nadaptador no se reinicia cuando el telegrama se reinicia #35",
+        "pl": "zmiana wartości wyjściowej\nskrzynia kontrolna Tekst No Entry znalazł się w ustawieniach #34\nsubmenu\nzmieniło się! wszystkie stany są zawsze ustawione jako fałszywe\nadaptacja nie rozpoczęła się, gdy telegram wznowił #35",
+        "uk": "змінити вихідне значення для getState\nчекбокс на дискбаль Текст No Entry знайдено в налаштуваннях #34\nсубмену\nзмінено! держави завжди встановлюються з невірним\nперехідник не перезавантажує при перезапусках телеграм #35",
+        "zh-cn": "b. 国家产出价值的变化\n核对箱 第34号活动\n分项\n改为: 各州总是有假肢。\n变通器在电图包中装有第35条时不会再接再厉。"
+      },
       "0.3.0": {
         "en": "add ack Flag\nCopy-Button to copy User-elements to activ User",
         "de": "eine Seite hinzufügen\nCopy-Button zu kopieren Benutzerelemente zum Aktivieren",
@@ -80,19 +93,6 @@
         "pl": "Bug\nTranslat",
         "uk": "Виправлені помилки\nПереклад",
         "zh-cn": "固定的黑体\n笔译"
-      },
-      "0.0.6": {
-        "en": "Fixed SetState and GetState\nTranslate",
-        "de": "Fixed SetState und GetState\nÜbersetzung",
-        "ru": "Фиксированный SetState и GetState\nПеревести",
-        "pt": "Fixo SetState e GetState\nTraduzir",
-        "nl": "Vertaling:\nVertaling:",
-        "fr": "Fixed SetState and GetState\nTraduire",
-        "it": "Set fissoState e GetState\nTraduttore",
-        "es": "SetState y GetState\nTraducir",
-        "pl": "Fixe SetState and GetState (ang.)\nTranslat",
-        "uk": "Фіксований SetState і GetState\nПереклад",
-        "zh-cn": "B. 固定的国家和国\n笔译"
       }
     },
     "titleLang": {

package/lib/js/action.js

@@ -1,5 +1,28 @@
 const sendToTelegram = require("./telegram").sendToTelegram;
 
+/**
+ *
+ * @param {String} textToSend Text which should be send to user
+ */
+function replaceValues(textToSend, stateVal, _this) {
+	const startindex = textToSend.indexOf("change{");
+	const match = textToSend.substring(startindex + "change".length + 1, textToSend.indexOf("}", startindex));
+	let objChangeValue;
+	if (isJSON("{" + match + "}")) objChangeValue = JSON.parse("{" + match + "}");
+	else {
+		_this.log.error(`There is a error in your input: ` + JSON.stringify(match.replace(/"/g, "'")));
+		return false;
+	}
+	return { valueChange: objChangeValue[String(stateVal)], textToSend: textToSend.substring(0, startindex) };
+}
+function isJSON(str) {
+	try {
+		JSON.parse(str);
+		return true;
+	} catch (error) {
+		return false;
+	}
+}
 /**
  * Generate Array
  * @param {*} val
@@ -127,19 +150,12 @@ async function generateNewObjectStructure(_this, val) {
 				nav: element.value,
 				text: element.text,
 			};
-			// _this.log.debug("Object " + JSON.stringify(obj));
+			_this.log.debug("elementVal " + JSON.stringify(element.value));
 		});
 		return obj;
 	} catch (err) {
 		console.log("Error GenerateNewObjectStructure " + err);
 	}
-	//
-	//
-	// 	menu.data[user] = obj;
-	// }
-
-	// _this.log.debug("Menu " + JSON.stringify(menu));
-	// _this.log.debug("mi " + JSON.stringify(menu.data.Michael));
 }
 
 /**
@@ -223,4 +239,5 @@ module.exports = {
 	wertUebermitteln,
 	generateNewObjectStructure,
 	generateActions,
+	replaceValues,
 };

package/lib/js/getstate.js

@@ -1,5 +1,7 @@
 const sendToTelegram = require("./telegram").sendToTelegram;
 const idBySelector = require("./action").idBySelector;
+const replaceValues = require("./action").replaceValues;
+
 function getstate(_this, part, userToSend) {
 	try {
 		let text = "";
@@ -17,7 +19,7 @@ function getstate(_this, part, userToSend) {
 						_this.log.debug("Value " + JSON.stringify(value));
 					}
 					if (value) {
-						const val = JSON.stringify(value.val);
+						let val = JSON.stringify(value.val);
 						_this.log.debug("GetValue " + JSON.stringify(value.val));
 						_this.log.debug("Element.text " + JSON.stringify(element.text));
 						let newline = "";
@@ -25,9 +27,18 @@ function getstate(_this, part, userToSend) {
 							newline = "\n";
 						}
 						if (element.text) {
-							if (element.text.indexOf("&&") != -1)
-								text += `${element.text.replace("&&", val)}${newline}`;
-							else text += element.text + " " + val + newline;
+							let result = {};
+							let textToSend;
+							if (element.text.toString().includes("change{")) {
+								result = replaceValues(element.text, val, _this);
+								val = result["valueChange"];
+								_this.log.debug("result " + JSON.stringify(result));
+								textToSend = result["textToSend"];
+							} else textToSend = element.text;
+
+							// valueChange ? val = valueChange : val;
+							if (textToSend.indexOf("&&") != -1) text += `${textToSend.replace("&&", val)}${newline}`;
+							else text += textToSend + " " + val + newline;
 						} else text += `${val} ${newline}`;
 						_this.log.debug("Text " + JSON.stringify(text));
 					}

package/lib/js/setstate.js

@@ -1,4 +1,4 @@
-function setstate(_this, part, userToSend) {
+function setstate(_this, part, userToSend, valueFromSubmenu, SubmenuValuePriority) {
 	try {
 		const setStateIds = [];
 		part.switch.forEach(
@@ -6,12 +6,14 @@ function setstate(_this, part, userToSend) {
 				/** @type {{ id: string; value: boolean; toggle:boolean; confirm:Boolean; returnText: string }} */ element,
 			) => {
 				_this.log.debug("Element to set " + JSON.stringify(element));
-				let ack = true;
+				let ack = false;
 				let returnText = element.returnText;
 				if (returnText.includes("ack:true")) {
+					_this.log.debug("Set ack: " + JSON.stringify(true));
 					ack = true;
 					returnText = returnText.replace("ack:true", "");
 				} else if (returnText.includes("ack:false")) {
+					_this.log.debug("Set sck: " + JSON.stringify(false));
 					ack = false;
 					returnText = element.returnText.replace("ack:false", "").trim();
 				}
@@ -21,21 +23,23 @@ function setstate(_this, part, userToSend) {
 					returnText: returnText,
 					userToSend: userToSend,
 				});
-
+				_this.log.debug("Ack: " + JSON.stringify(ack));
 				if (element.toggle) {
 					_this.log.debug("Toggle");
 					_this
 						.getForeignStateAsync(element.id)
 						.then((val) => {
-							_this.log.debug("Value " + JSON.stringify(val));
+							_this.log.debug("ValueToggle " + JSON.stringify(val));
 							if (val) _this.setForeignStateAsync(element.id, !val.val, ack);
 						})
 						.catch((e) => {
 							console.log(e);
 						});
 				} else {
-					_this.log.debug("Value " + JSON.stringify(element.value));
-					_this.setForeignStateAsync(element.id, element.value, ack);
+					let valueToSet;
+					SubmenuValuePriority ? (valueToSet = valueFromSubmenu) : (valueToSet = element.value);
+					_this.log.debug("Value to Set: " + JSON.stringify(valueToSet));
+					_this.setForeignStateAsync(element.id, valueToSet, ack);
 				}
 			},
 		);
@@ -44,6 +48,7 @@ function setstate(_this, part, userToSend) {
 		_this.log.error("Error Switch" + JSON.stringify(error));
 	}
 }
+
 module.exports = {
 	setstate,
 };

package/lib/js/subMenu.js

@@ -0,0 +1,132 @@
+const setstate = require("./setstate").setstate;
+let step = 0;
+let device2Switch = "";
+/**
+ *
+ * @param {*} _this
+ * @param {string} text
+ * @param {*} groupData
+ * @param {string} userToSend
+ * @returns
+ */
+function subMenu(_this, text, groupData, userToSend) {
+	const splittetText = JSON.stringify(text).split(":");
+	const callbackData = splittetText[1];
+	_this.log.debug("splittet text2 " + JSON.stringify(splittetText[2]));
+	_this.log.debug("callback: 	" + JSON.stringify(callbackData));
+	_this.log.debug("devicetoswitch: 	" + JSON.stringify(device2Switch));
+	_this.log.debug("text: 	" + JSON.stringify(text));
+
+	if (callbackData === "yes-no") {
+		const keyboard = {
+			inline_keyboard: [
+				[
+					{
+						text: "Yes",
+						callback_data: "menu:yes",
+					},
+					{
+						text: "No",
+						callback_data: "menu:no",
+					},
+				],
+			],
+		};
+		return ["Wähle eine Option", JSON.stringify(keyboard), device2Switch];
+	} else if (callbackData === "yes") {
+		setstate(_this, groupData[device2Switch], userToSend, true);
+	} else if (callbackData === "no") {
+		setstate(_this, groupData[device2Switch], userToSend, false);
+	} else if (callbackData === "on-off") {
+		const keyboard = {
+			inline_keyboard: [
+				[
+					{
+						text: "On",
+						callback_data: "menu:on:",
+					},
+					{
+						text: "Off",
+						callback_data: "menu:off:",
+					},
+				],
+			],
+		};
+		device2Switch = splittetText[2];
+		return ["Wähle eine Option", JSON.stringify(keyboard), device2Switch];
+	} else if (callbackData === "on") {
+		setstate(_this, groupData[device2Switch], userToSend, true, true);
+	} else if (callbackData === "off") {
+		setstate(_this, groupData[device2Switch], userToSend, false, true);
+	} else if (!text.includes("submenu") && callbackData.includes("percent")) {
+		step = parseInt(callbackData.replace("percent", ""));
+		let rowEntrys = 0;
+		let menu = [];
+		const keyboard = {
+			inline_keyboard: [],
+		};
+		for (let i = 100; i >= 0; i -= step) {
+			menu.push({
+				text: `${i}%`,
+				callback_data: `submenu:percent${step}:${i}:`,
+			});
+			if (i != 0 && i - step < 0)
+				menu.push({
+					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
+				keyboard.inline_keyboard.push(menu);
+				menu = [];
+				rowEntrys = 0;
+			}
+		}
+		// @ts-ignore
+		if (rowEntrys != 0) keyboard.inline_keyboard.push(menu);
+
+		device2Switch = splittetText[2];
+		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);
+	} else if (!text.includes("submenu") && callbackData.includes("number")) {
+		const splittedData = callbackData.replace("number", "").split("-");
+		let rowEntrys = 0;
+		let menu = [];
+		const keyboard = {
+			inline_keyboard: [],
+		};
+		let unit = "";
+		if (splittedData[3] != "") unit = splittedData[3];
+		for (let i = parseInt(splittedData[1]); i >= parseInt(splittedData[0]); i -= parseInt(splittedData[2])) {
+			menu.push({
+				text: `${i}${unit}`,
+				callback_data: `submenu:${callbackData}:${i}:`,
+			});
+			_this.log.debug("menu " + JSON.stringify(menu));
+			_this.log.debug("keyboard " + JSON.stringify(keyboard.inline_keyboard));
+			rowEntrys++;
+			if (rowEntrys == 8) {
+				// @ts-ignore
+				keyboard.inline_keyboard.push(menu);
+				menu = [];
+				rowEntrys = 0;
+			}
+		}
+		// @ts-ignore
+		if (rowEntrys != 0) keyboard.inline_keyboard.push(menu);
+		device2Switch = splittetText[2];
+		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));
+	}
+}
+module.exports = {
+	subMenu: subMenu,
+};

package/lib/js/telegram.js

@@ -51,7 +51,16 @@ function sendToTelegram(
 		);
 	}
 }
+function sendToTelegramSubmenu(_this, name, text, keyboard, instance = "telegram.0") {
+	_this.sendTo(instance, "send", {
+		// chatId: chatId,
+		name: name,
+		text: text,
+		reply_markup: keyboard,
+	});
+}
 
 module.exports = {
 	sendToTelegram,
+	sendToTelegramSubmenu,
 };

package/main.js

@@ -12,9 +12,11 @@ const sendToTelegram = require("./lib/js/telegram").sendToTelegram;
 const editArrayButtons = require("./lib/js/action").editArrayButtons;
 const generateNewObjectStructure = require("./lib/js/action").generateNewObjectStructure;
 const generateActions = require("./lib/js/action").generateActions;
+const replaceValues = require("./lib/js/action").replaceValues;
 const setstate = require("./lib/js/setstate").setstate;
 const getstate = require("./lib/js/getstate").getstate;
-
+const subMenu = require("./lib/js/subMenu").subMenu;
+const sendToTelegramSubmenu = require("./lib/js/telegram").sendToTelegramSubmenu;
 // const lichtAn = require("./lib/js/action").lichtAn;
 // const wertUebermitteln = require("./lib/js/action").wertUebermitteln;
 
@@ -22,7 +24,6 @@ let timeouts = [];
 let timeoutKey = 0;
 let setStateIds;
 let setStateIdsToListenTo;
-let restartAdapter = false;
 
 // Load your modules here, e.g.:
 // const fs = require("fs");
@@ -58,6 +59,7 @@ class TelegramMenu extends utils.Adapter {
 		const checkbox = this.config.checkbox;
 		const one_time_keyboard = checkbox["oneTiKey"];
 		const resize_keyboard = checkbox["resKey"];
+		const checkboxNoEntryFound = checkbox["checkboxNoValueFound"];
 		const userList = this.config.users;
 		const startsides = this.config.startsides;
 		let token = this.config.tokenGrafana;
@@ -102,7 +104,8 @@ class TelegramMenu extends utils.Adapter {
 							const returnValue = generateActions(_this, action[name], menu.data[name]);
 							menu.data[name] = returnValue?.obj;
 							setStateIds = returnValue?.ids;
-							if (setStateIds && setStateIds?.length > 0) _setForeignStatesAsync(setStateIds, _this);
+							if (setStateIds && setStateIds?.length > 0)
+								_subscribeForeignStatesAsync(setStateIds, _this);
 							this.log.debug("SetForeignStates: " + JSON.stringify(setStateIds));
 							this.log.debug("Name " + JSON.stringify(name));
 							this.log.debug("Array Buttons: " + JSON.stringify(value));
@@ -113,29 +116,26 @@ class TelegramMenu extends utils.Adapter {
 					}
 					this.log.debug("Checkbox " + JSON.stringify(checkbox));
 
-					if (!restartAdapter) {
-						try {
-							this.log.debug("GroupList " + JSON.stringify(userList));
-							userList.forEach((group) => {
-								this.log.debug("Group " + JSON.stringify(group));
-								const startside = [startsides[group]].toString();
-								if (userActiveCheckbox[group])
-									usersInGroup[group].forEach((user) => {
-										sendToTelegram(
-											_this,
-											user,
-											menu.data[group][startside].text,
-											menu.data[group][startside].nav,
-											instanceTelegram,
-											resize_keyboard,
-											one_time_keyboard,
-										);
-									});
-							});
-						} catch (error) {
-							console.log("Error read UserList" + error);
-						}
-						restartAdapter = false;
+					try {
+						this.log.debug("GroupList " + JSON.stringify(userList));
+						userList.forEach((group) => {
+							this.log.debug("Group " + JSON.stringify(group));
+							const startside = [startsides[group]].toString();
+							if (userActiveCheckbox[group])
+								usersInGroup[group].forEach((user) => {
+									sendToTelegram(
+										_this,
+										user,
+										menu.data[group][startside].text,
+										menu.data[group][startside].nav,
+										instanceTelegram,
+										resize_keyboard,
+										one_time_keyboard,
+									);
+								});
+						});
+					} catch (error) {
+						console.log("Error read UserList" + error);
 					}
 				}
 				let oldValue;
@@ -146,10 +146,10 @@ class TelegramMenu extends utils.Adapter {
 							if (state && typeof state.val === "string" && state.val != "" && id == telegramID) {
 								const value = state.val;
 								const user = value.slice(1, value.indexOf("]"));
-								const toDo = value.slice(value.indexOf("]") + 1, value.length);
+								const calledValue = value.slice(value.indexOf("]") + 1, value.length);
 								this.log.debug("Value: " + JSON.stringify(value));
 								this.log.debug("User: " + JSON.stringify(user));
-								this.log.debug("Todo: " + JSON.stringify(toDo));
+								this.log.debug("Todo: " + JSON.stringify(calledValue));
 
 								userToSend = null;
 
@@ -158,38 +158,47 @@ class TelegramMenu extends utils.Adapter {
 									usersInGroup[key].includes(user),
 								);
 								this.log.debug("Group with User " + JSON.stringify(groupWithUser));
-								const nav = menu.data[groupWithUser];
+								const groupData = menu.data[groupWithUser];
 								userToSend = user;
 
-								this.log.debug("Nav " + JSON.stringify(nav));
+								this.log.debug("Nav " + JSON.stringify(groupData));
 								this.log.debug("Menu " + JSON.stringify(menu.data));
-								if (nav[toDo] && userToSend && groupWithUser && userActiveCheckbox[groupWithUser]) {
-									const part = nav[toDo];
+								if (
+									groupData[calledValue] &&
+									userToSend &&
+									groupWithUser &&
+									userActiveCheckbox[groupWithUser]
+								) {
+									const part = groupData[calledValue];
 									this.log.debug("Part " + JSON.stringify(part));
 									// Navigation
 									if (part.nav) {
 										this.log.debug("User to send: " + JSON.stringify(userToSend));
-										this.log.debug("Todo " + JSON.stringify(toDo));
+										this.log.debug("Todo " + JSON.stringify(calledValue));
 										this.log.debug("Part.nav: " + JSON.stringify(part.nav));
-										if (userToSend)
-											sendToTelegram(
-												this,
-												userToSend,
-												part.text,
-												part.nav,
-												instanceTelegram,
-												resize_keyboard,
-												one_time_keyboard,
-											);
+										//TODO -
+										if (JSON.stringify(part.nav).includes("menu")) {
+											this.log.debug("Submenu");
+											callSubMenu(this, part.nav, groupData, userToSend);
+										} else {
+											if (userToSend)
+												sendToTelegram(
+													this,
+													userToSend,
+													part.text,
+													part.nav,
+													instanceTelegram,
+													resize_keyboard,
+													one_time_keyboard,
+												);
+										}
 									}
 									// Schalten
-									if (part.switch) {
+									else if (part.switch) {
 										setStateIdsToListenTo = setstate(_this, part, userToSend);
-									}
-									if (part.getData) {
+									} else if (part.getData) {
 										getstate(_this, part, userToSend);
-									}
-									if (part.sendPic) {
+									} else if (part.sendPic) {
 										try {
 											this.log.debug("Send Picture");
 
@@ -221,9 +230,11 @@ class TelegramMenu extends utils.Adapter {
 											this.log.error("Error :" + JSON.stringify(e));
 										}
 									}
+								} else if (calledValue.startsWith("menu") || calledValue.startsWith("submenu")) {
+									callSubMenu(this, calledValue, groupData, userToSend);
 								} else {
 									if (typeof userToSend == "string")
-										sendToTelegram(this, userToSend, textNoEntryFound);
+										if (checkboxNoEntryFound) sendToTelegram(this, userToSend, textNoEntryFound);
 								}
 								// Auf Setstate reagieren und Wert schicken
 							} else if (
@@ -237,28 +248,28 @@ class TelegramMenu extends utils.Adapter {
 										this.log.debug("Send Value " + JSON.stringify(element));
 										if (element.confirm != "false") {
 											this.log.debug("User " + JSON.stringify(element.userToSend));
-											let textToSend = element.returnText;
+
+											let textToSend = "";
+											textToSend = element.returnText;
 											// Wenn eine Rückkgabe des Value an den User nicht gewünscht ist soll value durch einen leeren String ersetzt werden
-											let value;
+											let value = "";
 											// Change set value in another Value, like true => on, false => off
-											let objChangeValue = {};
+											let result = {};
 											let valueChange = "";
 											if (textToSend.toString().includes("change{")) {
-												const startindex = textToSend.indexOf("change{");
-												const match = textToSend.substring(
-													startindex + "change".length + 1,
-													textToSend.indexOf("}", startindex),
-												);
-												objChangeValue = JSON.parse("{" + match + "}");
-												valueChange = objChangeValue[String(state.val)];
-												textToSend = textToSend.substring(0, startindex);
+												result = replaceValues(textToSend, state.val, this);
+												if (result) {
+													textToSend = result["textToSend"];
+													valueChange = result["valueChange"];
+												}
 											}
-											textToSend?.toString().includes("{novalue}")
-												? (value = "")
-												: (value = state.val);
-											textToSend = textToSend.replace("{novalue}", "");
+											if (textToSend?.toString().includes("{novalue}")) {
+												value = "";
+												textToSend = textToSend.replace("{novalue}", "");
+											} else if (state.val || state.val == false) value = state.val?.toString();
+
 											valueChange ? (value = valueChange) : value;
-											textToSend.indexOf("&&") != -1
+											textToSend.toString().indexOf("&&") != -1
 												? (textToSend = textToSend.replace("&&", value))
 												: (textToSend += " " + value);
 											sendToTelegram(this, element.userToSend, textToSend);
@@ -272,11 +283,6 @@ class TelegramMenu extends utils.Adapter {
 
 						if (state && id == `${instanceTelegram}.info.connection`) {
 							this.log.debug("Oldvalue " + JSON.stringify(oldValue));
-							if (!oldValue) {
-								this.log.debug("Restart Adapter Telegram Menu");
-								restartAdapter = true;
-								this.restart();
-							}
 							oldValue = state.val;
 							if (!state.val) telegramAktiv = false;
 						}
@@ -286,36 +292,27 @@ class TelegramMenu extends utils.Adapter {
 				});
 			}
 		});
+		/**
+		 *
+		 * @param {*} _this
+		 * @param {*} part
+		 * @param {*} groupData
+		 * @param {string} userToSend
+		 */
+		function callSubMenu(_this, part, groupData, userToSend) {
+			const subMenuData = subMenu(_this, part, groupData, userToSend);
+			_this.log.debug("SubMenuData " + JSON.stringify(subMenuData));
+			if (subMenuData && subMenuData[0]) sendToTelegramSubmenu(_this, userToSend, subMenuData[0], subMenuData[1]);
+		}
 
-		/*
-		For every state in the system there has to be also an object of type state
-		Here a simple template for a boolean variable named "testVariable"
-		Because every adapter instance uses its own unique namespace variable names can't collide with other adapters variables
-		*/
-		// await this.setObjectNotExistsAsync("testVariable", {
-		// 	type: "state",
-		// 	common: {
-		// 		name: "testVariable",
-		// 		type: "boolean",
-		// 		role: "indicator",
-		// 		read: true,
-		// 		write: true,
-		// 	},
-		// 	native: {},
-		// });
-
-		// In order to get state updates, you need to subscribe to them. The following line adds a subscription for our variable we have created above.
-		// this.subscribeStates("testVariable");
-		// You can also add a subscription for multiple states. The following line watches all states starting with "lights."
-		// this.subscribeStates("lights.*");
-		// Or, if you really must, you can also watch all states. Don't do this if you don't need to. Otherwise this will cause a lot of unnecessary load on the system:
 		/**
 		 *
 		 * @param {Array} array
 		 * @param {*} _this
 		 */
-		function _setForeignStatesAsync(array, _this) {
+		function _subscribeForeignStatesAsync(array, _this) {
 			array.forEach((element) => {
+				_this.log.debug("Subscribe " + JSON.stringify(element));
 				_this.subscribeForeignStatesAsync(element);
 			});
 		}
@@ -323,27 +320,6 @@ class TelegramMenu extends utils.Adapter {
 		this.subscribeForeignStatesAsync("telegram.0.communicate.request");
 		this.subscribeForeignStatesAsync(telegramID);
 		this.subscribeForeignStatesAsync(`${instanceTelegram}.info.connection`);
-
-		/*
-			setState examples
-			you will notice that each setState will cause the stateChange event to fire (because of above subscribeStates cmd)
-		*/
-		// the variable testVariable is set to true as command (ack=false)
-		// await this.setStateAsync("testVariable", true);
-
-		// same thing, but the value is flagged "ack"
-		// ack should be always set to true if the value is received from or acknowledged from the target system
-		// 'await this.setStateAsync("testVariable", { val: true, ack: true });
-
-		// same thing, but the state is deleted after 30s (getState will return null afterwards)
-		// 'await this.setStateAsync("testVariable", { val: true, ack: true, expire: 30 });
-
-		// examples for the checkPassword/checkGroup functions
-		// let result = await this.checkPasswordAsync("admin", "iobroker");
-		// this.log.info("check user admin pw iobroker: " + result);
-
-		// result = await this.checkGroupAsync("admin", "admin");
-		// this.log.info("check group user admin group admin: " + result);
 	}
 
 	/**
@@ -363,45 +339,6 @@ class TelegramMenu extends utils.Adapter {
 		}
 	}
 
-	// If you need to react to object changes, uncomment the following block and the corresponding line in the constructor.
-	// You also need to subscribe to the objects with `this.subscribeObjects`, similar to `this.subscribeStates`.
-	// /**
-	//  * Is called if a subscribed object changes
-	//  * @param {string} id
-	//  * @param {ioBroker.Object | null | undefined} obj
-	//  */
-	// onObjectChange(id, obj) {
-	// 	if (obj) {
-	// 		// The object was changed
-	// 		this.log.info(`object ${id} changed: ${JSON.stringify(obj)}`);
-	// 	} else {
-	// 		// The object was deleted
-	// 		this.log.info(`object ${id} deleted`);
-	// 	}
-	// }
-
-	// /**
-	//  * Is called if a subscribed state changes
-	//  * @param {string} id
-	//  * @param {ioBroker.State | null | undefined} state
-	//  */
-	// onStateChange(id, state) {
-	// 	if (state) {
-
-	// 		// The state was changed
-	// 		this.log.info(`state ${id} changed: ${state.val} (ack = ${state.ack})`);
-	// 	} else {
-	// 		// The state was deleted
-	// 		this.log.info(`state ${id} deleted`);
-	// 	}
-	// }
-
-	// If you need to accept messages in your adapter, uncomment the following block and the corresponding line in the constructor.
-	// /**
-	//  * Some message was sent to this instance over message box. Used by email, pushover, text2speech, ...
-	//  * Using this method requires "common.messagebox" property to be set to true in io-package.json
-	//  * @param {ioBroker.Message} obj
-	//  */
 	onMessage(obj) {
 		this.log.debug(obj);
 		if (typeof obj === "object" && obj.message) {

package/package.json

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