fixed #7

windka · windka · commit 1ce75b55a7dd · 2024-01-14T20:26:26.000+01:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,9 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
+# [0.1.5] - 2024-01-14
+### added devicemodel, systemversion appversion as optional parameters - [#7](https://github.com/windkh/node-red-node-telegrambot/issues/7) 
+
 # [0.1.4] - 2023-10-15
 ### added further filters - [#3](https://github.com/windkh/node-red-node-telegrambot/issues/3) 
 ### added client api - [#5](https://github.com/windkh/node-red-node-telegrambot/issues/5) 
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "node-red-node-telegrambot",
-  "version": "0.1.4",
+  "version": "0.1.5",
   "description": "Telegram userbot nodes for Node-RED",
   "dependencies": {
     "telegram": "^2.18.38"
diff --git a/telegrambot/telegrambot.html b/telegrambot/telegrambot.html
@@ -12,6 +12,10 @@
             
             useproxy: { value: false, required: false },
             usewss: { value: false, required: false },
+            devicemodel: { value: "", required: false },
+            systemversion: { value: "", required: false },
+            appversion: { value: "", required: false },
+
             host: { value: "", required: false },
             sockstype: { value: "5", required: false },
             port: { value: 6667, required: false, validate:function(v) { return ((v === "") || (RED.validators.number(v) && (v >= 0) && (v <= 2147483))) }},
@@ -34,8 +38,8 @@
         },
         oneditprepare: function() {
             // polling or webhook
-            var updateLoginMode = function() {
-                var mode = $("#node-config-input-loginmode").val();
+            let updateLoginMode = function() {
+                let mode = $("#node-config-input-loginmode").val();
                 if (mode == "user") {
                     $("#phonenumber").show();
                     $("#password").show();
@@ -51,8 +55,8 @@
 
 
             // proxy  on / off
-            var useproxy = function() {
-                var mode = $("#node-config-input-useproxy").prop('checked');
+            let useproxy = function() {
+                let mode = $("#node-config-input-useproxy").prop('checked');
                 if (mode === false) {
                     $("#useproxy").hide();
                 } else {
@@ -63,15 +67,18 @@
             $("#node-config-input-useproxy").change(useproxy);
 
 
-            var login = function() {       
+            let login = function() {    
                 let apiId = $("#node-config-input-apiid").val();
                 let apiHash = $("#node-config-input-apihash").val();
                 let phoneNumber = $("#node-config-input-phonenumber").val();
                 let password = $("#node-config-input-password").val();
                 let botToken = $("#node-config-input-bottoken").val();
                 let loginMode = $("#node-config-input-loginmode").val();
-                let useProxy = $("#node-config-input-useproxy").val();
-                let useWSS = $("#node-config-input-usewss").val();
+                let useProxy = $("#node-config-input-useproxy").prop('checked');
+                let useWSS = $("#node-config-input-usewss").prop('checked');
+                let devicemodel = $("#node-config-input-devicemodel").val();
+                let systemversion = $("#node-config-input-systemversion").val();
+                let appversion = $("#node-config-input-appversion").val();
                 let proxy; 
                 
                 if (useProxy) {
@@ -82,7 +89,7 @@
                         username: $("#node-config-input-username").val(),
                         password: $("#node-config-input-password").val(),
                         secret: $("#node-config-input-secret").val(),
-                        MTProxy: $("#node-config-input-mtproxy").val(),
+                        MTProxy: $("#node-config-input-mtproxy").prop('checked'),
                         timeout: Number($("#node-config-input-timeout").val()),
                     };
                 }
@@ -97,14 +104,16 @@
                         loginMode : loginMode,
                         proxy : proxy,
                         useWSS : useWSS,
+                        devicemodel : devicemodel,
+                        systemversion : systemversion,
+                        appversion : appversion,
                     }
 
                     $("#loginbuttontip").text("Login started: enter code in field below.");
                     $("#node-config-input-phonecode").val('');
                     $("#node-config-input-session").val('');
                     $.getJSON('node-red-node-telegrambot-login', parameters, function(data) {
                         if(data.session){
-                            debugger
                             $("#node-config-input-session").val(data.session);
                             $("#loginbuttontip").text("Click Login button to request code for login: code will be sent via your phone.");
                             $("#node-config-input-phonecode").val('');
@@ -119,7 +128,7 @@
                 }
             }
 
-            var setPhoneCode = function() {  
+            let setPhoneCode = function() {  
                 let phoneCode = $("#node-config-input-phonecode").val();
                 if(phoneCode != ''){
                     $("#loginbuttontip").text("Signing in using phone code ....");
@@ -132,7 +141,7 @@
                 }
             }
 
-            var setPassword = function() {  
+            let setPassword = function() {  
                 let password = $("#node-config-input-password").val();
                 if(password != ''){
                     $("#loginbuttontip").text("Signing in using password ....");
@@ -145,7 +154,7 @@
                 }
             }
 
-            var showLoginButton = function() {  
+            let showLoginButton = function() {  
                 let session = $("#node-config-input-session").val();
                 if(session === ''){
                     $("#loginpanel").show();
@@ -208,7 +217,21 @@
                 <input type="text" id="node-config-input-apihash" placeholder="(Enter the hash here)">
             </div>
 			<div class="form-tips" style="width: auto"><b>Tip:</b> If you don't have an application ID yet, you can create a new one here: <a href="https://my.telegram.org/auth">Telegram</a>.</div>
-    	</div>
+    	
+            <!-- optional client configuration parameters -->
+            <div class="form-row">
+                <label for="node-config-input-devicemodel"><i class="fa fa-caret-right"></i> Device Model</label>
+                <input type="text" id="node-config-input-devicemodel" placeholder="(Optional: device model)">
+            </div>
+            <div class="form-row">
+                <label for="node-config-input-systemversion"><i class="fa fa-caret-right"></i> System Version</label>
+                <input type="text" id="node-config-input-systemversion" placeholder="(Optional: system version)">
+            </div>
+            <div class="form-row">
+                <label for="node-config-input-appversion"><i class="fa fa-caret-right"></i> App Version</label>
+                <input type="text" id="node-config-input-appversion" placeholder="(Optional: app version)">
+            </div>
+        </div>
 		
         <div class="form-row">
 			<div class="form-row">
@@ -239,7 +262,7 @@
             <hr align="middle"/>
         </div>
 
-        <hr align="middle"/>
+        <hr align="middle"/> 
 
         <div class="form-row">
             <label for="node-config-input-useproxy"><i class="fa fa-lock"></i> Use Proxy</label>
diff --git a/telegrambot/telegrambot.js b/telegrambot/telegrambot.js
@@ -45,6 +45,9 @@ module.exports = function (RED) {
             let loginMode = parameters.loginMode;
             let proxy = parameters.proxy;
             let useWSS = parameters.useWSS;
+            let deviceModel = parameters.devicemodel || "";
+            let systemVersion = parameters.systemversion || "";
+            let appVersion = parameters.appversion || ""; 
 
             if (password === undefined || password === '') {
                 password = async () => await getPassword;
@@ -59,6 +62,17 @@ module.exports = function (RED) {
                     useWSS: useWSS,
                 };
 
+                // optional login parameters.
+                if (deviceModel !== "") {
+                    clientParams.deviceModel = deviceModel;
+                }
+                if (systemVersion !== "") {
+                    clientParams.systemVersion = systemVersion;
+                }
+                if (appVersion !== "") {
+                    clientParams.appVersion = appVersion;
+                }
+
                 const client = new TelegramClient(stringSession, apiId, apiHash, clientParams);
 
                 client.setLogLevel('warn');
@@ -176,6 +190,9 @@ module.exports = function (RED) {
         this.useProxy = n.useproxy || false;
         this.useWSS = n.usewss || false;
         this.proxy;
+        let deviceModel = n.devicemodel || "";
+        let systemVersion = n.systemversion || "";
+        let appVersion = n.appversion || ""; 
 
         if (this.useProxy) {
             this.proxy = {
@@ -219,6 +236,18 @@ module.exports = function (RED) {
                         proxy: proxy,
                         useWSS: useWSS,
                     };
+    
+                    // optional login parameters.
+                    if (deviceModel !== "") {
+                        clientParams.deviceModel = deviceModel;
+                    }
+                    if (systemVersion !== "") {
+                        clientParams.systemVersion = systemVersion;
+                    }
+                    if (appVersion !== "") {
+                        clientParams.appVersion = appVersion;
+                    }
+                    
                     client = new TelegramClient(stringSession, ID, apiHash, clientParams);
 
                     client.setLogLevel(logLevel);

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "node-red-node-telegrambot",`
`3`		`- "version": "0.1.4",`
	`3`	`+ "version": "0.1.5",`
`4`	`4`	`"description": "Telegram userbot nodes for Node-RED",`
`5`	`5`	`"dependencies": {`
`6`	`6`	`"telegram": "^2.18.38"`