iobroker.telegram-menu 0.6.4 → 0.6.6

package/README.md

@@ -33,6 +33,14 @@ 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.6.6 (2023-09-03)
+
+-   add info-big.png
+
+### 0.6.5 (2023-09-01)
+
+-   get user by chatID and send back to this chatID
+
 ### 0.6.4 (2023-08-20)
 
 -   Trigger check, used triggers are no longer available in action, in nav it is visualized that the trigger is already in use

package/admin/index_m.html

@@ -11,6 +11,7 @@
 	<script type="text/javascript" src="./js/main.js"></script>
 	<script type="text/javascript" src="./js/component.js"></script>
 	<script type="text/javascript" src="./js/emit.js"></script>
+	<script type="text/javascript" src="./js/global.js"></script>
 	<script type="text/javascript" src="../../js/translate.js"></script>
 	<script type="text/javascript" src="../../lib/js/materialize.js"></script>
 	<script type="text/javascript" src="../../js/adapter-settings.js"></script>
@@ -38,6 +39,7 @@
 		let valUserFromTelegram
 		let usedTrigger = []
 		let inputFieldWithDoubleCall = false
+		let userListWithChatID = []
 		// This will be called by the admin adapter when the settings page loads
 		async function load(settings, onChange) {
 			// example: select elements with id=key and class=value and insert value
@@ -50,9 +52,8 @@
 			if (settings.instance) telegramInstance = settings.instance
 			else telegramInstance = "telegram.0"
 			console.log("Telegram Instance: " + settings.instance)
-			valUserFromTelegram = await getUsersFromTelegram(socket, this, telegramInstance, usersInMenus)
-
-			createGroup("#group_list", settings.users, activeMenu, userActiveCheckbox, usersInMenus)
+			valUserFromTelegram = await getUsersFromTelegram(socket, this, telegramInstance)
+			createGroup("#group_list", settings.users, activeMenu, userActiveCheckbox)
 			fillTable("#navigation", settings.data.nav, newTableRow_Nav, menus)
 			fillTableAction(settings.data.action)
 			showHideUserEntry(activeMenu)
@@ -62,7 +63,7 @@
 			menuToSpan(activeMenu)
 			disableEnableInputField("#checkboxNoValueFound", "#textNoEntry")
 			// When import from old Version import Username			
-			buildUserSelection(valUserFromTelegram, menus, usersInMenus)
+			userListWithChatID = buildUserSelection(valUserFromTelegram, menus, usersInMenus)
 			setInstanceSelect(telegramInstance)
 			translateAll()
 
@@ -123,6 +124,7 @@
 			usersInMenus = {}
 			usersInMenus = getUserInMenus()
 			obj.usersInGroup = usersInMenus
+			obj.userListWithChatID = userListWithChatID
 
 			const checkboxes = {}
 			$("#group_active_checkbox input").each(function () {
@@ -131,7 +133,7 @@
 			})
 			obj.userActiveCheckbox = checkboxes
 			const tableDevices = table2Values(".saveTable");
-			if (!isStringEmty(".isString")) return
+			if (!isInputFieldEmty(".isString")) return
 
 			obj.instance = $("#select_instance").val()
 			obj.data = tableDevices;
@@ -166,7 +168,7 @@
 					addNewGroup(menus, newMenu, _onChange)
 					activeMenu = newMenu
 					showUser(newMenu, showHideUserCheckbox)
-					buildUserSelection(valUserFromTelegram, [newMenu], usersInMenus)
+					userListWithChatID = buildUserSelection(valUserFromTelegram, [newMenu], usersInMenus)
 					translateAll()
 				}
 			})
@@ -273,7 +275,7 @@
 			// Click Nav Buttons
 			let activeBtn = "nav"
 			$("header ul").on("click", ".btn_nav", function () {
-				if (!isUserChecked(activeMenu)) return
+				isUserChecked(activeMenu)
 				usedTrigger = generateSelectTrigger(activeMenu, menus)
 				activeBtn = displayCards(activeBtn, this)
 				translateAll()
@@ -282,7 +284,7 @@
 			$(".adapter-container").on("click", ".btn_add_row", function () {
 				$(this).parent().parent().after(newTableRow_Nav(activeMenu, menus))
 				checkUpAndDownArrowBtn(activeMenu)
-				isStringEmty(".isString")
+				isInputFieldEmty(".isString")
 			})
 
 			// Button Row up 
@@ -293,13 +295,13 @@
 			})
 			// Btn Row down
 			$(".adapter-container").on("click", ".btn_down", function (key) {
-				console.log("klick")
 				$(this).parent().parent().insertAfter($(this).parent().parent().next())
 				checkUpAndDownArrowBtn(activeMenu)
 				_onChange()
 			})
