telegem 3.2.4 → 3.3.1

data/lib/core/bot.rb

@@ -1,5 +1,6 @@
+#frozen_string_literal: true
 require 'json'
-
+require 'async'
 module Telegem
   module Core
     class Bot
@@ -135,21 +136,29 @@ module Telegem
       end 
       
       def set_my_profile_photo(photo, **options)
-        @api.call('setMyProfilePhoto', { photo: photo }.merge(options))
-      end
+        @api.call('setMyProfilePhoto', {
+          photo: photo
+      }.merge(options))
+    end 
 
-      def remove_my_profile_photo
-        @api.call('removeMyProfilePhoto', {})
-      end
+    def remove_my_profile_photo
+      @api.call('removeMyProfilePhoto', {})
+    end 
 
-      def get_user_profile_audios(user_id, **options)
-        result = @api.call('getUserProfileAudios', { user_id: user_id }.merge(options))
-        result ? Types::UserProfileAudios.new(result) : nil
-      end
+    def get_user_profile_audios(user_id, **options)
+      result = @api.call('getUserProfileAudios', {
+        user_id: user_id
+    }.merge(options))
+    return nil unless result && result['audios']
+    Types::UserProfileAudios.new(result)
+    end 
 
-      def create_forum_topic(chat_id, name, **options)
-        @api.call('createForumTopic', { chat_id: chat_id, name: name }.merge(options))
-      end
+    def create_forum_topic(chat_id, name, **options)
+      @api.call('createForumTopic', {
+        chat_id: chat_id,
+        name: name
+    }.merge(options))
+  end 
       def location(&block)
         on(:message, location: true) do |ctx|
           block.call(ctx) 
@@ -230,12 +239,9 @@ module Telegem
             
             if updates && updates.any?
               updates.each do |update_data|
-                Async do
                   update = Types::Update.new(update_data)
                   process_update(update)
                 end
-              end
-              
               @offset = updates.last['update_id'] + 1
               @logger.debug("Updated offset to: #{@offset}")
             end
@@ -385,4 +391,4 @@ module Telegem
       end
     end
   end
-end 
+end

data/lib/core/context.rb

@@ -71,7 +71,7 @@ module Telegem
       end 
 
       def caption_entities
-        message&caption_entities || []
+        message&.caption_entities || []
       end 
       
       def caption 
@@ -401,9 +401,6 @@ module Telegem
       def uploading_document(**options)
         send_chat_action('upload_document', **options)
       end
-      def scene 
-        session[:telegem_scene]&.[](:id)
-      end 
       def ask(question, **options)
         scene_data = session[:telegem_scene]
         if scene_data
@@ -439,10 +436,15 @@ module Telegem
         scene&.next_step(self, step_name) 
        end 
       def with_typing(&block)
-        typing_request = typing
-        
+        thread = Thread.new do 
+          while @typing_active
+            typing
+            sleep 5
+          end 
+        end 
         result = block.call
-        
+        @typing_active = false
+        thread.join
         result
       end
       

data/lib/core/rate_limit.rb

@@ -64,36 +64,22 @@ module Telegem
     
     def increment_counters(ctx)
       now = Time.now.to_i
-      
-      
       if @options[:global]
         key = "global"
-        cleanup_counter(:global, key, now)
         @counters[:global].increment(key, 1, ttl: @options[:global][:per])
       end
-      
-      
       if @options[:user] && ctx.from&.id
         key = "user:#{ctx.from.id}"
-        cleanup_counter(:user, key, now)
         @counters[:user].increment(key, 1, ttl: @options[:user][:per])
       end
       
       
       if @options[:chat] && ctx.chat&.id
         key = "chat:#{ctx.chat.id}"
-        cleanup_counter(:chat, key, now)
         @counters[:chat].increment(key, 1, ttl: @options[:chat][:per])
       end
     end
-    
-    def cleanup_counter(type, key, now)
-      expires = @counters[type].get_ttl(key) || now
-      @counters[type].delete(key) if now > expires 
-    end
-    
     def rate_limit_response(ctx)
-      
       ctx.reply("⏳ Please wait a moment before sending another request.") rescue nil
       nil
     end

data/lib/core/scene.rb

@@ -124,7 +124,7 @@ module Telegem
       def process_response(ctx, scene_data)
 
         current_step_name = scene_data[:step]
-        scene_data[:data][current_step_name] = ctx.message.text
+        scene_data[:data][current_step_name] = ctx.message
         
   
         scene_data[:waiting_for_response] = false

data/lib/markup/inline.rb

