commandrb 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1bdd7c0e995d1b0fd6a818164558252a72dd277a
-  data.tar.gz: 7a62a408b7e2f853bce21d3ee5a950afb8fd1713
+  metadata.gz: 8e157c31805af8a1a19398b332dd1e711acc6086
+  data.tar.gz: d9811c8a83caac8570795fb1e4525d2585dd72cf
 SHA512:
-  metadata.gz: d60c6b925fc8dfb87529e61c2ef215403b0f65a07aa8a3e809050a52727434a77109397bd12cd96b73f39e1f1ac1dd52b495ffba685bdbff2f5aede33fa618fc
-  data.tar.gz: 226676ac73f60169d62f45c53ddbf43e825a1ec75d12b63593a90d1f5c4a5e0b83d58909b81c9776501e5175490fd5a277fc343208d0e6a334e88e30741b6a0c
+  metadata.gz: d4f15b5e1e82bb14df045c85e207737c29a4b43fa44fbfcbd15d4d8b877dafdb7ef52dac2a0b45efdb422e55f8cd6d323de35617917743e41ccceee0ea1eac01
+  data.tar.gz: 9acb080178dd98a8c15eacdd1673fefc9006be37db103e574cf481a5dea5bffe0e0ff3f63b25ccfde97ff70129f497ed0aa5edce3e96c991aba6ae16d1bd2e50

data/lib/commandrb.rb

@@ -1,4 +1,8 @@
+require_relative 'helper'
+
 class CommandrbBot
+  
+  ENV['COMMANDRB_MODE'] == 'debug' ? @debug_mode = true : @debug_mode = false
 
   # Be able to adjust the config on the fly.
   attr_accessor :config
@@ -41,7 +45,7 @@ class CommandrbBot
     @config[:delete_activators] = false if @config[:delete_activators].nil?
 
     if @config[:token].nil? or init_hash[:token] == ''
-      puts 'No token supplied in init hash!'
+      raise 'No token supplied in init hash!'
       return false
     end
 
@@ -50,12 +54,13 @@ class CommandrbBot
 
     if init_type == :bot
       if init_hash[:client_id].nil?
-        puts 'No client ID or invalid client ID supplied in init hash!'
+        raise 'No client ID or invalid client ID supplied in init hash!'
         return false
       end
     end
 
     @config[:owners] = init_hash[:owners]
+    @config[:owners] = [] if @config[:owners].nil?
 
     @prefixes = init_hash[:prefixes]
 
@@ -76,6 +81,7 @@ class CommandrbBot
 
     # Command processing
     @bot.message do |event|
+      @finished = false
       @command = nil
       @event = nil
       @chosen = nil
@@ -83,15 +89,20 @@ class CommandrbBot
       @rawargs = nil
       @continue = false
       @prefixes.each { |prefix|
+        break if @finished
         if event.message.content.start_with?(prefix)
 
           @commands.each { | key, command |
+            break if @finished
+            puts ":: Considering #{key.to_s}"  if @debug_mode
             triggers =  command[:triggers].nil? ? [key.to_s] : command[:triggers]
 
             triggers.each { |trigger|
               @activator = prefix + trigger.to_s
+              puts @activator if @debug_mode
               @activator = @activator.downcase
               if event.message.content.downcase.start_with?(@activator)
+                puts "Prefix matched! #{@activator}" if @debug_mode
 
                 # Continue only if you've already chosen a choice.
                 unless @chosen.nil?
@@ -99,20 +110,26 @@ class CommandrbBot
                   # Example: sh is chosen, shell is the new one.
                   # In this example, shell would override sh, preventing ugly bugs.
                   if @activator.start_with?(@chosen)
+                    puts "#{@activator} just overrode #{@chosen}" if @debug_mode
                     @chosen = @activator
                   # Otherwhise, just give up.
                   else
+                    puts "Match failed..." if @debug_mode
                     next
                   end
                 # If you haven't chosen yet, get choosing!
                 else
+                    puts "First match obtained!" if @debug_mode
                     @continue = true
                     @chosen = @activator
                 end
               end
             }
+            
+            puts "Result: #{@chosen}" if @debug_mode
 
-            next unless @continue
+            next if !@continue
+            puts "Final esult: #{@chosen}" if @debug_mode
 
             break if @config[:selfbot] && event.user.id != @bot.profile.id
 
@@ -125,9 +142,20 @@ class CommandrbBot
             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.
+            puts "[DEBUG] Command being processed: '#{command}'" if @debug_mode
+            puts "[DEBUG] Owners only? #{command[:owners_only]}" if @debug_mode
             if command[:owners_only]
-              unless @config[:owners].include?(event.user.id)
-                event.respond('❌ You don\'t have permission for that!')
+              if !@config[:owners].include?(event.user.id)
+                event.channel.send_message('', false,
+                  Helper.error_embed(
+                   error: "You don't have permission for that!\nOnly owners are allowed to access this command.",
+                   footer: "Command: `#{event.message.content}`",
+                   colour: 0xFA0E30,
+                   code_error: false
+                  )
+                )
+                puts 'Were returning!'
+                @finished = true
                 next
               end
             end
@@ -151,6 +179,7 @@ class CommandrbBot
                 event.respond('❌ This command will only work in servers!')
               end
               # Abort!
+              @finished = true
               next
             end
 
@@ -158,47 +187,80 @@ class CommandrbBot
             # ...then abort :3
             if (event.user.bot_account? && command[:parse_bots] == false) || (event.user.bot_account? && @config[:parse_bots] == false)
               # Abort!
+              @finished = true
               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)
-            # Split the arguments into an array for easy usage.
-            rawargs = args
-            args = args.split(/ /)
+            args = event.message.content.split(' ')
+            # Parse args if args exist !
+            if args.length > 2
+              spaces = 1
+              # Prefixes with spaces are special and need to be parsed differently : )
+              if prefix.include? " "
+                spaces += prefix.count(' ')
+                args = event.message.content.slice!(args[0].size + args[1].size + spaces, event.message.content.size)
+              else
+                args = event.message.content.slice!(args[0].size + spaces, event.message.content.size)
+              end
+              # Split the argmuents into an array for easy usage but keep the raw args !!
+              rawargs = args
+              args = args.split(/ /)
+            end
+
 
             # 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
+            unless command[:max_args].nil?
+              if command[:max_args] > 0 && args.length > command[:max_args]
+                # May be replaced with an embed.
+                event.channel.send_message('', false,
+                    Helper.error_embed(
+                     error: "Too many arguments! \nMax arguments: `#{command[:max_args]}`",
+                     footer: "Command: `#{event.message.content}`",
+                     colour: 0xFA0E30,
+                     code_error: false
+                    )
+                  )
+                break
+              end
             end
+            
+            # 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
+
+            unless command[:required_permissions].nil?
+              command[:required_permissions].each { |x|
+                if event.user.on(event.server).permission?(x,event.channel)
+                  event.respond('❌ You don\'t have permission for that!')
+                  @finished = true
+                  next
+                end
+              }
+              end
 
             # All done here.
+            puts "Finished!! Executed command: #{@chosen}" if @debug_mode
             @command = command
             @event = event
             @args = args
             @rawargs = rawargs
+            @finished = true
             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
       }
     end
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: commandrb
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
-- Seriel Shirogane
+- Erisa Komuro (Seriel)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-10 00:00:00.000000000 Z
+date: 2017-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: discordrb
@@ -57,7 +57,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: Commandrb