+			// Input check if it is not empty
 			$(".adapter-container").on("input", ".isString", function () {
-				isStringEmty(".isString")
+				isInputFieldEmty(".isString")
 			})
 
 			// ----------------------------------------//
@@ -448,10 +450,9 @@
 				checkValueModal(showTrigger)
 			})
 
-
-			//TODO - Trigger müssen noch in anderes Menu übertragen werden
 			$(".adapter-container").on("input", "input[data-name='call']", function () {
-				if (usedTrigger.includes($(this).val())) {
+				usedTrigger = generateSelectTrigger(activeMenu, menus)
+				if (countOccurrences(usedTrigger, $(this).val()) == 2) {
 					inputFieldWithDoubleCall = true
 					$(this).parent().addClass("bg-error-doubleUser")
 					$("#triggerAllreadyInUser").removeClass("hide")

package/admin/js/component.js

@@ -6,9 +6,9 @@
 function groupUserInput(menu) {
 	return /*html*/ `<div data-name="group" data-menu="${menu}" class="${menu} "></div>`;
 }
-function userSelectionTelegram(user, menu) {
+function userSelectionTelegram(user, menu, chatID) {
 	$(`#group_UserInput .${menu}`)
-		.append(/*html*/ `<div data-name="${user}"><p>${user}</p><label><input data-menu="${user}" type="checkbox" class="filled-in userSelection" /><span></span></label></div>
+		.append(/*html*/ `<div data-name="${user}" data-id="${chatID}"><p>${user}</p><label><input data-menu="${user}" type="checkbox" class="filled-in userSelection" /><span></span></label></div>
   `);
 }
 /**

package/admin/js/global.js

@@ -0,0 +1,59 @@
+/*global $,  */
+/*eslint no-unused-vars: ["error", { "varsIgnorePattern": "isInputFieldEmpty|countOccurrences|deleteDoubleEntrysInArray|"}]*/
+/**
+ * Counts how often an element is present in the array
+ * @param {[]} arr The array which should be checked
+ * @param {"string"} searchValue Search String
+ * @returns Occurrences of the Search Value
+ */
+function countOccurrences(arr, searchValue) {
+	let count = 0;
+	for (let i = 0; i < arr.length; i++) {
+		if (arr[i] === searchValue) {
+			count++;
+		}
+	}
+	return count;
+}
+
+/**
+ * Checks if the Inputsfields are empty, if true the parent class gets class="bg-error"
+ * @param {string} classes Class to browse for empty String
+ * @returns boolean True Everything is ok
+ */
+function isInputFieldEmty(classes) {
+	let allFieldsAreFilled = true;
+	$(classes).each(function (key, element) {
+		if (element.value == "") {
+			$(element).parent().addClass("bg-error");
+			allFieldsAreFilled = false;
+		} else {
+			$(element).parent().removeClass("bg-error");
+		}
+	});
+	return allFieldsAreFilled;
+}
+/**
+ * Removes duplicate entries and saves the result
+ * @param {[]} arr Array
+ * @returns Array with unique entrys
+ */
+function deleteDoubleEntrysInArray(arr) {
+	return arr.filter((item, index) => arr.indexOf(item) === index);
+}
+/**
+ * Sorts the array descending
+ * @param {any[]} arr Array witch should be sorted
+ * @returns Sorted Array
+ */
+function sortArray(arr) {
+	arr.sort((a, b) => {
+		const lowerCaseA = a.toLowerCase();
+		const lowerCaseB = b.toLowerCase();
+
+		if (lowerCaseA < lowerCaseB) return -1;
+		if (lowerCaseA > lowerCaseB) return 1;
+		return 0;
+	});
+	return arr;
+}

package/admin/js/main.js

@@ -1,4 +1,4 @@
-/*global newUserBtn,getUsersFromTelegram ,navElement, userSelectionTelegram ,actionElement,createSelectTrigger,newTableRow_Action,newTableRow_Action,newTrInAction,userActivCheckbox,$, groupUserInput*/
+/*global deleteDoubleEntrysInArray,sortArray,newUserBtn,getUsersFromTelegram ,navElement, userSelectionTelegram ,actionElement,createSelectTrigger,newTableRow_Action,newTableRow_Action,newTrInAction,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|"}]*/
 
 function checkSubMenu(activeMenu) {
@@ -34,7 +34,7 @@ function displayCards(activeBtn, _this) {
  * @param {string} activemenu
  * @returns
  */
-function removeUsedTrigger(triggers, activemenu) {
+function splitUsedUnusedTrigger(triggers, activemenu) {
 	const usedTriggers = [];
 	const list = [
 		{
@@ -64,9 +64,9 @@ function removeUsedTrigger(triggers, activemenu) {
 			if ($(e).val()) value = $(e).val();
 			else if ($(e).text()) value = $(e).text();
 			if (typeof value == "string") value = value.trim();
+			usedTriggers.push(value);
 			if (typeof value === "string" && triggers.includes(value)) {
 				triggers.splice(triggers.indexOf(value), 1);
-				usedTriggers.push(value);
 			}
 		});
 	});
@@ -78,6 +78,7 @@ function isUserChecked(activeMenu) {
 	$(`#group_UserInput div[data-menu="${activeMenu}"] input`).each(function () {
 		if ($(this).prop("checked")) checked = true;
 	});
+
 	if (!$(`#group_active_checkbox div.${activeMenu} input`).prop("checked") || checked) {
 		$("#userSelection").addClass("hide");
 		return true;
@@ -132,25 +133,6 @@ function disableEnableInputField(checkbox, inputfield) {
 	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");
-			allOk = false;
-		} else {
-			$(element).parent().removeClass("bg-error");
-		}
-	});
-	return allOk;
-}
 // @ts-ignore
 function checkUpAndDownArrowBtn(activeuser) {
 	const lengthOfNavList = $(`tbody#${activeuser}.visibilityArrowBtn tr`).length - 1;
@@ -223,16 +205,19 @@ function createGroup(id, menu, activeGroup, userActiveCheckbox, usersInGroup) {
 function buildUserSelection(state, menus, userinGroup) {
 	const usersInTelegram = JSON.parse(state.val);
 	const userListe = [];
+	const userListWithChatID = [];
 	for (const user in usersInTelegram) {
 		userListe.push(usersInTelegram[user]["firstName"]);
+		userListWithChatID.push({ name: usersInTelegram[user]["firstName"], chatID: user });
 	}
 	$(menus).each(function (key, menu) {
-		$(userListe).each(function (key, user) {
+		$(userListWithChatID).each(function (key, user) {
 			// @ts-ignore
-			userSelectionTelegram(user, menu);
+			userSelectionTelegram(user.name, menu, user.chatID);
 		});
 		checkCheckbox(menu, userListe, userinGroup);
 	});
+	return userListWithChatID;
 }
 
 function checkCheckbox(menu, userList, userinGroup) {
@@ -339,12 +324,12 @@ function showHideUserEntry(activeGroup) {
 
 /**
  *
- * @param {Array} checkbox Entrys with Checkbox Values
+ * @param {Array} checkboxes Entrys with Checkbox Values
  */
 // @ts-ignore
-function setCheckbox(checkbox) {
-	Object.keys(checkbox).forEach((key) => {
-		if (checkbox[key]) {
+function setCheckbox(checkboxes) {
+	Object.keys(checkboxes).forEach((key) => {
+		if (checkboxes[key]) {
 			$(`#${key}`).prop("checked", true);
 		} else $(`#${key}`).prop("checked", false);
 	});
@@ -374,13 +359,11 @@ function getAllCheckedUserInMenu(activemenu) {
 	return activeUserList;
 }
 
-//TODO - Submenu Trigger
 //ANCHOR - Trigger erstellen
-// @ts-ignore
-
 function generateSelectTrigger(activeMenu, menus) {
 	const submenu = checkSubMenu(activeMenu);
 	let list = [];
+	let usedAndNotUsedTrigger = {};
 	if (submenu) {
 		const activeUserList = getAllCheckedUserInMenu(activeMenu);
 		const menuListWithUser = [];
@@ -396,10 +379,11 @@ function generateSelectTrigger(activeMenu, menus) {
 		const errorTriggerList = [];
 		menuListWithUser.forEach(function (menu) {
 			list = list.concat(splitTextInArray(menu));
+			const usedAndNotUsedTrigger = splitUsedUnusedTrigger(list, menu);
+			list = usedAndNotUsedTrigger.triggers;
+			// @ts-ignore
 			list = deleteDoubleEntrysInArray(list);
 			list = deleteUnnessesaryElements(list);
-			const usedAndNotUsedTrigger = removeUsedTrigger(list, menu);
-			list = usedAndNotUsedTrigger.triggers;
 			usedAndNotUsedTrigger.usedTriggers.forEach(function (element) {
 				if (usedTriggers.includes(element)) {
 					errorTriggerList.push(element);
@@ -408,7 +392,6 @@ function generateSelectTrigger(activeMenu, menus) {
 			});
 
 			if (!triggerInUse) {
-				console.log(usedTriggers);
 				if (usedTriggers.length != 0) usedTriggers.concat(usedAndNotUsedTrigger.usedTriggers);
 				else usedTriggers = usedAndNotUsedTrigger.usedTriggers;
 
@@ -418,13 +401,15 @@ function generateSelectTrigger(activeMenu, menus) {
 				$("#doubleTriggerInSubmenu").removeClass("hide");
 			}
 		});
-	} else list = splitTextInArray(activeMenu);
-
-	list = deleteDoubleEntrysInArray(list);
-	list = deleteUnnessesaryElements(list);
-	const usedAndNotUsedTrigger = removeUsedTrigger(list, activeMenu);
-	list = usedAndNotUsedTrigger.triggers;
-
+	} else {
+		list = splitTextInArray(activeMenu);
+		usedAndNotUsedTrigger = splitUsedUnusedTrigger(list, activeMenu);
+		list = usedAndNotUsedTrigger.triggers;
+		// @ts-ignore
+		list = deleteDoubleEntrysInArray(list);
+		list = deleteUnnessesaryElements(list);
+	}
+	// @ts-ignore
 	list = sortArray(list);
 	// HTML Elemente löschen und neu aufbauen
 	// @ts-ignore
@@ -433,38 +418,16 @@ function generateSelectTrigger(activeMenu, menus) {
 	return usedAndNotUsedTrigger.usedTriggers;
 }
 
-function deleteDoubleEntrysInArray(arr) {
-	return arr.filter((item, index) => arr.indexOf(item) === index);
-}
 function deleteUnnessesaryElements(list) {
 	const newlist = [];
 	list.forEach(function (e) {
 		if (e != "menu:back" && e != "-") {
 			if (e.includes("menu:")) e = e.split(":")[2];
-
 			newlist.push(e);
 		}
 	});
 	return newlist;
 }
-/**
- *
- * @param {any[]} arr
- * @returns Sorted Array
- */
-function sortArray(arr) {
-	arr.sort((a, b) => {
-		// @ts-ignore
-		const lowerCaseA = a.toLowerCase();
-		// @ts-ignore
-		const lowerCaseB = b.toLowerCase();
-
-		if (lowerCaseA < lowerCaseB) return -1;
-		if (lowerCaseA > lowerCaseB) return 1;
-		return 0;
-	});
-	return arr;
-}
 
 // @ts-ignore
 function fillTable(id, data, newTableRow_Nav, users) {

package/io-package.json

@@ -1,8 +1,34 @@
 {
   "common": {
     "name": "telegram-menu",
-    "version": "0.6.4",
+    "version": "0.6.6",
     "news": {
+      "0.6.6": {
+        "en": "add info-big.png",
+        "de": "info-big.png",
+        "ru": "добавить info-big.png",
+        "pt": "adicionar info-big.png",
+        "nl": "voeg info-big toe",
+        "fr": "ajouter info-big.png",
+        "it": "aggiungere info-big.png",
+        "es": "añadir info-big.png",
+        "pl": "info-big.png",
+        "uk": "javascript licenses api веб-сайт go1.13.8",
+        "zh-cn": "增 编"
+      },
+      "0.6.5": {
+        "en": "get user by chatID and send back to this chatID",
+        "de": "benutzer per chatID ermitteln und  zurück senden an diese chatID",
+        "ru": "получить пользователя по чатID и отправить обратно в этот чатID",
+        "pt": "obter usuário por chatID e enviar de volta para este chatID",
+        "nl": "haal gebruiker van chatID en stuur terug naar dit chatID",
+        "fr": "obtenir utilisateur par chatID et renvoyer à ce chatID",
+        "it": "ottenere l'utente da chatID e tornare a questo chatID",
+        "es": "obtener usuario por chatID y enviar de nuevo a este chatID",
+        "pl": "użytkowanie przez czat i wysyłane do tego czatID",
+        "uk": "отримати користувач по chatID і відправити назад в цей чатID",
+        "zh-cn": "被混乱者利用,然后再送给这一混乱的裁研所。"
+      },
       "0.6.4": {
         "en": "Trigger check, used triggers are no longer available in action, in nav it is visualized that the trigger is already in use",
         "de": "Trigger-Check, verwendete Trigger sind nicht mehr in Aktion, in nav wird visualisiert, dass der Trigger bereits im Einsatz ist",
@@ -67,32 +93,6 @@
         "pl": "okładka\nstylistyka\ndrobne rozwiązanie\nAdd Row Button (ang.)\nWięcej grup z tymi samymi grupami User\nTrigger generuje bez oszczędzania",
         "uk": "поштова скринька для користувачів Telegram\nстрахування\nмаленькі кріплення\nДодати кнопку Row в Nav для кожного рядка\nБільше груп з тим самим Користувачем\nТригер генерує без збереження",
         "zh-cn": "电报用户检查箱\n处理\n小型配件\n增加纳维州的Row Button\n与同一用户的更多集团\n不节约的漏洞"
-      },
-      "0.5.1": {
-        "en": "sent to the wrong instance, fixed",
-        "de": "an die falsche instanz gesendet, fixiert",
-        "ru": "отправлено в неправильный экземпляр, исправлено",
-        "pt": "enviado para a instância errada, corrigido",
-        "nl": "verzonden naar de verkeerde instantie",
-        "fr": "envoyé à la mauvaise instance, fixe",
-        "it": "inviato all'istanza sbagliata, fisso",
-        "es": "enviado al caso equivocado, fijo",
-        "pl": "wysłany do niewłaściwej instancji, ustalony",
-        "uk": "відправлений на неправильний екземпляр, фіксований",
-        "zh-cn": "向错误案件发出的固定通知"
-      },
-      "0.5.0": {
-        "en": "trigger avoid duplicate entries and sort alphabetical\nadapter stops responding after some time, fixed #42\ngenerate Trigger in Action, fixed\nmath value for getstate\nsettings instance #41, menus, fixed\nno spellcheck for input fields\nmenu go back to last Sides",
-        "de": "trigger vermeiden doppelte einträge und sortieren alphabetisch\nadapter stoppt nach einiger zeit, fixiert #42\ntrigger in Aktion generieren, fixiert\nmath wert für getstate\neinstellungen instanz #41, menüs, fixiert\nkeine rechtschreibprüfung für eingabefelder\nmenü zurück zu den letzten Seiten",
-        "ru": "триггер избегает дублирования записей и сортировать алфавитный\nадаптер останавливается после некоторого времени, фиксированный #42\nгенерировать триггер в действии, фиксированный\nматематическое значение для getstate\nнастройки экземпляра #41, меню, фиксированные\nбез орфографии для входящих полей\nменю вернуться к последним Сторонам",
-        "pt": "gatilho evitar entradas duplicadas e classificar alfabético\nadaptador pára de responder após algum tempo, fixo #42\ngerar gatilho em Ação, fixo\nvalor de matemática para getstate\nsetting instance #41, menus, fixo\nsem verificação ortográfica para campos de entrada\nmenu voltar para os últimos lados",
-        "nl": "de trekker ontwijkt duplicaat en alfabetische\nadapter stopt met reageren na enige tijd, gerepareerd #42\ngenereerde Trigger in Actie, gerepareerd\nwiskunde waarde voor onroerend goed\nvertaling:\ngeen spellcheck voor input velden\nmenu gaat terug naar de laatste Sides",
-        "fr": "déclencheur éviter les doubles entrées et trier alphabétique\nadaptateur s'arrête après un certain temps, fixe #42\ngénérer Trigger en action, fixe\nmath value for getstate\nparamètres instance #41, menus, fixe\npas de sortcheck pour les champs d'entrée\nmenu retourner aux derniers côtés",
-        "it": "trigger evitare voci duplicate e ordinare alfabetico\nadattatore smette di rispondere dopo qualche tempo, fisso #42\ngenerare Trigger in Azione, fisso\nvalore matematico per getstate\nimpostazioni istanza #41, menu, fisso\nnessun spellcheck per i campi di input\nmenu torna all'ultimo lato",
-        "es": "gatillo evitar entradas duplicadas y ordenar entradas alfabéticas\nadaptador deja de responder después de algún tiempo, fijo #42\ngenerar Trigger en Acción, fijo\nvalor matemático para getstate\nconfiguración instancia #41, menús, fijo\nno hechizo para campos de entrada\nmenu go back to last Sides",
-        "pl": "wykorzystywanie wyjściowe unikanie duplikacji wpisów i alfabetyzacji\npo pewnym czasie przerwy reagują na stałe #42\ngeneruje Triggera w akcji\nwartość matrycowa\nna przykład #41, menus, ustawiony\nzaklęcie dla pól wejściowych\nmenu wraca do ostatniej strony",
-        "uk": "уникнути дублікатів записів і сортування алфавіту\nадаптер припиняє реагувати на деякий час, фіксований #42\nгенерувати Трігер в дії, фіксований\nматематичне значення для getstate\nзамість налаштувань #41, меню, фіксовані\nвідсутність орцепції для вхідних полів\nім'я користувача",
-        "zh-cn": "2. 避免重复物品和名称\n适应者在一段时间后停止作出反应,固定的编号为42\na. 行动的三倍,固定\n获取国产值\n例如第41号、男性、固定地点\n没有对投入领域进行明确的检查\n男子回到最后的Sides。"
       }
     },
     "titleLang": {
@@ -169,7 +169,8 @@
     "directory": "",
     "userActiveCheckbox": [],
     "usersInGroup": {},
-    "textNoEntry": ""
+    "textNoEntry": "",
+    "userListWithChatID": []
   },
   "objects": [],
   "instanceObjects": [

package/lib/js/action.js

@@ -83,7 +83,17 @@ async function editArrayButtons(val, _this) {
  * @param {*} userToSend
  * @param {*} newline
  */
-const idBySelector = async (_this, selector, text, userToSend, newline) => {
+const idBySelector = async (
+	_this,
+	selector,
+	text,
+	userToSend,
+	newline,
+	telegramInstance,
+	one_time_keyboard,
+	resize_keyboard,
+	userListWithChatID,
+) => {
 	let text2Send = "";
 	try {
 		if (selector.includes("functions")) {
@@ -123,7 +133,16 @@ const idBySelector = async (_this, selector, text, userToSend, newline) => {
 							_this.log.debug("text2send " + JSON.stringify(text2Send));
 							_this.log.debug("usertosend " + JSON.stringify(userToSend));
 
-							sendToTelegram(_this, userToSend, text2Send);
+							sendToTelegram(
+								_this,
+								userToSend,
+								text,
+								undefined,
+								telegramInstance,
+								one_time_keyboard,
+								resize_keyboard,
+								userListWithChatID,
+							);
 						})
 						.catch((e) => {
 							_this.log.debug("Error " + JSON.stringify(e));
@@ -151,7 +170,6 @@ async function generateNewObjectStructure(_this, val) {
 				nav: element.value,
 				text: element.text,
 			};
-			_this.log.debug("elementVal " + JSON.stringify(element.value));
 		});
 		return obj;
 	} catch (err) {

package/lib/js/getstate.js

@@ -3,7 +3,7 @@ const idBySelector = require("./action").idBySelector;
 const exchangeValue = require("./action").exchangeValue;
 const calcValue = require("./action").calcValue;
 
-function getstate(_this, part, userToSend, telegramInstance) {
+function getstate(_this, part, userToSend, telegramInstance, one_time_keyboard, resize_keyboard, userListWithChatID) {
 	try {
 		let text = "";
 		let i = 1;
@@ -13,7 +13,17 @@ function getstate(_this, part, userToSend, telegramInstance) {
 			const id = element.id;
 			if (id.indexOf(specificatorSelektor) != -1) {
 				// const selector = id.replace(/\"/g, "");
-				idBySelector(_this, id, element.text, userToSend, element.newline);
+				idBySelector(
+					_this,
+					id,
+					element.text,
+					userToSend,
+					element.newline,
+					telegramInstance,
+					one_time_keyboard,
+					resize_keyboard,
+					userListWithChatID,
+				);
 			} else {
 				_this.getForeignStateAsync(element.id).then((value) => {
 					if (value) {
@@ -50,7 +60,17 @@ function getstate(_this, part, userToSend, telegramInstance) {
 					_this.log.debug("Length & i: " + JSON.stringify({ length: part.getData.length, i: i }));
 					if (i == part.getData.length) {
 						_this.log.debug("User to send: " + JSON.stringify(userToSend));
-						if (userToSend) sendToTelegram(_this, userToSend, text, undefined, telegramInstance);
+						if (userToSend)
+							sendToTelegram(
+								_this,
+								userToSend,
+								text,
+								undefined,
+								telegramInstance,
+								one_time_keyboard,
+								resize_keyboard,
+								userListWithChatID,
+							);
 					}
 					i++;
 				});

package/lib/js/subMenu.js

@@ -12,7 +12,16 @@ const backMenu = {};
  * @param {string} userToSend
  * @returns
  */
-function subMenu(_this, text, groupData, userToSend, instanceTelegram, resize_keyboard, one_time_keyboard) {
+function subMenu(
+	_this,
+	text,
+	groupData,
+	userToSend,
+	instanceTelegram,
+	resize_keyboard,
+	one_time_keyboard,
+	userListWithChatID,
+) {
 	const splittetText = JSON.stringify(text).split(`"`)[1].split(":");
 	const callbackData = splittetText[1];
 	let device2Switch = splittetText[2];
@@ -153,6 +162,7 @@ function subMenu(_this, text, groupData, userToSend, instanceTelegram, resize_ke
 				instanceTelegram,
 				resize_keyboard,
 				one_time_keyboard,
+				userListWithChatID,
 			);
 		}
 		backMenu[userToSend].last = list.pop();

package/lib/js/telegram.js

@@ -16,17 +16,22 @@ function sendToTelegram(
 	instance = "telegram.0",
 	resize_keyboard = true,
 	one_time_keyboard = true,
+	userListWithChatID,
 ) {
 	_this.log.debug("Send this Value : " + JSON.stringify(value));
 	_this.log.debug("Send this to : " + JSON.stringify(user));
 	_this.log.debug("Instance : " + JSON.stringify(instance));
+	let chatId = "";
+	userListWithChatID.forEach((element) => {
+		if (element.name === user) chatId = element.chatID;
+	});
 	if (keyboard.length == 0) {
 		_this.sendTo(
 			instance,
 			"send",
 			{
 				text: value,
-				user: user,
+				chatId: chatId,
 			},
 			function (res) {
 				console.log("Sent Value to " + res + " users!");
@@ -37,7 +42,7 @@ function sendToTelegram(
 			instance,
 			"send",
 			{
-				user: user,
+				chatId: chatId,
 				text: value,
 				reply_markup: {
 					keyboard: keyboard,
@@ -51,10 +56,14 @@ function sendToTelegram(
 		);
 	}
 }
-function sendToTelegramSubmenu(_this, name, text, keyboard, instance = "telegram.0") {
+function sendToTelegramSubmenu(_this, user, text, keyboard, instance = "telegram.0", userListWithChatID) {
+	let chatId = "";
+	userListWithChatID.forEach((element) => {
+		if (element.name === user) chatId = element.chatID;
+	});
 	_this.sendTo(instance, "send", {
-		// chatId: chatId,
-		name: name,
+		chatId: chatId,
+		// name: user,
 		text: text,
 		reply_markup: keyboard,
 	});

package/main.js

@@ -68,6 +68,7 @@ class TelegramMenu extends utils.Adapter {
 		const userActiveCheckbox = this.config.userActiveCheckbox;
 		const groupsWithUsers = this.config.usersInGroup;
 		const textNoEntryFound = this.config.textNoEntry;
+		const userListWithChatID = this.config.userListWithChatID;
 		const menu = {
 			data: {},
 		};
@@ -126,6 +127,7 @@ class TelegramMenu extends utils.Adapter {
 								this.log.debug("Startseite: " + JSON.stringify(startside));
 								groupsWithUsers[group].forEach((user) => {
 									backMenuFuc(this, startside, null, user);
+									this.log.debug("User List " + JSON.stringify(userListWithChatID));
 									sendToTelegram(
 										_this,
 										user,
@@ -134,6 +136,7 @@ class TelegramMenu extends utils.Adapter {
 										instanceTelegram,
 										resize_keyboard,
 										one_time_keyboard,
+										userListWithChatID,
 									);
 								});
 							}
@@ -148,7 +151,19 @@ class TelegramMenu extends utils.Adapter {
 						if (telegramAktiv && state?.ack) {
 							if (state && typeof state.val === "string" && state.val != "" && id == telegramID) {
 								const value = state.val;
-								const user = value.slice(1, value.indexOf("]"));
+								const chatID = await this.getForeignStateAsync(
+									`${instanceTelegram}.communicate.requestChatId`,
+								);
+								let user;
+								if (chatID) {
+									this.log.debug("ChatID: " + JSON.stringify(chatID.val));
+									userListWithChatID.forEach((element) => {
+										this.log.debug("element " + JSON.stringify(element));
+										if (element.chatID == chatID.val) user = element.name;
+										this.log.debug("user " + JSON.stringify(user));
+									});
+								}
+
 								const calledValue = value.slice(value.indexOf("]") + 1, value.length);
 								this.log.debug(
 									JSON.stringify({
@@ -180,7 +195,16 @@ class TelegramMenu extends utils.Adapter {
 									} else continue;
 								}
 								if (!dataFound && checkboxNoEntryFound) {
-									sendToTelegram(this, userToSend, textNoEntryFound, undefined, instanceTelegram);
+									sendToTelegram(
+										this,
+										userToSend,
+										textNoEntryFound,
+										undefined,
+										instanceTelegram,
+										resize_keyboard,
+										one_time_keyboard,
+										userListWithChatID,
+									);
 								}
 
 								// Auf Setstate reagieren und Wert schicken
@@ -226,6 +250,9 @@ class TelegramMenu extends utils.Adapter {
 												textToSend,
 												undefined,
 												instanceTelegram,
+												resize_keyboard,
+												one_time_keyboard,
+												userListWithChatID,
 											);
 											// Die Elemente auf die Reagiert wurde entfernen
 											setStateIdsToListenTo.splice(key, 1);
@@ -270,6 +297,7 @@ class TelegramMenu extends utils.Adapter {
 								instanceTelegram,
 								resize_keyboard,
 								one_time_keyboard,
+								userListWithChatID,
 							);
 							return true;
 						}
@@ -280,7 +308,15 @@ class TelegramMenu extends utils.Adapter {
 					setStateIdsToListenTo = setstate(_this, part, userToSend);
 					return true;
 				} else if (part.getData) {
-					getstate(_this, part, userToSend, instanceTelegram);
+					getstate(
+						_this,
+						part,
+						userToSend,
+						instanceTelegram,
+						one_time_keyboard,
+						resize_keyboard,
+						userListWithChatID,
+					);
 					return true;
 				} else if (part.sendPic) {
 					try {
@@ -315,7 +351,16 @@ class TelegramMenu extends utils.Adapter {
 							const path = `${directoryPicture}${element.fileName}`;
 							const timeout = _this.setTimeout(async () => {
 								_this.log.debug("Send Pic to Telegram");
-								sendToTelegram(_this, userToSend, path, undefined, instanceTelegram);
+								sendToTelegram(
+									_this,
+									userToSend,
+									path,
+									undefined,
+									instanceTelegram,
+									resize_keyboard,
+									one_time_keyboard,
+									userListWithChatID,
+								);
 
 								let timeoutToClear = {};
 								timeoutToClear = timeouts.filter((item) => item.key == timeoutKey);
@@ -352,6 +397,7 @@ class TelegramMenu extends utils.Adapter {
 				instanceTelegram,
 				resize_keyboard,
 				one_time_keyboard,
+				userListWithChatID,
 			);
 			if (subMenuData && subMenuData[3]) setStateIdsToListenTo = subMenuData[3];
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iobroker.telegram-menu",
-  "version": "0.6.4",
+  "version": "0.6.6",
   "description": "Easily create Telegram Menus",
   "author": {
     "name": "MiRo1310",
@@ -24,7 +24,7 @@
     "@iobroker/adapter-core": "^3.0.3"
   },
   "devDependencies": {
-    "@alcalzone/release-script": "^3.5.9",
+    "@alcalzone/release-script": "^3.6.0",
     "@alcalzone/release-script-plugin-iobroker": "^3.6.0",
     "@alcalzone/release-script-plugin-license": "^3.5.9",
     "@alcalzone/release-script-plugin-manual-review": "^3.5.9",
@@ -41,15 +41,15 @@
     "@types/sinon-chai": "^3.2.9",
     "chai": "^4.3.7",
     "chai-as-promised": "^7.1.1",
-    "eslint": "^8.44.0",
+    "eslint": "^8.48.0",
     "eslint-config-prettier": "^8.9.0",
     "eslint-plugin-prettier": "^4.2.1",
     "mocha": "^10.2.0",
-    "prettier": "^3.0.0",
+    "prettier": "^3.0.3",
     "proxyquire": "^2.1.3",
     "sinon": "^15.2.0",
     "sinon-chai": "^3.7.0",
-    "typescript": "~5.1.6"
+    "typescript": "~5.2.2"
   },
   "main": "main.js",
   "files": [