2 files changed, 34 insertions, 6 deletions

diff --git a/dinobot.rb b/dinobot.rb
index 68c901a..03f6291 100644
--- a/dinobot.rb
+++ b/dinobot.rb
@@ -70,13 +70,33 @@ module Dinobot
 
         message.sub!(@trigger, '')
 
-        mod = message.split.first.downcase.intern
-
-        if @modules.has_key?(mod)
-          commands = @modules[mod].call(user, channel, message)
+        commands = nil
+        mt = message.split(' | ')
+
+        mt.each_with_index do |m, i|
+          mod = m.split.first.downcase.intern
+          next unless @modules.has_key?(mod)
+
+          if i.zero?
+            commands = @modules[mod].call(user, channel, m)
+          else
+            return unless commands.is_a?(Array)
+
+            nc = []
+
+            commands.each do |cmd|
+              if cmd.first == :say
+                nc.concat(@modules[mod].call(user, cmd[1], "#{m} #{cmd[2]}"))
+              else
+                nc << cmd
+              end
+            end
 
-          exec_commands(commands) unless commands.nil?
+            commands = nc
+          end
         end
+
+        exec_commands(commands) if commands.is_a?(Array)
       end
     end
 
diff --git a/test.rb b/test.rb
index bc9db29..665c21e 100644
--- a/test.rb
+++ b/test.rb
@@ -5,7 +5,7 @@ module Dinobot
     def initialize
       super
 
-      @commands << :echo << :error << :timeout
+      @commands << :echo << :error << :timeout << :x3 << :wrongreturn
     end
 
     def echo(user, channel, argument)
@@ -19,5 +19,13 @@ module Dinobot
     def timeout(user, channel, argument)
       sleep 60
     end
+
+    def x3(user, channel, argument)
+      [[:say, channel, argument]] * 3
+    end
+
+    def wrongreturn(user, channel, argument)
+      0
+    end
   end
 end