telegram-bot 0.16.6 → 0.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d3042f396a1305e21433237a6818cc0e107f729346473b7a995dde67ed13a195
-  data.tar.gz: 1352209b4426de4d58b9f794ca5e9be379a585a103be2d2327da621b9d1a4105
+  metadata.gz: b28011561c8299c9b039c129d1395abcb4c3992d5a29ba9ac49dbc5848d74186
+  data.tar.gz: 5dc18d9b70aeb49a58952a1676befcd8a5371e8367ee08e2ca7e08074e718124
 SHA512:
-  metadata.gz: 302326bdcfbc79773c29d3c2cc07db1cbcfeee64907fa8f326e511f45095a52ac4119467f5d931bcbf7f869730882070238675da29f552c9fa1f7dd08c4b16eb
-  data.tar.gz: 0d1d00a26453f03b77d27687b521450774ea2ae383384203ba14451cde1d1aa10dde46e3e0ad705043fa09d0d4fdf2a22dd617d9baf1fb0c12b0b00e7d9cdc72
+  metadata.gz: 3d7118c1e008c2085e48cbbfb5aeb7cae8bcb4f7804aa91e6cabd9e846a8b30b68af0c9de2c7ab56f29491643fd3f2da6c2931f82131d76c775a805008ea72bf
+  data.tar.gz: af484c66db4ce1dd02d115a59b6f55b1f7b28ad33ba5ff49fe02001ce28f4c70467f596ff100ec91c98c082a998c090f3bc3c93c47aed247905b3e08ec8323b7

data/.github/workflows/ci.yml

@@ -17,25 +17,19 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby:
-          - '2.7'
-        gemfile:
-          - gemfiles/rails_61.gemfile
-          - gemfiles/rails_60.gemfile
-          - gemfiles/rails_52.gemfile
-          - gemfiles/rails_51.gemfile
         include:
           # ruby 3.x
+          - ruby: '3.2'
+            gemfile: gemfiles/rails_81.gemfile
           - ruby: '3.2'
             gemfile: gemfiles/rails_80.gemfile
           - ruby: '3.2'
             gemfile: gemfiles/rails_72.gemfile
           - ruby: '3.2'
             gemfile: gemfiles/rails_71.gemfile
-          - ruby: '3.0'
-            gemfile: gemfiles/rails_61.gemfile
-          - ruby: '3.0'
-            gemfile: gemfiles/rails_60.gemfile
+          # ruby 2.x
+          - ruby: '2.7'
+            gemfile: gemfiles/rails_71.gemfile
     env:
       BUNDLE_GEMFILE: ${{ github.workspace }}/${{ matrix.gemfile }}
     steps:

data/.rubocop.yml

@@ -1,7 +1,7 @@
 require: rubocop-rails
 
 AllCops:
-  TargetRubyVersion: 2.4
+  TargetRubyVersion: 2.7
   NewCops: enable
   SuggestExtensions: false
   Exclude:

data/Appraisals

@@ -1,5 +1,10 @@
 # frozen_string_literal: true
 
+appraise 'rails-81' do
+  gem 'actionpack', '~> 8.1.0'
+  gem 'railties', '~> 8.1.0'
+end
+
 appraise 'rails-80' do
   gem 'actionpack', '~> 8.0.0'
   gem 'railties', '~> 8.0.0'
@@ -19,23 +24,3 @@ appraise 'rails-70' do
   gem 'actionpack', '~> 7.0.0'
   gem 'railties', '~> 7.0.0'
 end
-
-appraise 'rails-61' do
-  gem 'actionpack', '~> 6.1.0'
-  gem 'railties', '~> 6.1.0'
-end
-
-appraise 'rails-60' do
-  gem 'actionpack', '~> 6.0.0'
-  gem 'railties', '~> 6.0.0'
-end
-
-appraise 'rails-52' do
-  gem 'actionpack', '~> 5.2.0'
-  gem 'railties', '~> 5.2.0'
-end
-
-appraise 'rails-51' do
-  gem 'actionpack', '~> 5.1.0'
-  gem 'railties', '~> 5.1.0'
-end

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 # Unreleased
 
