commandrb 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 837fd9c73dccf6017f686003621c0cb6cc6ee8ef
-  data.tar.gz: 2aafaf2ec44c19c33dd70a0c2ab2757e268bb5de
+  metadata.gz: 1bdd7c0e995d1b0fd6a818164558252a72dd277a
+  data.tar.gz: 7a62a408b7e2f853bce21d3ee5a950afb8fd1713
 SHA512:
-  metadata.gz: 89a2f798a7226f0bd6fc8f746144ba4593cf1a7f4719a89c69cfb2e8f39c6d2ee6f586020d2a6f48c466cb574cc3f746d33da2d83a9375c9500b4fc2e1c74451
-  data.tar.gz: 0ba8d6f38dcc9b23029086f3d7d59140685dd0c06c5b7b3703666709c51530b3984177a9ffd20914763e1ebaf73faeecc4a4ed5c9b576f7d38d0914a1db6db3c
+  metadata.gz: d60c6b925fc8dfb87529e61c2ef215403b0f65a07aa8a3e809050a52727434a77109397bd12cd96b73f39e1f1ac1dd52b495ffba685bdbff2f5aede33fa618fc
+  data.tar.gz: 226676ac73f60169d62f45c53ddbf43e825a1ec75d12b63593a90d1f5c4a5e0b83d58909b81c9776501e5175490fd5a277fc343208d0e6a334e88e30741b6a0c

data/lib/commandrb.rb

@@ -1,19 +1,44 @@
 class CommandrbBot
+
+  # Be able to adjust the config on the fly.
+  attr_accessor :config
+
+  # Needed to run the bot, or create custom events.
+  attr_accessor :bot
+
+  # Can manually manipulate commands using this.
   attr_accessor :commands
+
+  # Lets you change global prefixes while the bot is running (Not recommended!)
   attr_accessor :prefixes
-  attr_accessor :bot
-  attr_accessor :prefix_type
-  attr_accessor :owners
-  attr_accessor :typing_default
+
+
+  def add_command(name, attributes = {})
+    @commands[name.to_sym] = attributes
+  end
+
+  def remove_command(name)
+    begin
+      @commands.delete(name)
+    rescue
+      return false
+    end
+    true
+  end
 
   def initialize(init_hash)
 
+    # Setup the variables for first use.
     @commands = {}
     @prefixes = []
     @config = init_hash
 
-    @config[:prefix_type] = 'rescue' if @config[:prefix_type].nil?
-    @config[:typing_default] =  false if @config[:typing_default].nil?
+    # Load sane defaults for options that aren't specified.
+
+    # @config[:prefix_type] = 'rescue' if @config[:prefix_type].nil?
+    @config[:typing_default] = false if @config[:typing_default].nil?
+    @config[:selfbot] =  false if  @config[:selfbot].nil?
+    @config[:delete_activators] = false if @config[:delete_activators].nil?
 
     if @config[:token].nil? or init_hash[:token] == ''
       puts 'No token supplied in init hash!'
@@ -21,7 +46,7 @@ class CommandrbBot
     end
 
     init_parse_self = init_hash[:parse_self] rescue nil
-    init_type = init_hash[:type] rescue :bot
+    init_type = @config[:type]
 
     if init_type == :bot
       if init_hash[:client_id].nil?
@@ -30,100 +55,147 @@ class CommandrbBot
       end
     end
 
-    @prefixes = []
-
     @config[:owners] = init_hash[:owners]
-    puts 'Invalid owners supplied in init hash!'
 
     @prefixes = init_hash[:prefixes]
-    puts 'Invalid prefixes supplied in init hash!'
 
     @bot = Discordrb::Bot.new(
         token: @config[:token],
         client_id: @config[:client_id],
         parse_self: init_parse_self,
-        type: init_type
+        type: @config[:type]
     )
 
     unless init_hash[:ready].nil?
       @bot.ready do |event|
+        event.bot.game = @config[:game] unless config[:game].nil?
         init_hash[:ready].call(event)
       end
     end
 
-    def add_command(name, attributes = {})
-      @commands[name.to_sym] = attributes
-    end
 
     # Command processing
     @bot.message do |event|
