plugin api changes

README.markdown

@@ -49,12 +49,12 @@ Files: [ helloworld.rb ]
 ~~~~~ ruby
 class HelloworldPlugin < Mirai::Plugin
 	def on_register															# Called when the plugin is initialized
-		add_channel_handler(/^#{@trigger}talktome/, :test_handler) 			# ^talktome
+		add_channel_handler(/^#{@trigger}talktome (.*)$/, :test_handler) 			# ^talktome
 		add_web_handler(/^\/helloworld/, :test_web_handler) 				# http://0.0.0.0:3000/helloworld
 	end
 
-	def test_handler(userhash, channel, matches)
-		privmsg channel, "Well, Hello World! #{userhash[:nick]}"
+	def test_handler(info, what)
+		reply "Well, Hello World! #{info[:nick]}. I don't know what #{what} is!"
 	end
 
 	def test_web_handler(env)

config.yml

@@ -16,6 +16,8 @@ Plugins:
     Restrict: ashleyis!oohbouncy@*
   - Plugin: regex-plugin  # 'core' plugins are stored in mirai/plugins/
     Update: core
+  # - Plugin: ey-plugin 
+  #   Update: core
   # - Plugin: test-http # a plugin can auto update from a website..
   #   Update: http
   #   URL: http://www.google.com

mirai/core.rb

@@ -93,7 +93,7 @@ def on_channelmessage userhash, channel, message
 			puts "#{userhash[:nick]}->#{channel} >> #{message}"
 			@handlers.each do |handle, val|
 				if (message.match(handle))
-					val[:obj].send(val[:method], userhash, channel, message.match(handle))
+					val[:obj].send(:mirror_handle, val[:method], userhash, channel, message.match(handle))
 				end
 			end
 		end

mirai/plugin.rb

@@ -23,5 +23,17 @@ def add_channel_handler handler, callback
 		def add_web_handler handler, callback
 			@handler.register_web_handler(handler, self, callback)
 		end
+
+		def reply message
+			privmsg @channel, message
+		end
+
+		def mirror_handle to, userhash, channel, matches
+			@channel = channel
+			userhash[:channel] = channel
+			userhash[:raw] = matches[0]
+			userhash[:matches] = matches
+			send to, userhash, *matches[1..-1]
+		end
 	end
 end

plugins/regex-plugin/regex.rb

@@ -4,14 +4,14 @@ def on_register
 		add_channel_handler(/^s\/(.*)([^\\\/]*\/)(.*)([^\\\/]*\/)$/, :regex_handler)
 		add_channel_handler(/^(?!^s\/)(.*)$/, :buffer_handler)
 	end
-	def buffer_handler userhash, channel, matches
-		@buffer << {:nick => userhash[:nick], :message => matches[1], :channel => channel}
+	def buffer_handler info, all
+		@buffer << {:nick => info[:nick], :message => all, :channel => info[:channel]}
 		@buffer = @buffer[@buffer.length-50..-1] if @buffer.length > 50
 	end
-	def regex_handler userhash, channel, matches
-		targetline = @buffer.reverse.find {|line| line[:message].match(/#{matches[1]}/) && line[:channel] == channel }
+	def regex_handler info, one, two, three, four
+		targetline = @buffer.reverse.find {|line| line[:message].match(/#{one}/) && line[:channel] == info[:channel] }
 		return if targetline.nil?
-		targetline[:message].gsub!(/#{matches[1]}/, matches[3])
-		privmsg channel, "<#{targetline[:nick]}> #{targetline[:message]}"
+		targetline[:message].gsub!(/#{one}/, three)
+		reply "<#{targetline[:nick]}> #{targetline[:message]}"
 	end
 end

plugins/test-plugin/test.rb

@@ -3,8 +3,8 @@ def on_register
 		add_channel_handler(/^#{@trigger}test/, :test_handler)
 		add_web_handler(/^\/testing/, :test_web_handler)
 	end
-	def test_handler(userhash, channel, matches)
-		privmsg channel, "Yes #{userhash[:nick]} this is a test."
+	def test_handler(info)
+		reply "Yes #{info[:nick]} this is a test."
 	end
 
 	def test_web_handler(env)