telegram-bot-ruby 0.18.0 → 0.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8926e9101b449b8f38edab0c8497cb950d7806ac8e7762fa016875c557fa8f4f
-  data.tar.gz: 672f59e2be73cac12311244402960e84f14cd8c206891b33b33eca5adb8d89e9
+  metadata.gz: f4a3f55636b586f9c0c40a020c0eec4686fe4c664946dcb560422c3082d82b6c
+  data.tar.gz: c44b6c28251b3183e5b3bb7256851d0b92f638bcc24b2fd4a188c21aa28beeca
 SHA512:
-  metadata.gz: ff205984af1416bac8ee5919fdf9dbf72d042beb6e7e92df8aaab8dd824d4d087a9b71d603133dfbd9cfafc8c9b0ee71e066a587f674905a6828e64e96abb398
-  data.tar.gz: 8792c770b06c84b38f72b32716c01aa8dd207dffb72c2937387630f1a8e7e7c522c85c5f30ece246c6384c4e546b2b8433b07702c250d79331da97d71e1839e0
+  metadata.gz: 31c46eeb60c9c176ba58ba42811968e5c7b7db40849024f1626147f482c06a4e884843ed228a0a8391feeb69682521bec80d92ebac5fdb531dbadaa386193239
+  data.tar.gz: e3ec13011270299788f4e3e0329c98f9186621b669961e8c669d82a974b1579bf023f70f643071b4eefd5ceec69ebede0ff733cc935e207a2bcaaad9417b9b2e

data/.rubocop.yml

@@ -1,15 +1,20 @@
 ---
-require: rubocop-rspec
+require:
+  - rubocop-rake
+  - rubocop-rspec
+
+AllCops:
+  NewCops: enable
 
 Style/Documentation:
   Enabled: false
 
 Metrics/BlockLength:
-  ExcludedMethods:
+  IgnoredMethods:
     - context
     - describe
 
