New Auth Framework: no need to have TransientBotUser as a separate class

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

diff --git a/lib/rbot/message.rb b/lib/rbot/message.rb
index 7527940ad47605c29bfed8bff612fb3be9eb0842..6331825de66d512df0cb21da9c65d35be9adc2fa 100644 (file)
--- a/lib/rbot/message.rb
+++ b/lib/rbot/message.rb
@@ -1,3 +1,8 @@
+#-- vim:sw=2:et
+#++
+#
+# :title: IRC message datastructures
+
 module Irc
   BotConfig.register BotConfigArrayValue.new('core.address_prefix',
     :default => [], :wizard => true,
@@ -159,6 +164,13 @@ module Irc
       "#{@source.user}@#{@source.host}" rescue @source.to_s
     end
 
+    # Access the botuser corresponding to the source, if any
+    #
+    def botuser
+      @bot.auth.autologin(@source) rescue @bot.auth.everyone
+    end
+
+
     # Was the message from an identified user?
     def identified?
       return @identified
@@ -257,9 +269,11 @@ 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})"
       end
@@ -324,9 +338,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