+# 0.17.0
+
+- Rails 8.1 support
+- Drop support for rails < 7.0 and ruby < 2.7
+- Update to Bot API 9.6
+
+# 0.16.7
+
+- Update to Bot API 8.2
+
 # 0.16.6
 
 - Fix poller rake task for Rails 8.0

data/bin/fetch-telegram-methods

@@ -41,3 +41,23 @@ puts result_txt
 API_METHODS_FILE = File.expand_path('../lib/telegram/bot/client/api_methods.txt', __dir__).freeze
 File.write(API_METHODS_FILE, result_txt)
 puts '', "Updated #{API_METHODS_FILE}"
+
+puts '', 'Payload types:'
+update_tbody = doc.css('tbody').
+  find { |tbody| tbody.css('td').any? { |td| td.text == 'update_id' } }
+payload_types = update_tbody.css('td:first-child').map(&:text).reject { |x| x == 'update_id' }
+
+result = ['# Generated with bin/fetch-telegram-methods']
+result << "# #{api_version[1]}" if api_version
+result << payload_types.join("\n")
+result << ''
+result_txt = result.join("\n")
+
+puts result_txt
+
+PAYLOAD_TYPES_FILE = File.expand_path(
+  '../lib/telegram/bot/updates_controller/payload_types.txt',
+  __dir__,
+).freeze
+File.write(PAYLOAD_TYPES_FILE, result_txt)
+puts '', "Updated #{PAYLOAD_TYPES_FILE}"

data/gemfiles/{rails_51.gemfile → rails_81.gemfile}

@@ -2,8 +2,8 @@
 
 source "https://rubygems.org"
 
-gem "actionpack", "~> 5.1.0"
-gem "railties", "~> 5.1.0"
+gem "actionpack", "~> 8.1.0"
+gem "railties", "~> 8.1.0"
 
 group :development do
   gem "appraisal", "~> 2.2"

data/lib/telegram/bot/client/api_methods.txt

@@ -1,5 +1,5 @@
 # Generated with bin/fetch-telegram-methods
-# Bot API 8.0
+# Bot API 9.6
 
 getUpdates
 setWebhook
@@ -27,10 +27,13 @@ sendLocation
 sendVenue
 sendContact
 sendPoll
+sendChecklist
 sendDice
+sendMessageDraft
 sendChatAction
 setMessageReaction
 getUserProfilePhotos
+getUserProfileAudios
 setUserEmojiStatus
 getFile
 banChatMember
@@ -38,6 +41,7 @@ unbanChatMember
 restrictChatMember
 promoteChatMember
 setChatAdministratorCustomTitle
+setChatMemberTag
 banChatSenderChat
 unbanChatSenderChat
 setChatPermissions
@@ -79,6 +83,8 @@ unpinAllGeneralForumTopicMessages
 answerCallbackQuery
 getUserChatBoosts
 getBusinessConnection
+getManagedBotToken
+replaceManagedBotToken
 setMyCommands
 deleteMyCommands
 getMyCommands
@@ -88,18 +94,53 @@ setMyDescription
 getMyDescription
 setMyShortDescription
 getMyShortDescription
+setMyProfilePhoto
+removeMyProfilePhoto
 setChatMenuButton
 getChatMenuButton
 setMyDefaultAdministratorRights
 getMyDefaultAdministratorRights
+getAvailableGifts
+sendGift
+giftPremiumSubscription
+verifyUser
+verifyChat
+removeUserVerification
+removeChatVerification
+readBusinessMessage
+deleteBusinessMessages
+setBusinessAccountName
+setBusinessAccountUsername
+setBusinessAccountBio
+setBusinessAccountProfilePhoto
+removeBusinessAccountProfilePhoto
+setBusinessAccountGiftSettings
+getBusinessAccountStarBalance
+transferBusinessAccountStars
+getBusinessAccountGifts
+getUserGifts
+getChatGifts
+convertGiftToStars
+upgradeGift
+transferGift
+postStory
+repostStory
+editStory
+deleteStory
+answerWebAppQuery
+savePreparedInlineMessage
+savePreparedKeyboardButton
 
 editMessageText
 editMessageCaption
 editMessageMedia
 editMessageLiveLocation
 stopMessageLiveLocation
+editMessageChecklist
 editMessageReplyMarkup
 stopPoll
+approveSuggestedPost
+declineSuggestedPost
 deleteMessage
 deleteMessages
 
@@ -119,17 +160,14 @@ setStickerSetTitle
 setStickerSetThumbnail
 setCustomEmojiStickerSetThumbnail
 deleteStickerSet
-getAvailableGifts
-sendGift
 
 answerInlineQuery
-answerWebAppQuery
-savePreparedInlineMessage
 
 sendInvoice
 createInvoiceLink
 answerShippingQuery
 answerPreCheckoutQuery
+getMyStarBalance
 getStarTransactions
 refundStarPayment
 editUserStarSubscription

data/lib/telegram/bot/client/request_body_formatter.rb

@@ -17,10 +17,9 @@ module Telegram
           when 'sendMediaGroup'
             extract_files_from_array!(body, :media)
           when 'editMessageMedia'
-            replace_field(body, :media) do |value|
-              files = {}
-              extract_files_from_hash(value, files).tap { body.merge!(files) }
-            end
+            extract_files_from_field!(body, :media)
+          when 'postStory'
+            extract_files_from_field!(body, :content)
           end
           body.each do |key, val|
             body[key] = val.to_json if val.is_a?(Hash) || val.is_a?(Array)
@@ -29,6 +28,14 @@ module Telegram
 
         private
 
+        # Extracts files from the given field and merges them into the body.
+        def extract_files_from_field!(body, field_name)
+          replace_field(body, field_name) do |value|
+            files = {}
+            extract_files_from_hash(value, files).tap { body.merge!(files) }
+          end
+        end
+
         # Detects field by symbol or string name and replaces it with mapped value.
         def replace_field(hash, field_name)
           field_name = [field_name.to_sym, field_name.to_s].find { |x| hash.key?(x) }

data/lib/telegram/bot/routes_helper.rb

@@ -47,7 +47,7 @@ module Telegram
           as: RoutesHelper.route_name_for_bot(bot),
           format: false,
         }.merge!(options)
-        post(path || "telegram/#{bot.token && RoutesHelper.token_hash(bot.token)}", params)
+        post(path || "telegram/#{bot.token && RoutesHelper.token_hash(bot.token)}", **params)
         UpdatesPoller.add(bot, controller) if Telegram.bot_poller_mode?
       end
     end

data/lib/telegram/bot/rspec/client_matchers.rb

@@ -82,8 +82,8 @@ module Telegram
             expected_number.public_send(expectation_method, matching_requests_count)
           end
 
-          def with(*args, &block)
-            @arg_list_matcher = ArgListMatcher.new(*args, &block)
+          def with(...)
+            @arg_list_matcher = ArgListMatcher.new(...)
             self
           end
 

data/lib/telegram/bot/updates_controller/instrumentation.rb

@@ -8,9 +8,7 @@ module Telegram
       module Instrumentation
         extend ActiveSupport::Concern
 
-        included do
-          config_accessor :logger
-        end
+        include AbstractController::Logger
 
         class << self
           def instrument(action, *args, &block)
@@ -30,11 +28,9 @@ module Telegram
           }
           Instrumentation.instrument(:start_processing, raw_payload.dup)
           Instrumentation.instrument(:process_action, raw_payload) do |payload|
-            begin
-              super
-            ensure
-              append_info_to_payload(payload)
-            end
+            super
+          ensure
+            append_info_to_payload(payload)
           end
         end
 

