telegruby 1.1.2 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e077b6dc134d14a53d7874fea939238cffe5ba0d
-  data.tar.gz: 96dfbf65a75a08f346de5a56136b661a8ecdfd62
+  metadata.gz: a4744f23e0ac76fdbb1a66569aae506d9341c71f
+  data.tar.gz: 98ab4caddcbd8519580230568361b67ddaed4acf
 SHA512:
-  metadata.gz: e29cb8af551bcd680dd0b1f8902b9fe0ce6b48ae5a5c72292cfd935edb936d99df4e6fb553494c38d87b9a3b837be101ebc3ee308deb578218722f9e2fb14ef6
-  data.tar.gz: aa63bfd92bc4973d85470ed12663e59090684ce56a8272ceabfd0ca28ec9b8cf608e71572884fbd418151bcfeeee3545cbf009fee5e3fcfa4d7a4b5b6b77eb00
+  metadata.gz: d30ffe118c4e320a2122bfe517722859d0b3c3e660a8deb413d475cedbafb27d39f1e81537facc82094d4971f245c4955c3a0f29d8af4d010602506e48b29645
+  data.tar.gz: e1ad5cfa3245c652fd9921a6bf36638462c9ce3738b6ccf9affac4db863e0b907b282419458e1b9a3f8463f9a0a55cbfdef329057115272af79a74364c844043

data/lib/telegruby.rb

@@ -13,16 +13,19 @@ module Telegruby
 
     # See https://core.telegram.org/bots/api for the full method list
 
-    def get_updates(options = {}, error_callback = nil)
-      if options == {}
-        options = {
-          :offset => @id
-        }
-      end
+    def get_updates(on_error: nil)
+      options = {
+        :offset => @id
+      }
 
       request = self.get_request("getUpdates", options)
       if request.code != 200
-        return error_callback request
+        if on_error.nil?
+          puts "Failed to get updates: #{request}"
+          return nil
+        else
+          return on_error(request)
+        end
       end
       update = Update.new(JSON.parse(request.body, object_class: OpenStruct))
       
@@ -35,20 +38,25 @@ module Telegruby
     end
 
     # Send a plaintext message to a chat id
-    def send_message(id, text, reply: nil, parse_mode: nil)
+    def send_message(id, text, reply: nil, parse_mode: nil, disable_preview: nil, reply_markup: nil)
       options = {
         :chat_id => id,
         :text => text
       }
 
+      if !parse_mode.nil?
+        options.merge!(:parse_mode => parse_mode)
+      end
+      if !disable_preview.nil?
+        options.merge!(:disable_preview => disable_preview)
+      end
       if !reply.nil?
         options.merge!(:reply_to_message_id => reply)
       end
-
-      if !parse_mode.nil?
-        options.merge!(:parse_mode => parse_mode)
+      if !reply_markup.nil?
+        options.merge!(:reply_markup => reply_markup)
       end
-      
+
       self.get_request("sendMessage", options)
     end
 
@@ -63,7 +71,7 @@ module Telegruby
     end
    
     # Sends a photo message to a chat id
-    def send_photo(id, filename: nil, file_id: nil, reply: nil)
+    def send_photo(id, filename: nil, file_id: nil, reply: nil, caption: nil, reply_markup: nil)
       options = {
         :chat_id => id,
       }
@@ -77,6 +85,14 @@ module Telegruby
         options.merge!(:reply_to_message_id => reply)
       end
 
+      if !caption.nil?
+        options.merge!(:caption => caption)
+      end
+
+      if !reply_markup.nil?
+        options.merge!(:reply_markup => reply_markup)
+      end
+      
       self.post_request("sendPhoto", options)
     end
 
@@ -90,7 +106,7 @@ module Telegruby
       }
     end
 
-    def send_voice(id, filename: nil, file_id: nil, reply: nil)
+    def send_voice(id, filename: nil, file_id: nil, reply: nil, reply_markup: nil)
       options = {
         :chat_id => id,
       }
@@ -104,10 +120,14 @@ module Telegruby
         options.merge!(:reply_to_message_id => reply)
       end
 
+      if !reply_markup.nil?
+        options.merge!(:reply_markup => reply_markup)
+      end
+
       self.post_request("sendVoice", options)
     end
 
-    def send_sticker(id, file_id: nil, filename: nil, reply: nil)
+    def send_sticker(id, file_id: nil, filename: nil, reply: nil, reply_markup: nil)
       options = {
         :chat_id => id,
       }
@@ -121,10 +141,14 @@ module Telegruby
         options.merge!(:reply_to_message_id => reply)
       end
 
+      if !reply_markup.nil?
+        options.merge!(:reply_markup => reply_markup)
+      end
+
       self.post_request("sendSticker", options)
     end
 
