iobroker.telegram-menu 0.7.1 → 0.7.2

package/README.md

@@ -33,6 +33,13 @@ 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.7.2 (2023-10-15)
+
+-   submenu Number fixed
+-   text is lost when editing #63
+-   convert milliseconds value to a local time specification
+-   setstate and get result of another state with text adjusted
+
 ### 0.7.1 (2023-10-02)
 
 -   bugfix, Error read UserListTypeError: Cannot read properties of undefined

package/admin/js/emit.js

@@ -26,6 +26,7 @@ function getUsersFromTelegram(socket, _this, telegramInstance) {
  */
 // @ts-ignore
 function getAllTelegramInstances(socket, _this) {
+	console.log("getAllTelegramInstances");
 	const id = [];
 	try {
 		socket.emit(
@@ -36,13 +37,14 @@ function getAllTelegramInstances(socket, _this) {
 			function (err, doc) {
 				if (!err && doc.rows.length) {
 					for (let i = 0; i < doc.rows.length; i++) {
+						console.log(doc.rows[i]);
 						if (
-							doc.rows[i].value &&
-							doc.rows[i].value.common &&
-							doc.rows[i].value.common.titleLang &&
-							doc.rows[i].value.common.titleLang.en &&
-							doc.rows[i].value.common.titleLang.en == "Telegram"
-							// doc.rows[i].value.common.title == "Telegram"
+							(doc.rows[i].value &&
+								doc.rows[i].value.common &&
+								doc.rows[i].value.common.titleLang &&
+								doc.rows[i].value.common.titleLang.en &&
+								doc.rows[i].value.common.titleLang.en == "Telegram") ||
+							doc.rows[i].value.common.title == "Telegram"
 						) {
 							id.push(doc.rows[i].id.replace(/^system\.adapter\./, ""));
 						}
@@ -51,6 +53,7 @@ function getAllTelegramInstances(socket, _this) {
 								// @ts-ignore
 								$("#select_instance").append(newSelectInstanceRow(id));
 							});
+							console.log("Instancen: " + id);
 						}
 					}
 				} else if (err) _this.log.debug("Error all Telegram Users: " + JSON.stringify(err));

package/admin/js/global.js

@@ -1,5 +1,5 @@
 /*global $,  */
-/*eslint no-unused-vars: ["error", { "varsIgnorePattern": "isInputFieldEmpty|countOccurrences|deleteDoubleEntrysInArray|"}]*/
+/*eslint no-unused-vars: ["error", { "varsIgnorePattern": "isInputFieldEmpty|countOccurrences|deleteDoubleEntrysInArray|replaceAll|isInputFieldEmty|sortArray"}]*/
 /**
  * Counts how often an element is present in the array
  * @param {[]} arr The array which should be checked
@@ -57,3 +57,7 @@ function sortArray(arr) {
 	});
 	return arr;
 }
+
+function replaceAll(text, searchValue, replaceValue) {
+	return text.replace(new RegExp(searchValue, "g"), replaceValue);
+}

package/admin/js/main.js

@@ -535,6 +535,7 @@ function insertEditValues(action, $this) {
 	if (action == "get") {
 		newline = valuesToArray($this, "p[data-name='newline_checkbox']");
 		texts = valuesToArray($this, "p[data-name='text']");
+		console.log(texts);
 	}
 	if (action == "pic") {
 		picSendDelay = valuesToArray($this, "p[data-name='picSendDelay']");
@@ -605,7 +606,8 @@ function valuesToArray($this, selector) {
 		.siblings()
 		.find(selector)
 		.each(function () {
-			val.push($(this).html().trim() != "-" ? $(this).html() : "");
+			// #63 - Bugfix
+			val.push($(this).html().trim() != "-" ? $(this).html().replaceAll('"', "'") : "");
 		});
 	return val;
 }

package/io-package.json

@@ -1,8 +1,21 @@
 {
   "common": {
     "name": "telegram-menu",
-    "version": "0.7.1",
+    "version": "0.7.2",
     "news": {
+      "0.7.2": {
+        "en": "submenu Number fixed\ntext is lost when editing #63\nconvert milliseconds value to a local time specification\nsetstate and get result of another state with text adjusted",
+        "de": "unterpositionen Anzahl fest\ntext wird beim editieren von #63 verloren\nmillisekunden-wert in eine lokale zeitvorgabe umwandeln\nsetstate und erhalten ergebnis eines anderen staates mit text angepasst",
+        "ru": "подменю Номер фиксированный\nтекст теряется при редактировании #63\nконвертировать миллисекундное значение в местную спецификацию времени\nsetstate и получить результат другого государства с текстом скорректирован",
+        "pt": "submenu Número fixo\ntexto é perdido ao editar #63\nconverter valor de milissegundos para uma especificação de tempo local\nsetstate e obter resultado de outro estado com texto ajustado",
+        "nl": "submenu Nummer gerepareerd\nsms is verloren als editing 63\nverbergt milliseconden waarde voor een plaatselijke tijd specifiek\nvertaling:",
+        "fr": "sous-menu Nombre fixe\ntexte est perdu lors de l'édition #63\nconvertir la valeur millisecondes à une spécification locale\nsetstate and get result of another state with text adjusted",
+        "it": "sottomenu Numero fisso\ntesto si perde quando si modifica #63\nconvertire il valore di millisecondi in una specifica dell'ora locale\nsetstate e ottenere il risultato di un altro stato con testo regolato",
+        "es": "submenú Número fijo\ntexto se pierde cuando se edita #63\nconvertir el valor de milisegundos a una especificación de tiempo local\nsetstate y obtener resultado de otro estado con texto ajustado",
+        "pl": "submenu liczba stała\ntekst został utracony podczas edycji #63\nwartość zwrotu milisekund do specyfikacji czasu lokalnego\nzbiór i dostaniemy rezultat innego stanu z tekstem dostosowywanym",
+        "uk": "субмену Номер фіксований\nтекст втрачено при редагування #63\nконвертувати значення мілісекундів в локальну специфікацію часу\nsetstate і отримати результат іншої держави з текстом",
+        "zh-cn": "分项 固定人数\n编辑第63号\n当地时间的具体化肥价值\na. 一国和另一国由于经调整案文"
+      },
       "0.7.1": {
         "en": "bugfix, Error read UserListTypeError: Cannot read properties of undefined",
         "de": "bugfix, Fehler lesen UserListType Fehler: Nicht zu lesen Eigenschaften von undefiniert",
@@ -80,19 +93,6 @@
         "pl": "zastosowano menu z błędem",
         "uk": "виправлено, відправте меню з помилкою",
         "zh-cn": "a. 固定状态,向男子发出错误的通知"
-      },
-      "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": "增 编"
       }
     },
     "titleLang": {

package/lib/js/action.js

@@ -29,8 +29,9 @@ function calcValue(_this, textToSend, val) {
  */
 function exchangeValue(textToSend, stateVal, _this) {
 	const startindex = textToSend.indexOf("change{");
-	const match = textToSend.substring(startindex + "change".length + 1, textToSend.indexOf("}", startindex));
+	let match = textToSend.substring(startindex + "change".length + 1, textToSend.indexOf("}", startindex));
 	let objChangeValue;
+	match = match.replaceAll("'", '"');
 	if (Utils.isJSON("{" + match + "}")) objChangeValue = JSON.parse("{" + match + "}");
 	else {
 		_this.log.error(`There is a error in your input: ` + JSON.stringify(Utils.replaceAll(match, '"', "'")));
@@ -100,29 +101,33 @@ const idBySelector = async (
 				enums = result["enum.functions"][`enum.functions.${functions}`].common.members;
 				if (enums) {
 					const promises = enums.map(async (id) => {
-						const value = await _this.getForeignStateAsync(id);
-						if (value && value.val) {
-							_this.log.debug("Value " + JSON.stringify(value.val));
-							_this.log.debug("text " + JSON.stringify(text));
-							let newtext = text;
-							let name;
-							if (text.includes("{common.name}")) {
-								_this.log.debug("test ");
-								name = await _this.getForeignObjectAsync(id);
-								_this.log.debug("Name " + JSON.stringify(name));
-								// _this.log.debug("Name " + JSON.stringify(await _this.getForeignObjectAsync(id)));
-								if (name && name.common.name)
-									newtext = newtext.replace("{common.name}", name.common.name);
-							}
-							if (text.includes("&&")) text2Send += newtext.replace("&&", value.val);
-							else {
-								text2Send += newtext;
-								text2Send += " " + value.val;
+						try {
+							const value = await _this.getForeignStateAsync(id);
+							if (value && value.val) {
+								_this.log.debug("Value " + JSON.stringify(value.val));
+								_this.log.debug("text " + JSON.stringify(text));
+								let newtext = text;
+								let name;
+								if (text.includes("{common.name}")) {
+									_this.log.debug("test ");
+									name = await _this.getForeignObjectAsync(id);
+									_this.log.debug("Name " + JSON.stringify(name));
+									// _this.log.debug("Name " + JSON.stringify(await _this.getForeignObjectAsync(id)));
+									if (name && name.common.name)
+										newtext = newtext.replace("{common.name}", name.common.name);
+								}
+								if (text.includes("&&")) text2Send += newtext.replace("&&", value.val);
+								else {
+									text2Send += newtext;
+									text2Send += " " + value.val;
+								}
 							}
+							if (newline == "true") text2Send += "\n";
+							else text2Send += " ";
+							_this.log.debug("text2send " + JSON.stringify(text2Send));
+						} catch (e) {
+							_this.log.error("Error idBySelector: " + JSON.stringify(e));
 						}
-						if (newline == "true") text2Send += "\n";
-						else text2Send += " ";
-						_this.log.debug("text2send " + JSON.stringify(text2Send));
 					});
 					Promise.all(promises)
 						.then(() => {

package/lib/js/getstate.js

@@ -14,10 +14,10 @@ const calcValue = require("./action").calcValue;
  * @param {object} userListWithChatID Userlist with ChatID
  */
 function getstate(_this, part, userToSend, telegramInstance, one_time_keyboard, resize_keyboard, userListWithChatID) {
-	try {
-		let text = "";
-		let i = 1;
-		part.getData.forEach(async (element) => {
+	let text = "";
+	let i = 1;
+	part.getData.forEach(async (element) => {
+		try {
 			_this.log.debug("Get Value ID " + JSON.stringify(element.id));
 			const specificatorSelektor = "functions=";
 			const id = element.id;
@@ -49,6 +49,17 @@ function getstate(_this, part, userToSend, telegramInstance, one_time_keyboard,
 						if (element.text) {
 							let result = {};
 							let textToSend = element.text.toString();
+							if (textToSend.includes("{time}")) {
+								const time = new Date(value.val);
+								const timeString = time.toLocaleDateString("de-DE", {
+									hour: "2-digit",
+									minute: "2-digit",
+									second: "2-digit",
+									hour12: false,
+								});
+								textToSend = textToSend.replace("{time}", timeString);
+								val = "";
+							}
 							if (textToSend.includes("math:")) {
 								const result = calcValue(_this, textToSend, val);
 								textToSend = result.textToSend;
@@ -85,9 +96,9 @@ function getstate(_this, part, userToSend, telegramInstance, one_time_keyboard,
 					i++;
 				});
 			}
-		});
-	} catch (error) {
-		_this.log.error("Error Getdata: " + JSON.stringify(error));
-	}
+		} catch (error) {
+			_this.log.error("Error Getdata: " + JSON.stringify(error));
+		}
+	});
 }
 module.exports = { getstate };

package/lib/js/setstate.js

@@ -1,3 +1,5 @@
+const sendToTelegram = require("./telegram").sendToTelegram;
+
 /**
  * Sets the state
  * @param {*} _this
@@ -7,7 +9,17 @@
  * @param {boolean} SubmenuValuePriority If true the value from the submenu will be used else the value from the switch
  * @returns Returns an array with the ids to set
  */
-function setstate(_this, part, userToSend, valueFromSubmenu, SubmenuValuePriority) {
+function setstate(
+	_this,
+	part,
+	userToSend,
+	valueFromSubmenu,
+	SubmenuValuePriority,
+	telegramInstance,
+	resize_keyboard,
+	one_time_keyboard,
+	userListWithChatID,
+) {
 	try {
 		const setStateIds = [];
 		part.switch.forEach(
@@ -22,12 +34,12 @@ function setstate(_this, part, userToSend, valueFromSubmenu, SubmenuValuePriorit
 					ack = true;
 					returnText = returnText.replace("ack:true", "");
 				} else if (returnText.includes("ack:false")) {
-					_this.log.debug("Set sck: " + JSON.stringify(false));
+					_this.log.debug("Set ack: " + JSON.stringify(false));
 					ack = false;
 					returnText = element.returnText.replace("ack:false", "").trim();
 				}
 
-				if (!returnText.includes('{"id":"')) {
+				if (!returnText.includes("{'id':'")) {
 					setStateIds.push({
 						id: element.id,
 						confirm: element.confirm,
@@ -37,7 +49,23 @@ function setstate(_this, part, userToSend, valueFromSubmenu, SubmenuValuePriorit
 					_this.log.debug("setStateIds" + JSON.stringify(setStateIds));
 				} else {
 					try {
-						const returnObj = JSON.parse(returnText);
+						_this.log.debug("Returntext " + JSON.stringify(returnText));
+						returnText = returnText.replaceAll("'", '"');
+						const textToSend = returnText.slice(0, returnText.indexOf("{"));
+						const returnObj = JSON.parse(
+							returnText.slice(returnText.indexOf("{"), returnText.indexOf("}") + 1),
+						);
+						sendToTelegram(
+							_this,
+							userToSend,
+							textToSend,
+							undefined,
+							telegramInstance,
+							one_time_keyboard,
+							resize_keyboard,
+							userListWithChatID,
+						);
+						_this.log.debug("JSON parse: " + JSON.stringify(returnObj));
 						setStateIds.push({
 							id: returnObj.id,
 							confirm: true,

package/lib/js/subMenu.js

@@ -22,9 +22,18 @@ function subMenu(
 	one_time_keyboard,
 	userListWithChatID,
 ) {
-	const splittetText = part.split(`"`)[1].split(":");
-	const callbackData = splittetText[1];
-	let device2Switch = splittetText[2];
+	_this.log.debug("Part: " + JSON.stringify(part));
+	let splittetText = [];
+	let callbackData = "";
+	let device2Switch = "";
+	if (part.includes('"')) {
+		splittetText = part.split(`"`)[1].split(":");
+	} else {
+		splittetText = part.split(":");
+	}
+	device2Switch = splittetText[2];
+	callbackData = splittetText[1];
+
 	_this.log.debug("callbackData: 	" + JSON.stringify(callbackData));
 	_this.log.debug("splittet Data of callbackData " + JSON.stringify(splittetText[1]));
 	_this.log.debug("devicetoswitch: 	" + JSON.stringify(device2Switch));
@@ -59,7 +68,17 @@ function subMenu(
 		} else {
 			val = splittedData[1].split(".")[1];
 		}
-		const result = setstate(_this, groupData[device2Switch], userToSend, val, true);
+		const result = setstate(
+			_this,
+			groupData[device2Switch],
+			userToSend,
+			val,
+			true,
+			undefined,
+			undefined,
+			undefined,
+			undefined,
+		);
 		if (Array.isArray(result)) returnIDToListenTo = result;
 		return [null, null, null, returnIDToListenTo];
 	} else if (callbackData.includes("second")) {
@@ -71,7 +90,17 @@ function subMenu(
 		} else {
 			val = splittedData[2].split(".")[1];
 		}
-		const result = setstate(_this, groupData[device2Switch], userToSend, val, true);
+		const result = setstate(
+			_this,
+			groupData[device2Switch],
+			userToSend,
+			val,
+			true,
+			undefined,
+			undefined,
+			undefined,
+			undefined,
+		);
 		if (Array.isArray(result)) returnIDToListenTo = result;
 		return [null, null, null, returnIDToListenTo];
 	}
@@ -109,7 +138,17 @@ function subMenu(
 	} else if (part.includes(`submenu:percent${step}`)) {
 		const value = parseInt(part.split(":")[1].split(",")[1]);
 
-		const result = setstate(_this, groupData[device2Switch], userToSend, value, true);
+		const result = setstate(
+			_this,
+			groupData[device2Switch],
+			userToSend,
+			value,
+			true,
+			undefined,
+			undefined,
+			undefined,
+			undefined,
+		);
 		if (Array.isArray(result)) returnIDToListenTo = result;
 		return [null, null, null, returnIDToListenTo];
 
@@ -140,10 +179,10 @@ function subMenu(
 				if (i === start) index = end - 1;
 				index++;
 			} else index = i;
-
+			//FIXME - index eine position nach hinten geschoben
 			menu.push({
 				text: `${index}${unit}`,
-				callback_data: `submenu:${callbackData}:${index}:${device2Switch}`,
+				callback_data: `submenu:${callbackData}:${device2Switch}:${index}`,
 			});
 			rowEntrys++;
 			if (rowEntrys == 8) {
@@ -158,12 +197,24 @@ function subMenu(
 		_this.log.debug("keyboard " + JSON.stringify(keyboard.inline_keyboard));
 		return ["Welcher Wert soll gesetzt werden?", JSON.stringify(keyboard), device2Switch];
 	} else if (part.includes(`submenu:${callbackData}`)) {
-		const value = parseInt(part.split(":")[2]);
-		device2Switch = part.split(":")[3];
+		_this.log.debug("CallbackData" + JSON.stringify(callbackData));
+		//FIXME - value und device2Switch vertauscht
+		const value = parseInt(part.split(":")[3]);
+		device2Switch = part.split(":")[2];
 		_this.log.debug(
 			JSON.stringify({ device2Switch: device2Switch, data: groupData, user: userToSend, value: value }),
 		);
-		const result = setstate(_this, groupData[device2Switch], userToSend, value, true);
+		const result = setstate(
+			_this,
+			groupData[device2Switch],
+			userToSend,
+			value,
+			true,
+			undefined,
+			undefined,
+			undefined,
+			undefined,
+		);
 		if (Array.isArray(result)) returnIDToListenTo = result;
 		return [null, null, null, returnIDToListenTo];
 	}

package/main.js

@@ -46,7 +46,7 @@ class TelegramMenu extends utils.Adapter {
 	async onReady() {
 		this.setState("info.connection", false, true);
 		let instanceTelegram = this.config.instance;
-		if (instanceTelegram.length == 0) instanceTelegram = "telegram.0";
+		if (!instanceTelegram || instanceTelegram.length == 0) instanceTelegram = "telegram.0";
 		const telegramID = `${instanceTelegram}.communicate.request`;
 		const datapoint = `${instanceTelegram}.info.connection`;
 		this.log.debug("Datapoint: " + JSON.stringify(datapoint));
@@ -194,7 +194,19 @@ class TelegramMenu extends utils.Adapter {
 									this.log.debug("Menu: " + JSON.stringify(menuData.data));
 									this.log.debug("Group: " + JSON.stringify(group));
 
-									if (processData(this, groupData, calledValue, userToSend, group)) {
+									if (
+										processData(
+											this,
+											groupData,
+											calledValue,
+											userToSend,
+											group,
+											instanceTelegram,
+											resize_keyboard,
+											one_time_keyboard,
+											userListWithChatID,
+										)
+									) {
 										dataFound = true;
 										break;
 									} else continue;
@@ -291,7 +303,17 @@ class TelegramMenu extends utils.Adapter {
 		 * @param {string} groupWithUser  Group with the User
 		 * @returns true, if data was found, else false
 		 */
-		function processData(_this, groupData, calledValue, userToSend = "", groupWithUser) {
+		function processData(
+			_this,
+			groupData,
+			calledValue,
+			userToSend = "",
+			groupWithUser,
+			instanceTelegram,
+			resize_keyboard,
+			one_time_keyboard,
+			userListWithChatID,
+		) {
 			if (groupData[calledValue] && userToSend && groupWithUser && userActiveCheckbox[groupWithUser]) {
 				const part = groupData[calledValue];
 				// Navigation
@@ -299,7 +321,16 @@ class TelegramMenu extends utils.Adapter {
 					_this.log.debug("Menu to Send: " + JSON.stringify(part.nav));
 					backMenuFuc(_this, calledValue, part.nav, userToSend);
 					if (JSON.stringify(part.nav).includes("menu")) {
-						callSubMenu(_this, JSON.stringify(part.nav), groupData, userToSend);
+						callSubMenu(
+							_this,
+							JSON.stringify(part.nav),
+							groupData,
+							userToSend,
+							instanceTelegram,
+							resize_keyboard,
+							one_time_keyboard,
+							userListWithChatID,
+						);
 						return true;
 					} else {
 						if (userToSend) {
@@ -320,7 +351,17 @@ class TelegramMenu extends utils.Adapter {
 				}
 				// Schalten
 				else if (part.switch) {
-					setStateIdsToListenTo = setstate(_this, part, userToSend, 0, false);
+					setStateIdsToListenTo = setstate(
+						_this,
+						part,
+						userToSend,
+						0,
+						false,
+						instanceTelegram,
+						resize_keyboard,
+						one_time_keyboard,
+						userListWithChatID,
+					);
 
 					_this.log.debug("SubmenuData3" + JSON.stringify(setStateIdsToListenTo));
 					if (Array.isArray(setStateIdsToListenTo))
@@ -373,22 +414,26 @@ class TelegramMenu extends utils.Adapter {
 						} else path = element.fileName;
 						try {
 							const timeout = _this.setTimeout(async () => {
-								_this.log.debug("Send Pic to Telegram");
-								sendToTelegram(
-									_this,
-									userToSend,
-									path,
-									undefined,
-									instanceTelegram,
-									resize_keyboard,
-									one_time_keyboard,
-									userListWithChatID,
-								);
+								try {
+									_this.log.debug("Send Pic to Telegram");
+									sendToTelegram(
+										_this,
+										userToSend,
+										path,
+										undefined,
+										instanceTelegram,
+										resize_keyboard,
+										one_time_keyboard,
+										userListWithChatID,
+									);
 
-								let timeoutToClear = {};
-								timeoutToClear = timeouts.filter((item) => item.key == timeoutKey);
-								clearTimeout(timeoutToClear.timeout);
-								timeouts = timeouts.filter((item) => item.key !== timeoutKey);
+									let timeoutToClear = {};
+									timeoutToClear = timeouts.filter((item) => item.key == timeoutKey);
+									clearTimeout(timeoutToClear.timeout);
+									timeouts = timeouts.filter((item) => item.key !== timeoutKey);
+								} catch (e) {
+									_this.log.error("Error: " + JSON.stringify(e));
+								}
 							}, parseInt(element.delay));
 							_this.log.debug("Timeout add");
 							timeouts.push({ key: timeoutKey, timeout: timeout });
@@ -402,7 +447,17 @@ class TelegramMenu extends utils.Adapter {
 					return true;
 				}
 			} else if (calledValue.startsWith("menu") || calledValue.startsWith("submenu")) {
-				callSubMenu(_this, calledValue, groupData, userToSend);
+				_this.log.debug("Call Submenu");
+				callSubMenu(
+					_this,
+					calledValue,
+					groupData,
+					userToSend,
+					instanceTelegram,
+					resize_keyboard,
+					one_time_keyboard,
+					userListWithChatID,
+				);
 				return true;
 			} else {
 				return false;
@@ -415,7 +470,16 @@ class TelegramMenu extends utils.Adapter {
 		 * @param {{}} groupData
 		 * @param {string} userToSend
 		 */
-		function callSubMenu(_this, part, groupData, userToSend) {
+		function callSubMenu(
+			_this,
+			part,
+			groupData,
+			userToSend,
+			instanceTelegram,
+			resize_keyboard,
+			one_time_keyboard,
+			userListWithChatID,
+		) {
 			const subMenuData = subMenu(
 				_this,
 				part,

package/package.json

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