message.rb: fix logmessage for CTCP ACTIONs

[user/henk/code/ruby/rbot.git] / lib / rbot / message.rb

diff --git a/lib/rbot/message.rb b/lib/rbot/message.rb
index 7527940ad47605c29bfed8bff612fb3be9eb0842..de72d30c93eec520f3b4c896d0888d290345bd25 100644 (file)
--- a/lib/rbot/message.rb
+++ b/lib/rbot/message.rb
@@ -1,18 +1,30 @@
+#-- vim:sw=2:et
+#++
+#
+# :title: IRC message datastructures
+
 module Irc
-  BotConfig.register BotConfigArrayValue.new('core.address_prefix',
-    :default => [], :wizard => true,
-    :desc => "what non nick-matching prefixes should the bot respond to as if addressed (e.g !, so that '!foo' is treated like 'rbot: foo')"
-  )
 
-  BotConfig.register BotConfigBooleanValue.new('core.reply_with_nick',
-    :default => false, :wizard => true,
-    :desc => "if true, the bot will prepend the nick to what he has to say when replying (e.g. 'markey: you can't do that!')"
-  )
 
-  BotConfig.register BotConfigStringValue.new('core.nick_postfix',
-    :default => ':', :wizard => true,
-    :desc => "when replying with nick put this character after the nick of the user the bot is replying to"
-  )
+  class Bot
+    module Config
+      Config.register ArrayValue.new('core.address_prefix',
+        :default => [], :wizard => true,
+        :desc => "what non nick-matching prefixes should the bot respond to as if addressed (e.g !, so that '!foo' is treated like 'rbot: foo')"
+      )
+
+      Config.register BooleanValue.new('core.reply_with_nick',
+        :default => false, :wizard => true,
+        :desc => "if true, the bot will prepend the nick to what he has to say when replying (e.g. 'markey: you can't do that!')"
+      )
+
+      Config.register StringValue.new('core.nick_postfix',
+        :default => ':', :wizard => true,
+        :desc => "when replying with nick put this character after the nick of the user the bot is replying to"
+      )
+    end
+  end
+
 
   # Define standard IRC attriubtes (not so standard actually,
   # but the closest thing we have ...)
@@ -110,6 +122,9 @@ module Irc
     # contents of the message
     attr_accessor :message
 
+    # contents of the message (for logging purposes)
+    attr_accessor :logmessage
+
     # has the message been replied to/handled by a plugin?
     attr_accessor :replied
 
@@ -140,6 +155,7 @@ module Irc
           warning "Message does not have identification"
         end
       end
+      @logmessage = @message.dup
 
       if target && target == @bot.myself
         @address = true
@@ -159,6 +175,13 @@ module Irc
       "#{@source.user}@#{@source.host}" rescue @source.to_s
     end
 
+    # Access the botuser corresponding to the source, if any
+    #
+    def botuser
+      source.botuser rescue @bot.auth.everyone
+    end
+
+
     # Was the message from an identified user?
     def identified?
       return @identified
@@ -257,11 +280,14 @@ module Irc
         @address = true
       end
 
-      if(@message =~ /^\001(\S+)\s(.+)\001/)
+      if(@message =~ /^\001(\S+)(\s(.+))?\001/)
         @ctcp = $1
-        @message = $2
+       # FIXME need to support quoting of NULL and CR/LF, see
+       # http://www.irchelp.org/irchelp/rfc/ctcpspec.html
+        @message = $3 || String.new
         @action = @ctcp == 'ACTION'
         debug "Received CTCP command #{@ctcp} with options #{@message} (action? #{@action})"
+        @logmessage = @message.dup
       end
 
       # free splitting for plugins
@@ -324,9 +350,10 @@ module Irc
       @replied = true
     end
 
-    # send a CTCP response, i.e. a private notice to the sender
-    def ctcp_reply(command, string, options={})
-      @bot.ctcp_notice @source, command, string, options
+    # send a CTCP response, i.e. a private NOTICE to the sender
+    # with the same CTCP command and the reply as a parameter
+    def ctcp_reply(string, options={})
+      @bot.ctcp_notice @source, @ctcp, string, options
     end
 
     # convenience method to reply "okay" in the current language to the