data/lib/telegram/bot/updates_controller/payload_types.txt

@@ -0,0 +1,26 @@
+# Generated with bin/fetch-telegram-methods
+# Bot API 9.6
+message
+edited_message
+channel_post
+edited_channel_post
+business_connection
+business_message
+edited_business_message
+deleted_business_messages
+message_reaction
+message_reaction_count
+inline_query
+chosen_inline_result
+callback_query
+shipping_query
+pre_checkout_query
+purchased_paid_media
+poll
+poll_answer
+my_chat_member
+chat_member
+chat_join_request
+chat_boost
+removed_chat_boost
+managed_bot

data/lib/telegram/bot/updates_controller/rspec_helpers.rb

@@ -33,7 +33,7 @@ RSpec.shared_context 'telegram/bot/updates_controller' do
   def deep_stringify(input)
     case input
     when Array then input.map(&method(__callee__))
-    when Hash then input.map { |k, v| [k.to_s, deep_stringify(v)] }.to_h
+    when Hash then input.to_h { |k, v| [k.to_s, deep_stringify(v)] }
     else input
     end
   end

data/lib/telegram/bot/updates_controller.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'logger'
 require 'abstract_controller'
 require 'active_support/core_ext/string/inflections'
 require 'active_support/callbacks'
@@ -89,31 +90,13 @@ module Telegram
 
       extend Session::ConfigMethods
 
-      PAYLOAD_TYPES = Set.new(%w[
-        message
-        edited_message
-        channel_post
-        edited_channel_post
-        business_connection
-        business_message
-        edited_business_message
-        deleted_business_messages
-        message_reaction
-        message_reaction_count
-        inline_query
-        chosen_inline_result
-        callback_query
-        shipping_query
-        pre_checkout_query
-        purchased_paid_media
-        poll
-        poll_answer
-        my_chat_member
-        chat_member
-        chat_join_request
-        chat_boost
-        removed_chat_boost
-      ].freeze)
+      PAYLOAD_TYPES_FILE = File.expand_path('updates_controller/payload_types.txt', __dir__)
+      PAYLOAD_TYPES = File.read(PAYLOAD_TYPES_FILE).
+        lines.
+        map(&:strip).
+        reject { |x| x.empty? || x.start_with?('#') }.
+        to_set.
+        freeze
 
       class << self
         # Initialize controller and process update.
@@ -138,12 +121,10 @@ module Telegram
 
         def payload_from_typed_update(update)
           PAYLOAD_TYPES.find do |type|
-            begin
-              item = update[type]
-              return [item, type] if item
-            rescue Exception # rubocop:disable Lint/RescueException
-              # dry-rb raises exception if field is not defined in schema
-            end
+            item = update[type]
+            return [item, type] if item
+          rescue Exception # rubocop:disable Lint/RescueException
+            # dry-rb raises exception if field is not defined in schema
           end
         end
       end

data/lib/telegram/bot/version.rb

@@ -2,7 +2,7 @@
 
 module Telegram
   module Bot
-    VERSION = '0.16.6'
+    VERSION = '0.17.0'
 
     def self.gem_version
       Gem::Version.new VERSION

data/telegram-bot.gemspec

@@ -23,10 +23,10 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.required_ruby_version = '>= 2.4'
+  spec.required_ruby_version = '>= 2.7'
 
-  spec.add_dependency 'actionpack', '>= 4.0', '< 8.1'
-  spec.add_dependency 'activesupport', '>= 4.0', '< 8.1'
+  spec.add_dependency 'actionpack', '>= 7.0', '< 8.2'
+  spec.add_dependency 'activesupport', '>= 7.0', '< 8.2'
   spec.add_dependency 'httpclient', '~> 2.7'
 
   spec.add_development_dependency 'bundler', '> 1.16'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: telegram-bot
 version: !ruby/object:Gem::Version
