botomizer 0.1.15 → 0.1.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4671740deec6d2329c21c4490362beb78bb5f1e1
-  data.tar.gz: 1957c49d1478ca07df8ba1782f489d6fde6de439
+  metadata.gz: 822522aaa1345e4257dc5834ba167a98df411629
+  data.tar.gz: ad850b291f243194c5e8800319ac3d2535cd92aa
 SHA512:
-  metadata.gz: 0162d0149a1e214492adada0d0ebb805e97ea0b225a50ba883da87768f35f5cca2720db61d57a9fd9a100a22d7500c77d6f4adb0a5f670f78798fc2eb990beb6
-  data.tar.gz: 75586edd7237637bab3f2192665361ac8876e945c9440c3c2f1a2f46c35f80133a245244f8ac0ca294079b63730725e7bad1e1c357e29d906c406ff359800981
+  metadata.gz: 2730005630d96b88c68afb6878cebd5e225b39819fb993c6236f6a0d089cc73aaa650b6adfbebaf53387e6161b263df59b378e2596622629a0043153ee579893
+  data.tar.gz: 6df62562aa3f1b2213e8accc8f1de45d39b6788f401b33a0f69c9f660700a428f5843e640105917c54992872d294f3c9de083fd8909cf151e474ff3f15632614

data/lib/botomizer/client.rb

@@ -42,8 +42,6 @@ class Botomizer::Client
 
     handler = handler.new(self)
 
-    @cache.write("prev_#{chat.id}", message.id)
-
     if message.cmd?
       @cache.write(chat.id, message.cmd)
     else
@@ -72,7 +70,11 @@ class Botomizer::Client
   end
 
   def send_message(text, options = {})
-    bot.send_message(text, options)
+    result = bot.send_message(text, options)
+
+    @cache.write("prev_#{chat.id}", result[:message_id]) if result.has_key?(:message_id)
+
+    result
   end
 
   def send_message!(text, options = {})
@@ -92,12 +94,8 @@ class Botomizer::Client
   end
 
   def delete_previous_message
-    delete_message(@cache.fetch("prev_#{chat.id}")) if @cache.exists?("prev_#{chat.id}")
-  end
-
-  def delete_previous_message!
-    result = delete_previous_message
-    raise Botomizer::ResponseError.new(result[:message]) if result[:status] == :failed
-    result
+    if @cache.exists?("prev_#{chat.id}")
+      delete_message(@cache.fetch("prev_#{chat.id}"))
+    end
   end
 end

data/lib/botomizer/telegram.rb

@@ -41,10 +41,12 @@ module Botomizer::Telegram
     end
 
     def send(method, query = {})
-      response = HTTParty.post("#{API_URL}#{@options[:token]}/#{method}", {query: query}).parsed_response
+      response    = HTTParty.post("#{API_URL}#{@options[:token]}/#{method}", {query: query}).parsed_response
+      result      = response['result'] || nil
+      message_id  = result.kind_of?(Hash) && result.has_key?('message_id') ? result['message_id'].to_i : nil
 
       if response['ok']
-        {status: :success, result: response['result'], message: response['description']}
+        {status: :success, message_id: message_id, message: response['description'], result: result}
       else
         {status: :failed, error: response['error_code'], message: response['description']}
       end

data/lib/botomizer/version.rb

@@ -1,3 +1,3 @@
 module Botomizer
-  VERSION = '0.1.15'
+  VERSION = '0.1.16'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: botomizer
 version: !ruby/object:Gem::Version
-  version: 0.1.15
+  version: 0.1.16
 platform: ruby
 authors:
 - Alex Belenky
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-12-02 00:00:00.000000000 Z
+date: 2017-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler