telegram_workflow 1.6.0 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2fd629dee17a8e0caa932b91ad3cdccda3eba9e2cbd33dd15c57f38fcbb9aca7
-  data.tar.gz: e6ae112b2d49d6e9539549254605cc1ee8a5c57ac1421335195b531dd5ebde12
+  metadata.gz: 4e920305a6060ecc2d039a6527387f4f89f02b064278c43c9d3fedc41d1123ae
+  data.tar.gz: fdd2e724083ca50bcfe2c805142da92f5972d9abfff25e5140892aca0d5bdd68
 SHA512:
-  metadata.gz: '058ad9c7866ccd36ae2f5adc9a8c52c51364ecb84e1d0c3f7d39fd514f3868ba50745ff384485ab541988bbb87a1a725691c06d28b28f121cb7dfd36bfb8f3bb'
-  data.tar.gz: a5f3dc285f8fa706be2f9fad08d3cc192e6e90c256204e01befdce1ed547d9400de1a5e132cc750adbf369f18b064e019368df0b352836cc7bb3ecc23fd57b82
+  metadata.gz: 9895a4c27ab3740acdf3efd69c1bf40ee074a387375f0c9f858ff05aa88a0df69c2e8e1046c698cc38936e6fa2995f705377b5933098db9bc7e191c8cf3bfb26
+  data.tar.gz: 0dd8a6b2fe280fa0d1bd556fc39cbe027073da5210c76c3e5d93a91616a6967b41e594383f2edb86eb2bbd6e115e40e8eddf6845dfe2f79f11655277c4b414be

data/.github/workflows/ruby.yml

@@ -8,7 +8,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby-version: ['2.4', '2.5', '2.6', '2.7']
+        ruby-version: ['2.6', '2.7', '3.0', '3.1']
 
     steps:
     - uses: actions/checkout@v2

data/Gemfile

@@ -3,11 +3,10 @@ source "https://rubygems.org"
 # Specify your gem's dependencies in telegram_workflow.gemspec
 gemspec
 
-gem "rake", "~> 12.0"
+gem "rake", "~> 13.0"
 gem "rspec", "~> 3.0"
 
 group :test do
   gem "simplecov"
   gem "simplecov-lcov", "~> 0.8.0"
-  gem "dbm"
 end

data/lib/telegram_workflow/action.rb

@@ -1,6 +1,6 @@
 class TelegramWorkflow::Action
   extend ::Forwardable
-  def_delegators :@__workflow, :client, :params, :redirect_to
+  def_delegators :@__workflow, :client, :params, :logger, :redirect_to
 
   def initialize(workflow, session, flash)
     @__workflow = workflow

data/lib/telegram_workflow/client.rb

@@ -1,5 +1,5 @@
 class TelegramWorkflow::Client