-  version: 0.16.6
+  version: 0.17.0
 platform: ruby
 authors:
 - Max Melentiev
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-01-03 00:00:00.000000000 Z
+date: 2026-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -16,40 +16,40 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '7.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '8.1'
+        version: '8.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '7.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '8.1'
+        version: '8.2'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '7.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '8.1'
+        version: '8.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '7.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '8.1'
+        version: '8.2'
 - !ruby/object:Gem::Dependency
   name: httpclient
   requirement: !ruby/object:Gem::Requirement
@@ -115,14 +115,11 @@ files:
 - bin/git-hooks/pre-commit
 - bin/install_git_hooks
 - bin/setup
-- gemfiles/rails_51.gemfile
-- gemfiles/rails_52.gemfile
-- gemfiles/rails_60.gemfile
-- gemfiles/rails_61.gemfile
 - gemfiles/rails_70.gemfile
 - gemfiles/rails_71.gemfile
 - gemfiles/rails_72.gemfile
 - gemfiles/rails_80.gemfile
+- gemfiles/rails_81.gemfile
 - lib/tasks/telegram-bot.rake
 - lib/telegram/bot.rb
 - lib/telegram/bot/async.rb
@@ -152,6 +149,7 @@ files:
 - lib/telegram/bot/updates_controller/instrumentation.rb
 - lib/telegram/bot/updates_controller/log_subscriber.rb
 - lib/telegram/bot/updates_controller/message_context.rb
+- lib/telegram/bot/updates_controller/payload_types.txt
 - lib/telegram/bot/updates_controller/reply_helpers.rb
 - lib/telegram/bot/updates_controller/rescue.rb
 - lib/telegram/bot/updates_controller/rspec_helpers.rb
@@ -175,7 +173,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.4'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/gemfiles/rails_52.gemfile

@@ -1,21 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "actionpack", "~> 5.2.0"
-gem "railties", "~> 5.2.0"
-
-group :development do
-  gem "appraisal", "~> 2.2"
-  gem "debug", "~> 1.9.2"
-  gem "sdoc", "~> 2.0.3"
-  gem "telegram-bot-types", "~> 0.6.3"
-  gem "rspec", "~> 3.12.0"
-  gem "rspec-its", "~> 1.3.0"
-  gem "rspec-rails", "~> 4.0.2"
-  gem "rubocop", "~> 1.59.0"
-  gem "rubocop-rails", "~> 2.23.1"
-  gem "coveralls", "~> 0.8.23", require: false
-end
-
-gemspec path: "../"

data/gemfiles/rails_60.gemfile

@@ -1,21 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "actionpack", "~> 6.0.0"
-gem "railties", "~> 6.0.0"
-
-group :development do
-  gem "appraisal", "~> 2.2"
-  gem "debug", "~> 1.9.2"
-  gem "sdoc", "~> 2.0.3"
-  gem "telegram-bot-types", "~> 0.6.3"
-  gem "rspec", "~> 3.12.0"
-  gem "rspec-its", "~> 1.3.0"
-  gem "rspec-rails", "~> 4.0.2"
-  gem "rubocop", "~> 1.59.0"
-  gem "rubocop-rails", "~> 2.23.1"
-  gem "coveralls", "~> 0.8.23", require: false
-end
-
-gemspec path: "../"

data/gemfiles/rails_61.gemfile

@@ -1,21 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "actionpack", "~> 6.1.0"
-gem "railties", "~> 6.1.0"
-
-group :development do
-  gem "appraisal", "~> 2.2"
-  gem "debug", "~> 1.9.2"
-  gem "sdoc", "~> 2.0.3"
-  gem "telegram-bot-types", "~> 0.6.3"
-  gem "rspec", "~> 3.12.0"
-  gem "rspec-its", "~> 1.3.0"
-  gem "rspec-rails", "~> 4.0.2"
-  gem "rubocop", "~> 1.59.0"
-  gem "rubocop-rails", "~> 2.23.1"
-  gem "coveralls", "~> 0.8.23", require: false
-end
-
-gemspec path: "../"