modifikasi tg_cmd_dhcp supaya lebih efisien

modifikasi tg_cmd_dhcp agar menggunakan fungsi lowercase dan menghapus parameter yang tidak perlu
dwichan0905 · Oct 4, 2020 · e02609f · e02609f
1 parent 594d98e
commit e02609f
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 31 deletions.
diff --git a/script text/tg_cmd_dhcp b/script text/tg_cmd_dhcp
@@ -1,22 +1,16 @@
 :local send [:parse [/system script get tg_sendMessage source]]
-:local param1 [:pick $params 0 [:find $params " "]]
-:local param2 [:pick $params ([:find $params " "]+1) [:len $params]]
-:local param3 [:pick [:pick $params ([:find $params " "]+1) [:len $params]] ([:find [:pick $params ([:find $params " "]+1) [:len $params]] " "]+1) [:len [:pick $params ([:find $params " "]+1) [:len $params]]]]
-:if ([:len [:find $param2 " "]]>0) do={
-	:set param2 [:pick [:pick $params ([:find $params " "]+1) [:len $params]] 0 [:find [:pick $params ([:find $params " "]+1) [:len $params]] " "]]
-} else={
-	:set param3 ""
-}
+:local tolower [:parse [/system script get func_lowercase source]]
+
 
 :put $params
-:put $param1
-:put $param2
-:put $param3
 :put $chatid
 :put $from
 
+:local paramsLower [$tolower $params]
+:put $paramsLower
+
 :local getVendor false
-:if ((params = "lease") or (params = "LEASE") or (params = "Lease"
+:if ($paramsLower = "lease") do={
 	local GetMacVendor do={
 		:do {
 			return ([/tool fetch mode=https http-method=get url=("https://api.macvendors.com/".[:pick [:tostr $1] 0 8 ]) as-value output=user ]->"data")
@@ -26,7 +20,7 @@
 	}
 	:local text
 	:local number (0)
-	:set text ("*Router ID: ".[/system identity get value-name=name]."*%0A%0A")
+	:set text ("Router ID: $[/system identity get value-name=name]")
 	:foreach lease in=[/ip dhcp-server lease find] do={
 		:set number ($number + 1)
 		set text ($text."====== \F0\9F\97\82 DHCP LEASE ($number) \F0\9F\97\82 ======%0A")

diff --git a/telegram_bot.rsc b/telegram_bot.rsc
@@ -784,30 +784,18 @@ add name=tg_cmd_reboot policy=\
     \nsystem reboot"
 add name=tg_cmd_dhcp policy=read \
     source=":local send [:parse [/system script get tg_sendMessage source]]\r\
-    \n:local param1 [:pick \$params 0 [:find \$params \" \"]]\r\
-    \n:local param2 [:pick \$params ([:find \$params \" \"]+1) [:len \$params]\
-    ]\r\
-    \n:local param3 [:pick [:pick \$params ([:find \$params \" \"]+1) [:len \$\
-    params]] ([:find [:pick \$params ([:find \$params \" \"]+1) [:len \$params\
-    ]] \" \"]+1) [:len [:pick \$params ([:find \$params \" \"]+1) [:len \$para\
-    ms]]]]\r\
-    \n:if ([:len [:find \$param2 \" \"]]>0) do={\r\
-    \n\t:set param2 [:pick [:pick \$params ([:find \$params \" \"]+1) [:len \$\
-    params]] 0 [:find [:pick \$params ([:find \$params \" \"]+1) [:len \$param\
-    s]] \" \"]]\r\
-    \n} else={\r\
-    \n\t:set param3 \"\"\r\
-    \n}\r\
+    \n:local tolower [:parse [/system script get func_lowercase source]]\r\
+    \n\r\
     \n\r\
     \n:put \$params\r\
-    \n:put \$param1\r\
-    \n:put \$param2\r\
-    \n:put \$param3\r\
     \n:put \$chatid\r\
     \n:put \$from\r\
     \n\r\
+    \n:local paramsLower [\$tolower \$params]\r\
+    \n:put \$paramsLower\r\
+    \n\r\
     \n:local getVendor false\r\
-    \n:if ((params = \"lease\") or (params = \"LEASE\") or (params = \"Lease\"\
+    \n:if (\$paramsLower = \"lease\") do={\r\
     \n\tlocal GetMacVendor do={\r\
     \n\t\t:do {\r\
     \n\t\t\treturn ([/tool fetch mode=https http-method=get url=(\"https://api\