max_bot_api 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3513bab6b7e83202a50274c5eba30655b5825bc56a5a6e26de78eae549e0e38f
-  data.tar.gz: 0f97c303649e2c8db1d54f64af70fffc99a030ab95866d089094cff533a4e98c
+  metadata.gz: fb9285c20da62a0c1fba896afde6af5fd10dff12079de7d44878f3cd4b3aea22
+  data.tar.gz: 11d42f73535db90bcbc32b89fa9886cc96d99222cca56e15ba3fb50eb4132ce8
 SHA512:
-  metadata.gz: 0d9ee73288cf706f2ba868e82bab3456bc6f7857d8b1a46cc8cf6fa273d2d0d4e800c93f62bce64f6bb822231385c4166d160fb6c13300649a1dcd18cf80a217
-  data.tar.gz: e4f90c9ccbc8ddaf116922c1dc3f6b7c83e4d261e20237e83b3d593703fd709898aa2ae201bfced427279c3b3378c318635e0fcbdf2c0b9721448f25a51962ed
+  metadata.gz: b10c0eb6c1bef5eedc551fc841cb65d43b65d4d43c28941cbbdf8bb85e0245b251b512b4a9b9f476ca859a189c1967e0ac81f9b09b225569bb66afffb70cfd02
+  data.tar.gz: 148837674accefde112f9e8195440bce6a7c6a9abd5b8243c87c076b6af72c9b1f148fe66a24104d0ecc3ac82e94011f8841ba3db900842dd8d58f183e895286

data/README.md