+      @command = nil
+      @event = nil
+      @chosen = nil
+      @args = nil
+      @rawargs = nil
       @continue = false
       @prefixes.each { |prefix|
         if event.message.content.start_with?(prefix)
 
           @commands.each { | key, command |
-            if command[:triggers].nil?
-              triggers = [key.to_s]
-            else
-              triggers = command[:triggers]
-            end
+            triggers =  command[:triggers].nil? ? [key.to_s] : command[:triggers]
 
             triggers.each { |trigger|
-              @activator = prefix + trigger
-              if event.message.content.start_with?(@activator)
-                puts '@activator picked.'
-                @continue = true
-                break
-              else
-                next
+              @activator = prefix + trigger.to_s
+              @activator = @activator.downcase
+              if event.message.content.downcase.start_with?(@activator)
+
+                # Continue only if you've already chosen a choice.
+                unless @chosen.nil?
+                  # If the new activator begins with the chosen one, then override it.
+                  # Example: sh is chosen, shell is the new one.
+                  # In this example, shell would override sh, preventing ugly bugs.
+                  if @activator.start_with?(@chosen)
+                    @chosen = @activator
+                  # Otherwhise, just give up.
+                  else
+                    next
+                  end
+                # If you haven't chosen yet, get choosing!
+                else
+                    @continue = true
+                    @chosen = @activator
+                end
               end
             }
 
             next unless @continue
 
+            break if @config[:selfbot] && event.user.id != @bot.profile.id
+
             # Command flag defaults
             command[:catch_errors] = @config[:catch_errors] if command[:catch_errors].nil?
             command[:owners_only] = false if command[:owners_only].nil?
             command[:max_args] = 2000 if command[:max_args].nil?
             command[:server_only] = false if command[:server_only].nil?
             command[:typing] = @config[:typing_default] if command[:typing_default].nil?
+            command[:delete_activator] = @config[:delete_activators] if command[:delete_activator].nil?
 
+            # If the command is set to owners only and the user is not the owner, show error and abort.
             if command[:owners_only]
-              unless YuukiBot.config['owners'].include?(event.user.id)
+              unless @config[:owners].include?(event.user.id)
                 event.respond('❌ You don\'t have permission for that!')
-                break
+                next
               end
             end
 
+            # If the settings are to delete activating messages, then do that.
+            # I'm *hoping* this doesn't cause issues with argument extraction.
+            event.message.delete if command[:delete_activator]
+
+            # If the command is only for use in servers, display error and abort.
             if command[:server_only] && event.channel.private?
-              event.respond('❌ This command will only work in servers!')
+              # For selfbots, a fancy embed will be used. WIP.
+              if @config[:selfbot]
+                event.channel.send_embed do |embed|
+                  embed.colour = 0x221461
+                  embed.title = '❌ An error has occured!'
+                  embed.description = 'This command can only be used in servers!'
+                  embed.footer = Discordrb::Webhooks::EmbedFooter.new(text: "Command: '#{event.message.content}'")
+                end
+              else
+                # If its not a selfbot, an ordinary message will be shown, may be changed to embed later.
+                event.respond('❌ This command will only work in servers!')
+              end
+              # Abort!
               next
             end
 
+            # If the user is a bot and the command is set to not pass bots OR the user is a bot and the global config is to not parse bots...
+            # ...then abort :3
             if (event.user.bot_account? && command[:parse_bots] == false) || (event.user.bot_account? && @config[:parse_bots] == false)
+              # Abort!
               next
             end
 
+            # If the config is setup to show typing messages, then do so.
             event.channel.start_typing if command[:typing]
 
+            # Grabs the arguments from the command message without the command part.
             args = event.message.content.slice!(@activator.length, event.message.content.size)
-            args = args.split(' ')
+            # Split the arguments into an array for easy usage.
+            rawargs = args
+            args = args.split(/ /)
 
+            # Check the number of args for the command.
             if args.length > command[:max_args]
+              # May be replaced with an embed.
               event.respond("❌ Too many arguments! \nMax arguments: `#{command[:max_args]}`")
               next
             end
-            if !command[:catch_errors] || @config['catch_errors']
-              command[:code].call(event, args)
-            else
-              begin
-                command[:code].call(event, args)
-              rescue Exception => e
-                event.respond("❌ An error has occured!! ```ruby\n#{e}```Please contact the bot owner with the above message for assistance.")
-              end
-            end
+
+            # All done here.
+            @command = command
+            @event = event
+            @args = args
+            @rawargs = rawargs
             break
           }
+          # If the command is configured to catch all errors, thy shall be done.
+          if !@command[:catch_errors] || @config['catch_errors']
+            # Run the command code!
+            @command[:code].call(@event, @args, @rawargs)
+          else
+            # Run the command code, but catch all errors and output accordingly.
+            begin
+              @command[:code].call(@event, @args, @rawargs)
+            rescue Exception => e
+              event.respond("❌ An error has occured!! ```ruby\n#{e}```Please contact the bot owner with the above message for assistance.")
+            end
+          end
           break
         end
       }

metadata

@@ -1,29 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: commandrb
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - Seriel Shirogane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-18 00:00:00.000000000 Z
+date: 2017-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: discordrb
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.1.0
 description: A customisable and easy to use Commands System for Discordrb.
 email: seriel@fl0.co
 executables: []
@@ -51,7 +57,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Commandrb