-Metrics/LineLength:
+Layout/LineLength:
   Max: 120
   Exclude:
     - telegram-bot-ruby.gemspec

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 0.19.0
+
+- Implement [Bot API 6.0](https://core.telegram.org/bots/api-changelog#april-16-2022)
+- Update rubocop
+
 ## 0.18.0
 
 - Implement [Bot API 5.2](https://core.telegram.org/bots/api-changelog#april-26-2021)

data/Gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 gemspec

data/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'bundler/gem_tasks'
 require 'bundler/setup'
 require 'rubocop/rake_task'
@@ -6,7 +8,7 @@ require 'rspec/core/rake_task'
 RuboCop::RakeTask.new(:rubocop) do |task|
   task.fail_on_error = false
   task.options = %w[--force-exclusion]
-  task.patterns = %w[lib/**/*.rb]
+  task.patterns = %w[{lib,spec}/**/*.rb Rakefile]
   task.requires << 'rubocop-rspec'
 end
 

data/examples/bot.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rubygems'
 require 'telegram/bot'
 

data/lib/telegram/bot/api.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Telegram
   module Bot
     class Api
@@ -59,9 +61,9 @@ module Telegram
 
       private
 
-      def build_params(h)
-        h.each_with_object({}) do |(key, value), params|
-          params[key] = sanitize_value(value)
+      def build_params(params)
+        params.transform_values do |value|
+          sanitize_value(value)
         end
       end
 
@@ -88,6 +90,8 @@ module Telegram
           faraday.request :multipart
           faraday.request :url_encoded
           faraday.adapter Telegram::Bot.configuration.adapter
+          faraday.options.timeout = Telegram::Bot.configuration.timeout
+          faraday.options.open_timeout = Telegram::Bot.configuration.open_timeout
         end
       end
     end

data/lib/telegram/bot/client.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Telegram
   module Bot
     class Client
@@ -33,7 +35,7 @@ module Telegram
         response['result'].each do |data|
           yield handle_update(Types::Update.new(data))
         end
-      rescue Faraday::TimeoutError
+      rescue Faraday::TimeoutError, Faraday::ConnectionFailed
         retry
       end
 
@@ -50,7 +52,6 @@ module Telegram
       def default_options
         {
           offset: 0,
-          timeout: 20,
           logger: NullLogger.new,
           url: 'https://api.telegram.org'
         }
@@ -59,7 +60,7 @@ module Telegram
       def log_incoming_message(message)
         uid = message.respond_to?(:from) && message.from ? message.from.id : nil
         logger.info(
-          format('Incoming message: text="%s" uid=%s', message, uid)
+          format('Incoming message: text="%<text>s" uid=%<uid>s', message: message, uid: uid)
         )
       end
     end

data/lib/telegram/bot/configuration.rb

@@ -1,10 +1,14 @@
+# frozen_string_literal: true
+
 module Telegram
   module Bot
     class Configuration
-      attr_accessor :adapter
+      attr_accessor :adapter, :open_timeout, :timeout
 
       def initialize
         @adapter = Faraday.default_adapter
+        @open_timeout = 20
+        @timeout = 20
       end
     end
   end

data/lib/telegram/bot/exceptions/base.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Telegram
   module Bot
     module Exceptions

data/lib/telegram/bot/exceptions/response_error.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Telegram
   module Bot
     module Exceptions
@@ -6,6 +8,7 @@ module Telegram
 
         def initialize(response)
           @response = response
+          super
         end
 
         def to_s

data/lib/telegram/bot/exceptions.rb

@@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 require 'telegram/bot/exceptions/base'
 require 'telegram/bot/exceptions/response_error'

data/lib/telegram/bot/null_logger.rb

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 module Telegram
   module Bot
     class NullLogger < Logger
-      def initialize(*); end
+      def initialize(*); end # rubocop:disable Lint/MissingSuper
 
       def add(*); end
     end

data/lib/telegram/bot/types/animation.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Telegram
   module Bot
     module Types

data/lib/telegram/bot/types/audio.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Telegram
   module Bot
     module Types

data/lib/telegram/bot/types/base.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Telegram
   module Bot
     module Types

data/lib/telegram/bot/types/bot_command.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Telegram
   module Bot
     module Types

data/lib/telegram/bot/types/bot_command_scope_all_chat_administrators.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Telegram
   module Bot
     module Types

data/lib/telegram/bot/types/bot_command_scope_all_group_chats.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Telegram
   module Bot
     module Types

data/lib/telegram/bot/types/bot_command_scope_all_private_chats.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Telegram
   module Bot
     module Types

data/lib/telegram/bot/types/bot_command_scope_chat.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Telegram
   module Bot
     module Types

data/lib/telegram/bot/types/bot_command_scope_chat_administrators.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Telegram
   module Bot
     module Types

data/lib/telegram/bot/types/bot_command_scope_chat_member.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Telegram
   module Bot
     module Types

data/lib/telegram/bot/types/bot_command_scope_default.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Telegram
   module Bot
     module Types

data/lib/telegram/bot/types/callback_game.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Telegram
   module Bot
     module Types

data/lib/telegram/bot/types/callback_query.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Telegram
   module Bot
     module Types

data/lib/telegram/bot/types/chat.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Telegram
   module Bot
     module Types

data/lib/telegram/bot/types/chat_administrator_rights.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module Telegram
+  module Bot
+    module Types
+      class ChatAdministratorRight < Base
+        attribute :is_anonymous, Boolean
+        attribute :can_manage_chat, Boolean
+        attribute :can_delete_messages, Boolean
+        attribute :can_manage_video_chats, Boolean
+        attribute :can_restrict_members, Boolean
+        attribute :can_promote_members, Boolean
+        attribute :can_change_info, Boolean
+        attribute :can_invite_users, Boolean
+        attribute :can_post_messages, Boolean
+        attribute :can_edit_messages, Boolean
+        attribute :can_pin_messages, Boolean
+      end
+    end
+  end
+end

data/lib/telegram/bot/types/chat_invite_link.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Telegram
   module Bot
     module Types

data/lib/telegram/bot/types/chat_join_request.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Telegram
   module Bot
     module Types

data/lib/telegram/bot/types/chat_location.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Telegram
   module Bot
     module Types

data/lib/telegram/bot/types/chat_member.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Telegram
   module Bot
     module Types
@@ -11,7 +13,7 @@ module Telegram
         attribute :can_post_messages, Boolean
         attribute :can_edit_messages, Boolean
         attribute :can_delete_messages, Boolean
-        attribute :can_manage_voice_chats, Boolean
+        attribute :can_manage_video_chats, Boolean
         attribute :can_restrict_members, Boolean
         attribute :can_promote_members, Boolean
         attribute :can_change_info, Boolean

data/lib/telegram/bot/types/chat_member_updated.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Telegram
   module Bot
     module Types

data/lib/telegram/bot/types/chat_permissions.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Telegram
   module Bot
     module Types

data/lib/telegram/bot/types/chat_photo.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Telegram
   module Bot
     module Types

data/lib/telegram/bot/types/chosen_inline_result.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Telegram
   module Bot
     module Types

data/lib/telegram/bot/types/compactable.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 module Telegram
   module Bot
     module Types
       module Compactable
         def to_compact_hash
-          Hash[attributes.dup.delete_if { |_, v| v.nil? }.map do |key, value|
+          attributes.dup.delete_if { |_, v| v.nil? }.map do |key, value|
             value =
               if value.respond_to?(:to_compact_hash)
                 value.to_compact_hash
@@ -12,7 +14,7 @@ module Telegram
               end
 
             [key, value]
-          end]
+          end.to_h
         end
 
         def to_json(*args)

data/lib/telegram/bot/types/contact.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Telegram
   module Bot
     module Types

data/lib/telegram/bot/types/dice.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Telegram
   module Bot
     module Types

data/lib/telegram/bot/types/document.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Telegram
   module Bot
     module Types

data/lib/telegram/bot/types/encrypted_credentials.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Telegram
   module Bot
     module Types

data/lib/telegram/bot/types/encrypted_passport_element.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Telegram
   module Bot
     module Types

data/lib/telegram/bot/types/file.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Telegram
   module Bot
     module Types

data/lib/telegram/bot/types/force_reply.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Telegram
   module Bot
     module Types

data/lib/telegram/bot/types/game.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Telegram
   module Bot
     module Types

data/lib/telegram/bot/types/game_high_score.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Telegram
   module Bot
     module Types

data/lib/telegram/bot/types/inline_keyboard_button.rb

@@ -1,11 +1,14 @@
+# frozen_string_literal: true
+
 module Telegram
   module Bot
     module Types
       class InlineKeyboardButton < Base
         attribute :text, String
         attribute :url, String
-        attribute :login_url, LoginUrl
         attribute :callback_data, String
+        attribute :web_app, WebAppInfo
+        attribute :login_url, LoginUrl
         attribute :switch_inline_query, String
         attribute :switch_inline_query_current_chat, String
         attribute :callback_game, CallbackGame

data/lib/telegram/bot/types/inline_keyboard_markup.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Telegram
   module Bot
     module Types

data/lib/telegram/bot/types/inline_query.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Telegram
   module Bot
     module Types

data/lib/telegram/bot/types/inline_query_result_article.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Telegram
   module Bot
     module Types

data/lib/telegram/bot/types/inline_query_result_audio.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Telegram
   module Bot
     module Types

data/lib/telegram/bot/types/inline_query_result_cached_audio.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Telegram
   module Bot
     module Types

data/lib/telegram/bot/types/inline_query_result_cached_document.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Telegram
   module Bot
     module Types

data/lib/telegram/bot/types/inline_query_result_cached_gif.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Telegram
   module Bot
     module Types

data/lib/telegram/bot/types/inline_query_result_cached_mpeg4_gif.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Telegram
   module Bot
     module Types

data/lib/telegram/bot/types/inline_query_result_cached_photo.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Telegram
   module Bot
     module Types

data/lib/telegram/bot/types/inline_query_result_cached_sticker.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Telegram
   module Bot
     module Types

data/lib/telegram/bot/types/inline_query_result_cached_video.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Telegram
   module Bot
     module Types

data/lib/telegram/bot/types/inline_query_result_cached_voice.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Telegram
   module Bot
     module Types

data/lib/telegram/bot/types/inline_query_result_contact.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Telegram
   module Bot
     module Types

data/lib/telegram/bot/types/inline_query_result_document.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Telegram
   module Bot
     module Types

data/lib/telegram/bot/types/inline_query_result_game.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Telegram
   module Bot
     module Types

data/lib/telegram/bot/types/inline_query_result_gif.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Telegram
   module Bot
     module Types

data/lib/telegram/bot/types/inline_query_result_location.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Telegram
   module Bot
     module Types

data/lib/telegram/bot/types/inline_query_result_mpeg4_gif.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Telegram
   module Bot
     module Types

data/lib/telegram/bot/types/inline_query_result_photo.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Telegram
   module Bot
     module Types

data/lib/telegram/bot/types/inline_query_result_venue.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Telegram
   module Bot
     module Types

data/lib/telegram/bot/types/inline_query_result_video.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Telegram
   module Bot
     module Types

data/lib/telegram/bot/types/inline_query_result_voice.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Telegram
   module Bot
     module Types

data/lib/telegram/bot/types/input_contact_message_content.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Telegram
   module Bot
     module Types