@@ -0,0 +1,104 @@
+module Telegem
+  module Markup
+
+    module InlineButtons
+      def callback(text, data, style: nil, icon_custom_emoji_id: nil)
+       {
+        text: text,
+        callback_data: data,
+        style: style,
+        icon_custom_emoji_id: icon_custom_emoji_id
+      }.compact
+    end 
+    def url(text, url, style: nil, icon_custom_emoji_id: nil)
+      {
+        text: text,
+        url: url,
+        style: style,
+        icon_custom_emoji_id: icon_custom_emoji_id
+      }.compact
+    end
+    def switch_inline(text, query: nil, style: nil, icon_custom_emoji_id: nil)
+      {
+        text: text,
+        switch_inline_query: query,
+        style: style,
+        icon_custom_emoji_id: icon_custom_emoji_id
+      }.compact
+    end
+    def switch_inline_current_chat(text, query: nil, style: nil, icon_custom_emoji_id: nil)
+      {
+        text: text,
+        switch_inline_query_current_chat: query,
+        style: style,
+        icon_custom_emoji_id: icon_custom_emoji_id
+      }.compact
+    end
+    def callback_game(text, game_short_name, style: nil, icon_custom_emoji_id: nil)
+      {
+        text: text,
+        callback_game: { short_name: game_short_name },
+        style: style,
+        icon_custom_emoji_id: icon_custom_emoji_id
+      }.compact
+    end
+    def pay(text, style: nil, icon_custom_emoji_id: nil)
+      {
+        text: text,
+        pay: true,
+        style: style,
+        icon_custom_emoji_id: icon_custom_emoji_id
+      }.compact
+    end
+    def web_app(text, url: nil, style: nil, icon_custom_emoji_id: nil)
+      {
+        text: text,
+        web_app: { url: url },
+        style: style,
+        icon_custom_emoji_id: icon_custom_emoji_id
+      }.compact
+    end
+    def login(text, url, style: nil, icon_custom_emoji_id: nil, **options)
+      login_url = { url: url}.merge(options)
+      {
+        text: text,
+        login_url: login_url,
+        style: style,
+        icon_custom_emoji_id: icon_custom_emoji_id
+    }.compact
+  end 
+end
+   class InlineBuilder
+      include InlineButtons
+      def initialize
+        @rows = []
+      end
+      def row(*buttons)
+        @rows << buttons
+        self
+      end
+      def build
+        InlineKeyboard.new(@rows)
+    end
+  end 
+      class InlineKeyboard
+        attr_reader :rows
+        def initialize(rows)
+          @rows = rows
+        end
+        def to_h
+          {
+            inline_keyboard: @rows
+          }
+        end
+        def to_json(*args)
+          to_h.to_json(*args)
+        end
+      end 
+      def self.inline(&block)
+        builder = InlineBuilder.new
+        builder.instance_eval(&block) if block_given?
+        builder.build
+      end
+    end
+  end 

data/lib/markup/keyboard.rb

@@ -1,321 +1,100 @@
 module Telegem
   module Markup
-    class Keyboard
-      attr_reader :buttons, :options
 
