From b0773cb8d560cf90019e13d73ae308a38445ddb5 Mon Sep 17 00:00:00 2001 From: Giuseppe Bilotta Date: Mon, 9 Mar 2009 22:16:51 +0100 Subject: reaction: spoken reactions should use plainreply, not reply --- data/rbot/plugins/reaction.rb | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'data/rbot') diff --git a/data/rbot/plugins/reaction.rb b/data/rbot/plugins/reaction.rb index 8f2a1637..6bbd08e3 100644 --- a/data/rbot/plugins/reaction.rb +++ b/data/rbot/plugins/reaction.rb @@ -263,18 +263,21 @@ class ReactionPlugin < Plugin reply = wanted.pick_reply debug "picked #{reply}" return unless reply - args = reply.apply(subs) - if args[0] == :cmd + act, arg = reply.apply(subs) + case act + when :cmd begin # Pass the new message back to the bot. # FIXME Maybe we should do it the alias way, only calling # @bot.plugins.privmsg() ? - fake_message(@bot.nick+": "+args[1], :from => m) + fake_message(@bot.nick+": "+arg, :from => m) rescue RecurseTooDeep => e error e end + when :reply + m.plainreply arg else - m.__send__(*args) + m.__send__(act, arg) end end -- cgit v1.2.3