commandrb 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 51288c75ab522040fdf27c3c7e065e4ce32c1d28
-  data.tar.gz: 7e91d61b2dc09ae430b014871de04a97c57e6ccd
+  metadata.gz: f29c156bce33643bcf6e96cf4e3412bb2f0c7491
+  data.tar.gz: '084fff7142244fd4b4d5de25c7f675a86f439816'
 SHA512:
-  metadata.gz: 54e3155a4b1a31a347e61c74a16b47e3ebfc9f383d887a9688314f2aec760dc150b55077f771b0a227990eb2e7bf54a5431a0a37e6b1db4f5999011ed0c24874
-  data.tar.gz: 42bfc2dab44cf8f69b5959b3133cb80c399bd638b166dde36e28dc7a6a5524705f1f0bece9570ef9487f93aeec8c4ea9c9a88c1f92e1b0166ccd90d57142d1b8
+  metadata.gz: 24f86e1110fa38f7424d85059635f6a0fb4d8c3ced1346ce398bc139c00a296dfa60f02b380ea9a87c719a3c7235163e0400bf63bc821efba10e2f0c39d825bb
+  data.tar.gz: c45ceb8987737e3a2a42698df5fb1354ccd12b3466d855d1fc91d01df8661b68020deb36396899bdae896d152632c13a4ef6065ebe3f16e6102aaf3b7485af41

data/lib/commandrb.rb

@@ -225,32 +225,42 @@ class CommandrbBot
                      code_error: false
                     )
                   )
+                @finished = true
                 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!')
+                unless event.user.on(event.server).permission?(x,event.channel)
+                  event.channel.send_message('', false,
+                    Helper.error_embed(
+                     error: "You don't have permission for that!\nPermission required: `#{x.to_s}`",
+                     footer: "Command: `#{event.message.content}`",
+                     colour: 0xFA0E30,
+                     code_error: false
+                    )
+                  )
                   @finished = true
-                  next
+                  break
                 end
               }
+            end
+            
+            unless @finished
+              # 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
+            end
 
             # All done here.
             puts "Finished!! Executed command: #{@chosen}" if @debug_mode

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: commandrb
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Erisa Komuro (Seriel)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-31 00:00:00.000000000 Z
+date: 2017-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: discordrb