mirror.MikroTik/eworm.routeros-scripts
1
0
Fork 0
mirror of https://git.eworm.de/cgit/routeros-scripts synced 2025-07-13 19:44:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

global-functions: $FlushTelegramQueue, $SendTelegram: move hint

Browse source
This commit is contained in:
Christian Hesse 2020-10-13 09:00:55 +02:00
parent fc99440224
commit 6b1d9e8f40
1 changed files with 6 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

13
global-functions
View file

@ -287,8 +287,6 @@
:global TelegramTokenId;
:global LogPrintExit;
:global SymbolForNotification;
:global UrlEncode;
:local AllDone true;
:local QueueLen [ :len $TelegramQueue ];
@ -299,9 +297,7 @@
("https://api.telegram.org/bot" . $TelegramTokenId . "/sendMessage") \
http-data=("chat_id=" . ($Message->"chatid") . \
"&disable_notification=" . ($Message->"silent") . \
"&text=" . ($Message->"text") . "\n\n" . \
[ $UrlEncode ([ $SymbolForNotification "alarm-clock" ] . "This message was " . \
"queued since " . ($Message->"since") . " and may be obsolete.") ]);
"&text=" . ($Message->"text"));
:set ($TelegramQueue->$Id);
} on-error={
$LogPrintExit debug ("Sending queued Telegram message failed.") false;
@ -802,8 +798,11 @@
:if ([ :typeof $TelegramQueue ] = "nothing") do={
:set TelegramQueue [ :toarray "" ];
}
:set ($TelegramQueue->[ :len $TelegramQueue ]) { chatid=$ChatId; text=$Text; \
silent=$Silent; since=([ / system clock get date ] . " " . [ / system clock get time ]) };
:set Text ($Text . [ $UrlEncode ("\n\n" . [ $SymbolForNotification "alarm-clock" ] . \
"This message was queued since " . [ / system clock get date ] . " " . \
[ / system clock get time ] . " and may be obsolete.") ]);
:set ($TelegramQueue->[ :len $TelegramQueue ]) {
chatid=$ChatId; text=$Text; silent=$Silent; };
:if ([ :len [ / system scheduler find where name="FlushTelegramQueue" ] ] = 0) do={
/ system scheduler add name=FlushTelegramQueue interval=1m start-time=startup \
on-event=":global FlushTelegramQueue; \$FlushTelegramQueue;";