rubydium 0.2.4 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ebfa6d1d46ec5b5d046aae44b857f59b405e5ae79af529d695a552090dc07fc0
-  data.tar.gz: 00cd4177e06fb2920a5ff6a1b8c3be332bc57cbf473624020704855df07dec07
+  metadata.gz: a50bfd6f358154dfca5a595b467c9c0604160877dffe0266da927a134a41360f
+  data.tar.gz: 3afaba84242a07fcf5f9c31df0d6eb6927e4f821d7ec4fbcfcdc12d2b0a797c9
 SHA512:
-  metadata.gz: f09704c30374104c0c0cf608ffae1ffad372e2b41317f9a324a6ae1200867393d461fe186ec2f62c5516c38c293ba812ef1016ccf8cab3342a655ca702390358
-  data.tar.gz: 478056c327c16135dd0a546fc88c53dd345ca5db7b30047b673c6765c0f22d07a54f8b877eae86a18dceef5b4de5c55db6ecb9a7a10fa65df05f4956e18c1c4e
+  metadata.gz: 5453bb526aa757ab9011463b620079f17d67269013a347496416e623115122c6e793c2bdfd90a19b2886ecd9ba5c8924418f75341bf828315ef155f86365e179
+  data.tar.gz: a712f2f38cb8f47f428f9837c7283de9168e6875e5a84d584749940ca831e272874dc08b77e6b8dbe61b335ad0cda648d40baf4f8b19ee9f3cbc5dcf40bb3ef8

data/Gemfile

@@ -4,9 +4,9 @@ source "https://rubygems.org"
 
 git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
+gem "async"
 gem "pry"
 gem "rspec"
 gem "rubocop"
 gem "rubocop-rspec"
 gem "telegram-bot-ruby", "~> 1.0.0"
-gem "async"

data/example/example_bot.rb

@@ -29,9 +29,9 @@ class ExampleBot < Rubydium::Bot
 end
 
 ExampleBot.configure do |config|
-  config.token = "1043894792:AAGC_oA2Ztvo5bBZBPxX5_oUxFX-L_obZJI"#"1234567890:long_alphanumeric_string_goes_here"
-  config.bot_username = "bulgakkebot"#"ends_with_bot"
-  config.owner_username = "bulgakke"#"thats_you"
+  config.token = "1043894792:AAGC_oA2Ztvo5bBZBPxX5_oUxFX-L_obZJI" # "1234567890:long_alphanumeric_string_goes_here"
+  config.bot_username = "bulgakkebot" # "ends_with_bot"
+  config.owner_username = "bulgakke" # "thats_you"
   config.privileged_usernames = []
   # %w[
   #   your_friend your_chat_moderator

data/lib/rubydium/bot.rb

@@ -9,8 +9,16 @@ module Rubydium
 
     COMMAND_REGEXP = %r{\A/}
 
+    def self.fetch_and_set_bot_id(client)
+      configure do |config|
+        config.bot_id = client.api.get_me.dig("result", "id") unless config.respond_to? :bot_id
+      end
+    end
+
     def self.run
       Telegram::Bot::Client.run(config.token) do |client|
+        fetch_and_set_bot_id(client)
+
         Async do |task|
           client.listen do |update|
             task.async do
@@ -20,7 +28,7 @@ module Rubydium
               if update.is_a? Telegram::Bot::Types::Message
                 new(client, update).handle_update
               end
-            rescue => e
+            rescue StandardError => e
               puts e.detailed_message, e.backtrace
             end
           end
@@ -39,8 +47,10 @@ module Rubydium
       @text = @msg.text.to_s
       @message_id = @msg.message_id
       @command = get_command(@msg.text)
