From 8db94101c13a636c4c1e2a6a52e8867064a63f52 Mon Sep 17 00:00:00 2001 From: Aaron Johnson Date: Fri, 29 Nov 2019 20:46:50 -0600 Subject: [PATCH] Re-implemented two-part sent message logging. --- run.rb | 15 ++++++++++++--- static_text/patchnotes.txt | 2 +- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/run.rb b/run.rb index 763e593..87df885 100755 --- a/run.rb +++ b/run.rb @@ -226,15 +226,22 @@ end def send_message(chatid, message_text, imageurl = nil) if imageurl != nil #Send message with text as html link to image + print timestamp + ": Sending ............ " + STDOUT.flush 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" + 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 ............ " + STDOUT.flush 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" + print "OK\n".green.bold + puts "Sent: #{message_text.inspect}\n\n" STDOUT.flush #puts message #message = message["results"] @@ -246,8 +253,10 @@ end def send_gif(chatid, cmd) #message = Telegram::Bot::Client.run(@token) {|bot| message = bot.api.send_message(chat_id: chatid, text: "#{message_text}.", parse_mode: "HTML") } gif_url = "#{@gif_url_prefix}#{cmd}.gif" + print timestamp + ": Sending ............ " message = Telegram::Bot::Client.run(@token) {|bot| message = bot.api.sendVideo(chat_id: chatid, video: gif_url) } - puts timestamp + ": Sent GIF: #{gif_url}\n\n" + print "OK\n".green.bold + puts "Sent GIF: #{gif_url}\n\n" STDOUT.flush return message end diff --git a/static_text/patchnotes.txt b/static_text/patchnotes.txt index 9df4c17..7717f18 100644 --- a/static_text/patchnotes.txt +++ b/static_text/patchnotes.txt @@ -2,7 +2,7 @@ SkyfallTech EGS Telebot Patch Notes: v0.5.00 -+ Added Voicechat information feature. ++ Added Voicechat information feature (/voice). + Rewrite of message handling based on Skyfall Heatbot. v0.4.01