botomizer 0.1.14 → 0.1.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 434d32bee68aab392f92b120521676bbd9ad5116
-  data.tar.gz: 2b0bf9db9bdc8bc1ecad9dd9f7d16a821afd429f
+  metadata.gz: 4671740deec6d2329c21c4490362beb78bb5f1e1
+  data.tar.gz: 1957c49d1478ca07df8ba1782f489d6fde6de439
 SHA512:
-  metadata.gz: dbf1aaa89104d06185da8fac062b8a01840e239976ae22636b8d7da1318beff509fae6752e58b6f687646ebcb233942dce473f5053590a38f3b35adabd514397
-  data.tar.gz: 71ae5ea4777518c06cceb8c47d6c91b9eb7e1f52c8e815d79d7afa668250cecae848dfcf62e5619efd5f459d6627db55c39e01adac7cbad3057ed26c3b87986b
+  metadata.gz: 0162d0149a1e214492adada0d0ebb805e97ea0b225a50ba883da87768f35f5cca2720db61d57a9fd9a100a22d7500c77d6f4adb0a5f670f78798fc2eb990beb6
+  data.tar.gz: 75586edd7237637bab3f2192665361ac8876e945c9440c3c2f1a2f46c35f80133a245244f8ac0ca294079b63730725e7bad1e1c357e29d906c406ff359800981

data/lib/botomizer/cache.rb

@@ -17,4 +17,8 @@ class Botomizer::Cache
   def delete(key)
     @cache.delete("#{@prefix}_#{key}") if @cache
   end
+
+  def exists?(key)
+    @cache.exist?("#{@prefix}_#{key}")
+  end
 end

data/lib/botomizer/client.rb

@@ -42,8 +42,10 @@ class Botomizer::Client
 
     handler = handler.new(self)
 
-    if bot.message.cmd?
-      @cache.write(bot.chat.id, message.cmd)
+    @cache.write("prev_#{chat.id}", message.id)
+
+    if message.cmd?
+      @cache.write(chat.id, message.cmd)
     else
       message.cmd = @cache.fetch(chat.id)
     end
@@ -79,12 +81,22 @@ class Botomizer::Client
     result
   end
 
-  def delete_message
-    bot.delete_message
+  def delete_message(id = nil)
+    bot.delete_message(id)
+  end
+
+  def delete_message!(id = nil)
+    result = delete_message(id)
+    raise Botomizer::ResponseError.new(result[:message]) if result[:status] == :failed
+    result
+  end
+
+  def delete_previous_message
+    delete_message(@cache.fetch("prev_#{chat.id}")) if @cache.exists?("prev_#{chat.id}")
   end
 
-  def delete_message!
-    result = delete_message
+  def delete_previous_message!
+    result = delete_previous_message
     raise Botomizer::ResponseError.new(result[:message]) if result[:status] == :failed
     result
   end

data/lib/botomizer/telegram.rb

@@ -54,8 +54,8 @@ module Botomizer::Telegram
       send(:sendMessage, {chat_id: @chat.id, text: text, parse_mode: 'HTML'}.merge(options))
     end
 
-    def delete_message
-      send(:deleteMessage, {chat_id: @chat.id, message_id: @message.id})
+    def delete_message(id = nil)
+      send(:deleteMessage, {chat_id: @chat.id, message_id: id || @message.id})
     end
   end
 end

data/lib/botomizer/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: botomizer
 version: !ruby/object:Gem::Version
-  version: 0.1.14
+  version: 0.1.15
 platform: ruby
 authors:
 - Alex Belenky