-      @text_without_command = @text.gsub(@command.to_s, '').gsub(/@#{config.bot_username}\b/, '').strip
-      @text_without_bot_mentions = @text.gsub(/@#{config.bot_username}\b/, '')
+      @text_without_command = @text.gsub(@command.to_s, "").gsub(/@#{config.bot_username}\b/,
+                                                                 "").strip
+      @text_without_bot_mentions = @text.gsub(/@#{config.bot_username}\b/, "")
+      @topic_id = @msg.message_thread_id if @chat.is_forum
     end
 
     def handle_update

data/lib/rubydium/config.rb

@@ -25,7 +25,7 @@ module Rubydium
   # Not necessary for basic functionality, though.
   class Config
     def method_missing(method, ...)
-      if method[-1] == '='
+      if method[-1] == "="
         self.class.attr_accessor method[0..-2]
         public_send(method, ...)
       else

data/lib/rubydium/mixins/message_sending.rb

@@ -4,11 +4,12 @@ module Rubydium
   module Mixins
     # Shorthand methods for sending messages in different ways.
     module MessageSending
-      def send_message(text)
+      def send_message(text, **kwargs)
         @api.send_message(
           chat_id: @chat.id,
-          message_thread_id: @msg.message_thread_id,
-          text: text
+          message_thread_id: @topic_id,
+          text: text,
+          **kwargs
         )
       end
 
@@ -17,7 +18,7 @@ module Rubydium
 
         @api.send_sticker(
           chat_id: @chat.id,
-          message_thread_id: @msg.message_thread_id,
+          message_thread_id: @topic_id,
           sticker: sticker,
           **kwargs
         )
@@ -34,7 +35,7 @@ module Rubydium
         @api.send_chat_action(
           chat_id: @chat.id,
           action: action,
-          message_thread_id: @msg.message_thread_id,
+          message_thread_id: @topic_id,
           **kwargs
         )
       end
@@ -44,7 +45,7 @@ module Rubydium
 
         @api.send_video(
           chat_id: @chat.id,
-          message_thread_id: @msg.message_thread_id,
+          message_thread_id: @topic_id,
           video: video,
           **kwargs
         )
@@ -55,7 +56,7 @@ module Rubydium
 
         @api.send_photo(
           chat_id: @chat.id,
-          message_thread_id: @msg.message_thread_id,
+          message_thread_id: @topic_id,
           photo: photo,
           **kwargs
         )
@@ -64,7 +65,7 @@ module Rubydium
       def reply(text, **args)
         @api.send_message(
           chat_id: @chat.id,
-          message_thread_id: @msg.message_thread_id,
+          message_thread_id: @topic_id,
           reply_to_message_id: @message_id,
           text: text,
           **args
@@ -78,7 +79,7 @@ module Rubydium
       def reply_to_target(text)
         @api.send_message(
           chat_id: @chat.id,
-          message_thread_id: @msg.message_thread_id,
+          message_thread_id: @topic_id,
           reply_to_message_id: @replies_to.message_id,
           text: text
         )

data/lib/rubydium/mixins/other_actions.rb

@@ -0,0 +1,27 @@
+module Rubydium
+  module Mixins
+    module OtherActions
+      def safe_delete(message)
+        return false unless (message = definitely_message(message))
+        return false unless bot_can_delete_messages? || message&.from&.id == config.bot_id
+
+        result = @api.delete_message(chat_id: @chat.id, message_id: message.message_id)
+        result["ok"]
+      rescue Telegram::Bot::Exceptions::ResponseError
+        false
+      end
+
+      def definitely_message(maybe_message)
+        if maybe_message["message_id"]
+          Telegram::Bot::Types::Message.new(maybe_message)
+        elsif maybe_message["result"]["message_id"]
+          Telegram::Bot::Types::Message.new(maybe_message["result"])
+        else
+          nil
+        end
+      rescue StandardError
+        nil
+      end
+    end
+  end
+end

data/lib/rubydium/mixins/rights_checking.rb

@@ -0,0 +1,46 @@
+module Rubydium
+  module Mixins
+    module RightsChecking
+      def user_info(user_id=config.bot_id)
+        @user_info ||= @api.get_chat_member(chat_id: @chat.id, user_id: user_id).dig("result")
+      end
+
+      boolean_permissions = %w[
+        can_be_edited
+        can_manage_chat
+        can_change_info
+        can_delete_messages
+        can_invite_users
+        can_restrict_members
+        can_pin_messages
+        can_manage_topics
+        can_promote_members
+        can_manage_video_chats
+        is_anonymous
+        can_manage_voice_chat
+      ]
+
+      boolean_permissions.each do |permission|
+        define_method "#{permission}?" do |user_id|
+          user_info(user_id).dig(permission)
+        end
+
+        define_method "bot_#{permission}?" do
+          public_send("#{permission}?", config.bot_id)
+        end
+      end
+
+      other_fields = %w[status custom_title]
+
+      other_fields.each do |field|
+        define_method field do |user_id|
+          user_info(user_id).dig(field)
+        end
+
+        define_method "bot_#{field}" do
+          public_send(field, config.bot_id)
+        end
+      end
+    end
+  end
+end

data/lib/rubydium/mixins.rb

@@ -3,6 +3,8 @@
 require_relative "mixins/message_sending"
 require_relative "mixins/command_macros"
 require_relative "mixins/control_flow"
+require_relative "mixins/other_actions"
+require_relative "mixins/rights_checking"
 
 module Rubydium
   module Mixins # :nodoc:
@@ -10,7 +12,9 @@ module Rubydium
       base.include(
         MessageSending,
         CommandMacros,
-        ControlFlow
+        ControlFlow,
+        OtherActions,
+        RightsChecking
       )
     end
   end

data/lib/rubydium/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Rubydium
-  VERSION = "0.2.4"
+  VERSION = "0.3.0"
 end

data/rubydium.gemspec

@@ -34,8 +34,8 @@ Gem::Specification.new do |spec|
   spec.metadata["rubygems_mfa_required"] = "true"
 
   {
-    "telegram-bot-ruby" => ['~> 1.0.0'],
-    "async" => ['~> 2.3']
+    "telegram-bot-ruby" => ["~> 1.0.0"],
+    "async" => ["~> 2.3"]
   }.each do |name, versions|
     spec.add_dependency(name, *versions)
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubydium
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.3.0
 platform: ruby
 authors:
 - bulgakke
@@ -68,6 +68,8 @@ files:
 - lib/rubydium/mixins/command_macros.rb
 - lib/rubydium/mixins/control_flow.rb
 - lib/rubydium/mixins/message_sending.rb
+- lib/rubydium/mixins/other_actions.rb
+- lib/rubydium/mixins/rights_checking.rb
 - lib/rubydium/version.rb
 - rubydium.gemspec
 homepage: https://github.com/bulgakke/rubydium