@@ -44,7 +44,7 @@ client.messages.send(
 ```ruby
 client = MaxBotApi::Client.new(
   token: ENV.fetch("TOKEN"),
-  base_url: "https://botapi.max.ru/",
+  base_url: "https://platform-api.max.ru/",
   version: "1.2.5"
 )
 ```
@@ -54,6 +54,28 @@ Notes:
 - The client uses `Authorization: <token>` (no `Bearer`).
 - Every request includes `v=<version>` query param.
 
+## 0.2.0 updates
+
+- Default API host is now `https://platform-api.max.ru/` (override with `base_url:` if you need the legacy host).
+- Message send/edit retries automatically when the API responds with `attachment.not.ready`.
+- New helpers: `MessageBuilder#add_photo_by_token`, `KeyboardRowBuilder#add_message`.
+
+Example:
+
+```ruby
+message = MaxBotApi::Builders::MessageBuilder.new
+  .set_chat(12345)
+  .set_text("Hello")
+  .add_photo_by_token("photo-token")
+
+keyboard = MaxBotApi::Builders::KeyboardBuilder.new
+row = keyboard.add_row
+row.add_message("Continue")
+
+message.add_keyboard(keyboard)
+client.messages.send(message)
+```
+
 ## Common tasks
 
 ### Send messages

data/docs/01-your-first-bot.md

@@ -38,7 +38,9 @@ client.messages.send(message)
 ```ruby
 client = MaxBotApi::Client.new(
   token: ENV.fetch("TOKEN"),
-  base_url: "https://botapi.max.ru/",
+  base_url: "https://platform-api.max.ru/",
   version: "1.2.5"
 )
 ```
+
+Note: if you still use the legacy host, set `base_url: "https://botapi.max.ru/"`.

data/docs/03-attachments.md

@@ -47,3 +47,13 @@ message = MaxBotApi::Builders::MessageBuilder.new
 
 client.messages.send(message)
 ```
+
+You can also attach a photo directly by token:
+
+```ruby
+message = MaxBotApi::Builders::MessageBuilder.new
+  .set_chat(12345)
+  .add_photo_by_token("photo-token")
+
+client.messages.send(message)
+```

data/docs/04-keyboard.md

@@ -18,6 +18,7 @@ keyboard
 keyboard
   .add_row
   .add_callback("Picture", "positive", "picture")
+  .add_message("Continue")
 
 message = MaxBotApi::Builders::MessageBuilder.new
   .set_chat(12345)
@@ -34,3 +35,4 @@ client.messages.send(message)
 - `add_contact(text)`
 - `add_geolocation(text, quick)`
 - `add_open_app(text, app, payload, contact_id)`
+- `add_message(text)`

data/examples/attachments.rb

@@ -5,11 +5,17 @@ require 'max_bot_api'
 client = MaxBotApi::Client.new(token: ENV.fetch('TOKEN'))
 chat_id = ENV.fetch('CHAT_ID').to_i
 
-photo = client.uploads.upload_photo_from_file(path: './image.png')
+photo_token = ENV['PHOTO_TOKEN']
 
 message = MaxBotApi::Builders::MessageBuilder.new
                                              .set_chat(chat_id)
-                                             .add_photo(photo)
                                              .set_text('Photo attached')
 
+if photo_token && !photo_token.empty?
+  message.add_photo_by_token(photo_token)
+else
+  photo = client.uploads.upload_photo_from_file(path: './image.png')
+  message.add_photo(photo)
+end
+
 client.messages.send(message)

data/examples/keyboard.rb

@@ -15,6 +15,7 @@ keyboard
   .add_row
   .add_link('Open MAX', 'positive', 'https://max.ru')
   .add_callback('Audio', 'negative', 'audio')
+  .add_message('Continue')
 
 message = MaxBotApi::Builders::MessageBuilder.new
                                              .set_chat(chat_id)

data/lib/max_bot_api/builders/keyboard_builder.rb

@@ -85,6 +85,15 @@ module MaxBotApi
         add_button(button)
       end
 
+      # Add a message button.
+      def add_message(text)
+        button = {
+          type: 'message',
+          text: text
+        }
+        add_button(button)
+      end
+
       # Build row payload.
       def build
         @cols

data/lib/max_bot_api/builders/message_builder.rb

@@ -4,6 +4,9 @@ module MaxBotApi
   module Builders
     # Builder for message payloads.
     class MessageBuilder
+      FORMAT_HTML = 'html'
+      FORMAT_MARKDOWN = 'markdown'
+
       attr_reader :user_id, :chat_id, :reset
 
       # Create a builder from an existing hash payload.
@@ -106,6 +109,11 @@ module MaxBotApi
         add_attachment(type: 'image', payload: { photos: payload[:photos] || payload['photos'] })
       end
 
+      # Attach a photo payload by token.
+      def add_photo_by_token(token)
+        add_attachment(type: 'image', payload: { token: token })
+      end
+
       # Attach audio payload.
       def add_audio(uploaded_info)
         add_attachment(type: 'audio', payload: uploaded_info)

data/lib/max_bot_api/client.rb

@@ -6,7 +6,7 @@ module MaxBotApi
   # Main API client. Holds auth config and provides resource accessors.
   class Client
     # Default API base URL.
-    DEFAULT_BASE_URL = 'https://botapi.max.ru/'
+    DEFAULT_BASE_URL = 'https://platform-api.max.ru/'
     # Default API version appended as query param.
     DEFAULT_VERSION = '1.2.5'
     # Default pause between update polling loops.
@@ -195,8 +195,8 @@ module MaxBotApi
     def handle_response(response)
       return parse_body(response) if response.status == 200
 
-      api_message = parse_error_message(response)
-      raise ApiError.new(code: response.status, message: api_message)
+      error_payload = parse_error_payload(response)
+      raise ApiError.new(code: response.status, message: error_payload[:message], details: error_payload[:details])
     end
 
     def parse_body(response)
@@ -209,17 +209,20 @@ module MaxBotApi
       JSON.parse(body, symbolize_names: true)
     end
 
-    def parse_error_message(response)
+    def parse_error_payload(response)
       body = response.body.to_s
-      return response.reason_phrase.to_s if body.empty?
+      return { message: response.reason_phrase.to_s, details: nil } if body.empty?
 
       json = JSON.parse(body)
-      return json['error'] if json.is_a?(Hash) && json['error']
-      return json['message'] if json.is_a?(Hash) && json['message']
+      if json.is_a?(Hash)
+        return { message: json['code'], details: json['message'] } if json['code'] && json['message']
+        return { message: json['error'], details: json['details'] || json['message'] } if json['error']
+        return { message: json['message'], details: json['details'] } if json['message']
+      end
 
-      response.reason_phrase.to_s
+      { message: response.reason_phrase.to_s, details: nil }
     rescue JSON::ParserError
-      response.reason_phrase.to_s
+      { message: response.reason_phrase.to_s, details: nil }
     end
   end
 end

data/lib/max_bot_api/errors.rb

@@ -27,6 +27,10 @@ module MaxBotApi
       other.is_a?(ApiError) && other.code == code
     end
 
+    def attachment_not_ready?
+      message == 'attachment.not.ready'
+    end
+
     private
 
     def build_message

data/lib/max_bot_api/resources/messages.rb

@@ -14,9 +14,11 @@ module MaxBotApi
       def get_messages(chat_id: nil, message_ids: nil, from: nil, to: nil, count: nil)
         query = {}
         query['chat_id'] = chat_id if chat_id && chat_id.to_i != 0
-        Array(message_ids).each do |mid|
-          query['message_ids'] ||= []
-          query['message_ids'] << mid
+        query['message_ids'] = Array(message_ids).join(',') if message_ids && !Array(message_ids).empty?
+        if from && to
+          from_i = from.to_i
+          to_i = to.to_i
+          from, to = to, from if from_i > to_i
         end
         query['from'] = from if from && from.to_i != 0
         query['to'] = to if to && to.to_i != 0
@@ -36,11 +38,13 @@ module MaxBotApi
       # @param message_id [String]
       # @param message [MaxBotApi::Builders::MessageBuilder, Hash]
       def edit_message(message_id:, message:)
-        body = message_payload(message)
-        result = @client.request(:put, 'messages', query: { 'message_id' => message_id }, body: body)
-        return true if result.is_a?(Hash) && result[:success]
+        with_attachment_retry do
+          body = message_payload(message)
+          result = @client.request(:put, 'messages', query: { 'message_id' => message_id }, body: body)
+          return true if result.is_a?(Hash) && result[:success]
 
-        raise Error, (result[:message] || 'message update failed')
+          raise Error, (result[:message] || 'message update failed')
+        end
       end
 
       # Delete a message by ID.
@@ -64,13 +68,13 @@ module MaxBotApi
       # Send a message builder without returning the created message.
       # @param message [MaxBotApi::Builders::MessageBuilder, Hash]
       def send(message)
-        send_message(message, with_result: false)
+        with_attachment_retry { send_message(message, with_result: false) }
       end
 
       # Send a message builder and return the created message hash.
       # @param message [MaxBotApi::Builders::MessageBuilder, Hash]
       def send_with_result(message)
-        send_message(message, with_result: true)
+        with_attachment_retry { send_message(message, with_result: true) }
       end
 
       # Check if a message can be sent to the provided phone numbers.
@@ -133,6 +137,19 @@ module MaxBotApi
                      end
         end
       end
+
+      def with_attachment_retry
+        attempts = 0
+        begin
+          yield
+        rescue ApiError => e
+          attempts += 1
+          raise e unless e.attachment_not_ready? && attempts < Client::MAX_RETRIES
+
+          sleep(2**(attempts - 1))
+          retry
+        end
+      end
     end
   end
 end

data/lib/max_bot_api/resources/uploads.rb

@@ -32,8 +32,12 @@ module MaxBotApi
       # @param url [String]
       def upload_media_from_url(type:, url:)
         response = Faraday.get(url.to_s)
+        raise Error, "fetch URL failed: HTTP #{response.status}" unless response.status.between?(200, 299)
+
         name = attachment_name(response.headers)
         upload_media_from_reader_with_name(type: type, io: StringIO.new(response.body), name: name)
+      rescue Faraday::Error => e
+        raise NetworkError.new(op: 'GET upload source', original_error: e)
       end
 
       # Upload media from an IO object.
@@ -89,20 +93,48 @@ module MaxBotApi
         upload_type = UPLOAD_TYPES.fetch(type.to_sym) { type.to_s }
         endpoint = @client.request(:post, 'uploads', query: { 'type' => upload_type })
 
-        file_name = name.to_s.empty? ? 'file' : name.to_s
+        file_name = name.to_s.empty? ? 'file' : File.basename(name.to_s)
         file_part = Faraday::Multipart::FilePart.new(io, nil, file_name)
 
         response = Faraday.post(endpoint[:url]) do |req|
           req.body = { 'data' => file_part }
         end
 
-        raise Error, "upload failed: #{response.status}" unless response.status == 200
+        raise upload_api_error(response) unless response.status.between?(200, 299)
+
+        return { token: endpoint[:token] } if %w[audio video].include?(upload_type) && endpoint[:token]
 
         JSON.parse(response.body, symbolize_names: true)
       rescue Faraday::Error => e
         raise NetworkError.new(op: 'POST uploads', original_error: e)
       end
 
+      def upload_api_error(response)
+        body = response.body.to_s
+        return Error.new("upload failed: HTTP #{response.status}") if body.empty?
+
+        json = begin
+          JSON.parse(body)
+        rescue StandardError
+          nil
+        end
+        if json.is_a?(Hash)
+          if json['code'] && json['message']
+            return ApiError.new(code: response.status, message: json['code'], details: json['message'])
+          end
+
+          if json['error']
+            return ApiError.new(code: response.status, message: json['error'],
+                                details: json['details'] || json['message'])
+          end
+          if json['message']
+            return ApiError.new(code: response.status, message: json['message'], details: json['details'])
+          end
+        end
+
+        Error.new("upload failed: HTTP #{response.status}")
+      end
+
       def attachment_name(headers)
         disposition = headers['content-disposition'].to_s
         return '' if disposition.empty?

data/lib/max_bot_api/version.rb

@@ -2,5 +2,5 @@
 
 module MaxBotApi
   # Gem version.
-  VERSION = '0.1.0'
+  VERSION = '0.2.0'
 end

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: max_bot_api
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - ChatGPT Codex
 - Dmitry Merkushin
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 1980-01-02 00:00:00.000000000 Z
+date: 2026-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: base64
@@ -120,6 +121,7 @@ licenses:
 metadata:
   homepage_uri: https://github.com/creogen/max_bot_api
   source_code_uri: https://github.com/creogen/max_bot_api/tree/main
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -134,7 +136,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.7.2
+rubygems_version: 3.4.10
+signing_key: 
 specification_version: 4
 summary: Ruby client for MAX Bot API
 test_files: []