From 87350cc890ab42b36230fcb1e76ef53145f0ab5f Mon Sep 17 00:00:00 2001 From: Aaron Johnson Date: Fri, 29 Nov 2019 20:54:40 -0600 Subject: [PATCH] Implemented two-part sent message logging --- run.rb | 18 +++++++++++++++--- static_text/patchnotes.txt | 3 +++ 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/run.rb b/run.rb index 91ceabb..8b433fa 100755 --- a/run.rb +++ b/run.rb @@ -286,15 +286,23 @@ end def send_message(chatid, message_text, imageurl = nil) if imageurl != nil #Send message with text as html link to image + print timestamp + ": Sending ............ " message = Telegram::Bot::Client.run(@token) {|bot| message = bot.api.send_message(chat_id: chatid, text: "#{message_text}.", parse_mode: "HTML") } - puts timestamp + ": Sent: #{message_text.inspect}\n\n" + STDOUT.flush + print "OK\n".green.bold + STDOUT.flush + puts "Sent: #{message_text.inspect}\n\n" STDOUT.flush #puts timestamp + ": Sent: #{message_text.inspect}\n\n" return message else #Send a plain-text message + print timestamp + ": Sending ............ " message = Telegram::Bot::Client.run(@token) {|bot| bot.api.send_message(chat_id: chatid, text: message_text) } - puts timestamp + ": Sent: #{message_text.inspect}\n\n" + STDOUT.flush + print "OK\n".green.bold + STDOUT.flush + puts "Sent: #{message_text.inspect}\n\n" STDOUT.flush #puts message #message = message["results"] @@ -305,8 +313,12 @@ end def send_message_markdown(chatid, message_text) #Send a plain-text message + print timestamp + ": Sending ............ " + STDOUT.flush Telegram::Bot::Client.run(@token) {|bot| bot.api.send_message(chat_id: chatid, text: "```#{message_text}```", parse_mode: 'Markdown') } - puts timestamp + ": Sent: #{message_text.inspect}\n\n" + print "OK\n".green.bold + STDOUT.flush + puts "Sent: #{message_text.inspect}\n\n" STDOUT.flush end diff --git a/static_text/patchnotes.txt b/static_text/patchnotes.txt index 3c7336e..fe7ea18 100644 --- a/static_text/patchnotes.txt +++ b/static_text/patchnotes.txt @@ -1,6 +1,9 @@ SkyfallTech HeatBot Patch Notes: +v1.0.02 ++ Implemented two-part sent message logging (affects server only) + v1.0.01 + Added /help as an alias for /start + Fixed logging delays related to a missing/misplaced STDOUT.flush calls