-      def initialize(buttons = [], **options)
-        @buttons = buttons
+    module ReplyButtons
+      def text(content, style: nil, icon_custom_emoji_id: nil)
+        {
+          text: content,
+          icon_custom_emoji_id: icon_custom_emoji_id,
+          style: style
+      }.compact
+    end
+    def request_contact(text, style: nil, icon_custom_emoji_id: nil)
+      {
+        text: text,
+        style: style,
+        icon_custom_emoji_id: icon_custom_emoji_id,
+        request_contact: true
+    }.compact
+    end
+    def request_location(text, style: nil, icon_custom_emoji_id:  nil)
+      {
+        text: text,
+        style: style,
+        icon_custom_emoji_id: icon_custom_emoji_id,
+        request_location: true
+    }.compact
+  end 
+  def request_poll(text, poll_type: nil, style: nil, icon_custom_emoji_id: nil)
+    {
+      text: text,
+      style: style,
+      icon_custom_emoji_id: icon_custom_emoji_id,
+      request_poll: poll_type ? { type: poll_type } : {}
+    }.compact
+  end
+  def web_app(text, url: nil, style: nil, icon_custom_emoji_id: nil)
+    {
+      text: text,
+      url: url,
+      style: style,
+      icon_custom_emoji_id: icon_custom_emoji_id
+    }.compact
+  end
+end
+    class ReplyBuilder
+      include ReplyButtons
+      def initialize
+        @rows = []
         @options = {
           resize_keyboard: true,
           one_time_keyboard: false,
           selective: false
-        }.merge(options)
-      end
-
-      def self.[](*rows)
-        new(rows)
-      end
-
-      def self.build(&block)
-        builder = Builder.new
-        builder.instance_eval(&block) if block_given?
-        builder.keyboard
-      end
-
-      def row(*buttons)
-        @buttons << buttons.flatten
-        self
-      end
-
-      def button(text, style: nil, icon_custom_emoji_id: nil, **options)
-        btn = {
-          text: text
-      }.merge(options)
-      btn[:style] = style if style 
-      btn[:icon_custom_emoji_id] = icon_custom_emoji_id if icon_custom_emoji_id
-      if @buttons.empty? || @buttons.last.is_a?(Array)
-        @buttons << [btn]
-      else 
-        @buttons.last << btn
-      end 
-      self 
-    end 
-
-      def request_contact(text)
-        button(text, request_contact: true)
-      end
-
-      def request_location(text)
-        button(text, request_location: true)
-      end
-
-      def request_poll(text, type = nil)
-        opts = type ? { request_poll: { type: type } } : { request_poll: {} }
-        button(text, opts)
-      end
-
-      def resize(resize = true)
-        @options[:resize_keyboard] = resize
-        self
-      end
-
-      def one_time(one_time = true)
-        @options[:one_time_keyboard] = one_time
-        self
-      end
-
-      def selective(selective = true)
-        @options[:selective] = selective
-        self
-      end
-
-      def to_h
-        {
-          keyboard: @buttons.map { |row| row.is_a?(Array) ? row : [row] },
-          **@options
         }
       end
-
-      def to_json(*args)
-        to_h.to_json(*args)
-      end
-
-      def self.remove(selective: false)
-        {
-          remove_keyboard: true,
-          selective: selective
-        }
-      end
-
-      def self.force_reply(selective: false, input_field_placeholder: nil)
-        markup = {
-          force_reply: true,
-          selective: selective
-        }
-        markup[:input_field_placeholder] = input_field_placeholder if input_field_placeholder
-        markup
-      end
-    end
-
-    class InlineKeyboard
-      attr_reader :buttons
-
-      def initialize(buttons = [])
-        @buttons = buttons
-      end
-
-      def self.[](*rows)
-        new(rows)
-      end
-
-      def self.build(&block)
-        builder = InlineBuilder.new
-        builder.instance_eval(&block) if block_given?
-        builder.keyboard
-      end
-
       def row(*buttons)
-        @buttons << buttons.flatten
+        @rows << buttons
         self
       end
-
-     def button(text, style: nil, icon_custom_emoji_id: nil, **options)
-        btn = {
-          text: text
-      }.merge(options)
-      btn[:style] = style if style 
-      btn[:icon_custom_emoji_id] = icon_custom_emoji_id if icon_custom_emoji_id
-      if @buttons.empty? || @buttons.last.is_a?(Array)
-        @buttons << [btn]
-      else 
-        @buttons.last << btn
-      end 
-      self 
-    end 
-
-      def url(text, url)
-        button(text, url: url)
-      end
-
-      def callback(text, data)
-        button(text, callback_data: data)
-      end
-
-      def web_app(text, url)
-        button(text, web_app: { url: url })
-      end
-
-      def login(text, url, **options)
-        button(text, login_url: { url: url, **options })
-      end
-
-      def switch_inline(text, query = "")
-        button(text, switch_inline_query: query)
-      end
-
-      def switch_inline_current(text, query = "")
-        button(text, switch_inline_query_current_chat: query)
-      end
-
-      def pay(text)
-        button(text, pay: true)
-      end
-
-      def to_h
-        clean_rows = @buttons.compact.map do |row| 
-          row = Array(row).compact.select { |btn| is_a?(Hash) }
-          row.empty? ? nil : row 
-        end.compact 
-         { inline_keyboard: clean_rows} 
-      end 
-   
-      def to_json(*args)
-        to_h.to_json(*args)
-      end
-    end
-
-    class Builder
-      attr_reader :keyboard
-
-      def initialize
-        @keyboard = Keyboard.new
-      end
-
-      def row(*buttons, &block)
-        if block_given?
-          sub_builder = Builder.new
-          sub_builder.instance_eval(&block)
-          @keyboard.row(*sub_builder.keyboard.buttons.flatten(1))
-        elsif buttons.any?
-          @keyboard.row(*buttons)
-        else
-          @keyboard.row
-        end
+      def resize(value = true)
+        @options[:resize_keyboard] = value
         self
       end
-
-      def button(text, **options)
-        @keyboard.button(text, **options)
+      def one_time(value = true)
+        @options[:one_time_keyboard] = value
         self
       end