-    def send_audio(id, filename: nil, file_id: nil, reply: nil)
+    def send_audio(id, filename: nil, file_id: nil, reply: nil, reply_markup: nil)
       options = {
         :chat_id => id,
       } 
@@ -138,10 +162,14 @@ module Telegruby
         options.merge!(:reply_to_message_id => reply)
       end
 
+      if !reply_markup.nil?
+        options.merge!(:reply_markup => reply_markup)
+      end
+
       self.post_request("sendAudio", options)
     end
 
-    def send_video(id, filename: nil, file_id: nil, reply: nil)
+    def send_video(id, filename: nil, file_id: nil, reply: nil, reply_markup: nil)
       options = {
         :chat_id => id,
       }
@@ -155,10 +183,14 @@ module Telegruby
         options.merge!(:reply_to_message_id => reply)
       end
 
+      if !reply_markup.nil?
+        options.merge!(:reply_markup => reply_markup)
+      end
+
       self.post_request("sendVideo", options)
     end
 
-    def send_location(id, lat, long, reply: nil)
+    def send_location(id, lat, long, reply: nil, reply_markup: nil)
       options = {
         :chat_id => id,
         :latitude => lat,
@@ -169,6 +201,10 @@ module Telegruby
         options.merge!(:reply_to_message_id => reply)
       end
 
+      if !reply_markup.nil?
+        options.merge!(:reply_markup => reply_markup)
+      end
+
       self.post_request("sendLocation", options)
     end
     
@@ -182,7 +218,7 @@ module Telegruby
     end
 
     # Sends a document by filename or file ID
-    def send_document(id, filename: nil, file_id: nil, reply: nil)
+    def send_document(id, filename: nil, file_id: nil, reply: nil, reply_markup: nil)
       options = {
         :chat_id => id
       }
@@ -197,10 +233,14 @@ module Telegruby
         options.merge!(:reply_to_message_id => reply)
       end
 
+      if !reply_markup.nil?
+        options.merge!(:reply_markup => reply_markup)
+      end
+
       return self.post_request("sendDocument", options)
     end
     
-    def get_userphoto(id, offset: nil, limit: nil)
+    def get_userphotos(id, offset: nil, limit: nil)
       options = {
         :user_id => id,
         :offset => offset,
@@ -221,6 +261,26 @@ module Telegruby
       return self.get_request("setWebhook", options)
     end
 
+    def get_file(file_id)
+      options = {
+        :file_id => file_id
+      }
+      return self.get_request("getFile", options)
+    end
+
+    def answer_inline_query(id, results, cache_time: 300, is_personal: false, next_offset: nil)
+      options = {
+        :inline_query_id => id,
+        :results => results,
+        :cache_time => cache_time,
+        :is_personal => is_personal,
+      }
+      if !next_offset.nil?
+        options.merge!(:next_offset => next_offset)
+      end
+      return self.get_request("answerInlineQuery", options)
+    end
+
     protected
 
     # Provides a generic method for GET requests.
@@ -232,6 +292,7 @@ module Telegruby
     def post_request(name, options = {})
       HTTMultiParty::post(@endpoint + name, query: options).body
     end
+
   end
 
   module_function
@@ -252,7 +313,7 @@ module Telegruby
       return false
     end
   end
-
+  
   # Given an Update object, gets messages as structs.
   def collect_msgs(update)
     update.result.map { |msg|
@@ -288,6 +349,22 @@ module Telegruby
       self.message.chat.id
     end
 
+    def added?(username)
+      if self.message.new_chat_participant.nil?
+        false
+      else
+        self.message.new_chat_participant.username == username
+      end
+    end
+
+    def left?(username)
+      if self.message.left_chat_participant.nil?
+        false
+      else
+        self.message.left_chat_participant.username == username
+      end
+    end
+    
     def body
       self.message.text
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: telegruby
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
 platform: ruby
 authors:
 - '"Lain"'
@@ -9,16 +9,16 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-17 00:00:00.000000000 Z
+date: 2016-02-07 00:00:00.000000000 Z
 dependencies: []
-description: Basic Telegram Bot API library, used for a few bots in the wild.
+description: Telegram Bot API library, https://core.telegram.org/bots/api.
 email: lain@lain.org.uk
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - lib/telegruby.rb
-homepage: https://github.com/telegram-wired/telegruby
+homepage: https://github.com/webgiorno/telegruby
 licenses:
 - MIT
 metadata: {}
@@ -41,5 +41,5 @@ rubyforge_project:
 rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
-summary: Basic Telegram Bot API library.
+summary: Telegram Bot API library.
 test_files: []