-  API_VERSION = "5.3"
+  API_VERSION = "6.7"
   WebhookConfigPath = Pathname.new("tmp/telegram_workflow/webhook_config.txt")
 
   AVAILABLE_ACTIONS = %i(
@@ -34,6 +34,8 @@ class TelegramWorkflow::Client
     restrictChatMember
     promoteChatMember
     setChatAdministratorCustomTitle
+    banChatSenderChat
+    unbanChatSenderChat
     setChatPermissions
     exportChatInviteLink
     createChatInviteLink
@@ -43,6 +45,10 @@ class TelegramWorkflow::Client
     deleteChatPhoto
     setChatTitle
     setChatDescription
+    setMyDescription
+    getMyDescription
+    setMyShortDescription
+    getMyShortDescription
     pinChatMessage
     unpinChatMessage
     unpinAllChatMessages
@@ -55,9 +61,28 @@ class TelegramWorkflow::Client
     setChatStickerSet
     deleteChatStickerSet
     answerCallbackQuery
+    answerWebAppQuery
     setMyCommands
     deleteMyCommands
     getMyCommands
+    setChatMenuButton
+    getChatMenuButton 
+    setMyDefaultAdministratorRights
+    getMyDefaultAdministratorRights
+    getCustomEmojiStickers
+
+    createForumTopic
+    editForumTopic
+    closeForumTopic
+    reopenForumTopic
+    deleteForumTopic
+    unpinAllForumTopicMessages
+    getForumTopicIconStickers
+    editGeneralForumTopic
+    closeGeneralForumTopic
+    reopenGeneralForumTopic
+    hideGeneralForumTopic
+    unhideGeneralForumTopic
 
     editMessageText
     editMessageCaption
@@ -73,7 +98,7 @@ class TelegramWorkflow::Client
     addStickerToSet
     setStickerPositionInSet
     deleteStickerFromSet
-    setStickerSetThumb
+    setStickerSetThumbnail
 
     answerInlineQuery
 
@@ -101,7 +126,7 @@ class TelegramWorkflow::Client
 
     define_method(method_name) do |params = {}|
       if deprecated_in_favor_of = DEPRECATED_ACTIONS[action]
-        TelegramWorkflow.config.logger.warn "[TelegramWorkflow] #{action} action is deprecated. Use #{deprecated_in_favor_of} action instead."
+        TelegramWorkflow.config.logger.warn "#{action} action is deprecated. Use #{deprecated_in_favor_of} action instead."
       end
 
       @inline ?
@@ -129,12 +154,12 @@ class TelegramWorkflow::Client
   end
 
   def __setup_webhook(webhook_url = TelegramWorkflow.config.webhook_url, params = {})
-    TelegramWorkflow.config.logger.info "[TelegramWorkflow] Checking webhook setup..."
+    TelegramWorkflow.config.logger.info "Checking webhook setup..."
 
     webhook_params = { url: webhook_url, allowed_updates: [], **params }
 
     if cached_webhook_config != webhook_params
-      TelegramWorkflow.config.logger.info "[TelegramWorkflow] Setting up a new webhook..."
+      TelegramWorkflow.config.logger.info "Setting up a new webhook..."
       set_webhook(webhook_params)
     end
   end

data/lib/telegram_workflow/config.rb

@@ -39,6 +39,10 @@ module TelegramWorkflow
       end
     end
 
+    def tagged_logger?
+      @tagged_logger ||= @logger.respond_to?(:tagged)
+    end
+
     def verify!
       blank_params = REQUIRED_PARAMS.select { |p| send(p).nil? }
 

data/lib/telegram_workflow/params.rb

@@ -16,7 +16,10 @@ class TelegramWorkflow::Params
       @params.dig("shipping_query", "from") ||
       @params.dig("inline_query", "from") ||
       @params.dig("chosen_inline_result", "from") ||
-      @params.dig("poll_answer", "user")
+      @params.dig("poll_answer", "user") ||
+      @params.dig("chat_join_request", "from") ||
+      @params.dig("chat_member", "from") ||
+      @params.dig("my_chat_member", "from")
   end
 
   def language_code
@@ -32,11 +35,15 @@ class TelegramWorkflow::Params
   end
 
   def chat_id
-    @params.dig("message", "chat", "id") ||
-      @params.dig("callback_query", "message", "chat", "id") ||
-      @params.dig("edited_message", "chat", "id") ||
-      @params.dig("channel_post", "chat", "id") ||
-      @params.dig("edited_channel_post", "chat", "id")
+    chat&.dig("id")
+  end
+
+  def chat
+    @params.dig("message", "chat") ||
+      @params.dig("callback_query", "message", "chat") ||
+      @params.dig("edited_message", "chat") ||
+      @params.dig("channel_post", "chat") ||
+      @params.dig("edited_channel_post", "chat")
   end
 
   def message

data/lib/telegram_workflow/version.rb

@@ -1,3 +1,3 @@
 module TelegramWorkflow
-  VERSION = "1.6.0"
+  VERSION = "1.8.0"
 end

data/lib/telegram_workflow/workflow.rb

@@ -1,10 +1,14 @@
+require "securerandom"
+
 class TelegramWorkflow::Workflow
-  attr_reader :params, :client
+  attr_reader :params, :client, :logger
 
   def initialize(raw_params)
     @params  = TelegramWorkflow::Params.new(raw_params)
     @session = TelegramWorkflow::Session.new(@params)
+
     @logger = TelegramWorkflow.config.logger
+    @logger = @logger.tagged(SecureRandom.hex(8)) if TelegramWorkflow.config.tagged_logger?
 
     if @params.start?
       set_current_action(TelegramWorkflow.config.start_action)
@@ -23,7 +27,7 @@ class TelegramWorkflow::Workflow
       current_action.public_send(current_step) # setup callbacks
       current_action.__run_on_message # run a callback
     else
-      @logger.info "[TelegramWorkflow] Processing by shared handler"
+      @logger.info "Processing by shared handler"
     end
 
     while @redirect_to
@@ -47,10 +51,10 @@ class TelegramWorkflow::Workflow
   private
 
   def log_request
-    @logger.info "[TelegramWorkflow] Processing by #{current_action.class.name}##{current_step}"
+    @logger.info "Processing by #{current_action.class.name}##{current_step}"
 
     if TelegramWorkflow.config.webhook_url.nil?
-      @logger.info "[TelegramWorkflow] Parameters: #{@params.to_h}"
+      @logger.info "Parameters: #{@params.to_h}"
     end
   end
 

data/lib/telegram_workflow.rb

@@ -35,7 +35,6 @@ require "telegram_workflow/updates"
 require "telegram_workflow/workflow"
 require "telegram_workflow/input_file"
 require "telegram_workflow/stores/in_memory"
-require "telegram_workflow/stores/file"
 
 TelegramWorkflow.__after_configuration do |config|
   if config.webhook_url

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: telegram_workflow
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.8.0
 platform: ruby
 authors:
 - Roman Samoilov
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-07-18 00:00:00.000000000 Z
+date: 2023-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http
@@ -91,7 +91,6 @@ files:
 - lib/telegram_workflow/params.rb
 - lib/telegram_workflow/rspec.rb
 - lib/telegram_workflow/session.rb
-- lib/telegram_workflow/stores/file.rb
 - lib/telegram_workflow/stores/in_memory.rb
 - lib/telegram_workflow/updates.rb
 - lib/telegram_workflow/version.rb
@@ -118,7 +117,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: A simple library to create Telegram Bots in Ruby.

data/lib/telegram_workflow/stores/file.rb

@@ -1,18 +0,0 @@
-require "dbm"
-
-class TelegramWorkflow::Stores::File
-  StorePath = Pathname.new("tmp/telegram_workflow/file_store")
-
-  def initialize
-    StorePath.dirname.mkpath unless StorePath.exist?
-    @store = DBM.open(StorePath.to_s)
-  end
-
-  def read(key)
-    @store[key.to_s]
-  end
-
-  def write(key, value)
-    @store[key.to_s] = value
-  end
-end