-
-      def request_contact(text)
-        @keyboard.request_contact(text)
+      def selective(value = true)
+        @options[:selective] = value
         self
       end
-
-      def request_location(text)
-        @keyboard.request_location(text)
+      def placeholder(text)
+        @options[:input_field_placeholder] = text
         self
       end
-
-      def request_poll(text, type = nil)
-        @keyboard.request_poll(text, type)
-        self
-      end
-
-      def method_missing(name, *args, &block)
-        if @keyboard && @keyboard.respond_to?(name)
-          @keyboard.send(name, *args, &block)
-        else
-          super
-        end
-      end
-
-      def respond_to_missing?(name, include_private = false)
-        @keyboard && @keyboard.respond_to?(name) || super
-      end
+      def build
+        ReplyKeyboard.new(@rows, @options)
     end
-
-    class InlineBuilder
-      attr_reader :keyboard
-
-      def initialize
-        @keyboard = InlineKeyboard.new
-      end
-
-      def row(*buttons, &block)
-        if block_given?
-          sub_builder = InlineBuilder.new
-          sub_builder.instance_eval(&block)
-          @keyboard.row(*sub_builder.keyboard.buttons.flatten(1))
-        elsif buttons.any?
-          @keyboard.row(*buttons)
-        else
-          @keyboard.row([]) 
+  end 
+      class ReplyKeyboard
+        def initialize(rows, options = {})
+          @rows = rows
+          @options = options
         end
-        self
-      end
-
-      def button(text, **options)
-        @keyboard.button(text, **options)
-        self
-      end
-
-      def url(text, url)
-        @keyboard.url(text, url)
-        self
-      end
-
-      def callback(text, data)
-        @keyboard.callback(text, data)
-        self
-      end
-
-      def web_app(text, url)
-        @keyboard.web_app(text, url)
-        self
-      end
-
-      def login(text, url, **options)
-        @keyboard.login(text, url, **options)
-        self
-      end
-
-      def switch_inline(text, query = "")
-        @keyboard.switch_inline(text, query)
-        self
-      end
-
-      def switch_inline_current(text, query = "")
-        @keyboard.switch_inline_current(text, query)
-        self
-      end
-
-      def pay(text)
-        @keyboard.pay(text)
-        self
-      end
-
-      def method_missing(name, *args, &block)
-        if @keyboard && @keyboard.respond_to?(name)
-          @keyboard.send(name, *args, &block)
-        else
-          super
+        def to_h
+          {
+            keyboard: @rows
+        }.merge(@options)
         end
-      end
-
-      def respond_to_missing?(name, include_private = false)
-        @keyboard && @keyboard.respond_to?(name) || super
-      end
-    end
-
-    class << self
-      def keyboard(&block)
-        Keyboard.build(&block)
-      end
-
-      def inline(&block)
-        InlineKeyboard.build(&block)
-      end
-
-      def remove(**options)
-        Keyboard.remove(**options)
-      end
-
-      def force_reply(**options)
-        Keyboard.force_reply(**options)
-      end
-    end
-  end
-end
+        def to_json(*args)
+          to_h.to_json(*args)
+        end 
+      end 
+      def self.keyboard(&block)
+        builder = ReplyBuilder.new
+        builder.instance_eval(&block) if block_given?
+        builder.build
+      end 
+    end 
+  end 
+    

data/lib/plugins/file_extract.rb

@@ -85,28 +85,8 @@ module Telegem
             success: false,
             error: "Failed to extract PDF: #{e.message}"
           }
-          rescue LoadError
-            {
-              success: false,
-              error: "PDF extraction requires the 'pdf-reader' gem. Please add it to your Gemfile."
-            } 
-            rescue PDF::Reader::MalformedPDFError => e
-              {
-                success: false,
-                error: "Malformed PDF: #{e.message}"
-              } 
-            rescue PDF::Reader::UnsupportedFeatureError => e
-              {
-                success: false,
-                error: "Unsupported PDF feature: #{e.message}"
-              } 
-            rescue PDF::Reader::EncryptedPDFError => e
-              {
-                success: false,
-                error: "Encrypted PDF: #{e.message}"
-              } 
             ensure 
-              cleanup if @options[:auto_delete]   
+              cleanup if @options[:auto_delete]
         end
       end 
       def extract_json
@@ -196,8 +176,8 @@ module Telegem
       def cleanup
         @temp_file.unlink if @temp_file
         @temp_file = nil
-      end
-    end
-  end
+      end 
+    end 
+  end 
 end
 end