Changeset eebdc6973a6ab1089ed18c0ea02e72cd6e656120

Timestamp:

08/10/08 03:47:13 (3 months ago)

Author:

Giuseppe Bilotta <giuseppe.bilotta@gmail.com>

git-committer:

Giuseppe Bilotta <giuseppe.bilotta@gmail.com> 1218325633 +0200

git-parent:

[fa4a71c43227669b42b4b1c0a68be796091f3d1d]

git-author:

Giuseppe Bilotta <giuseppe.bilotta@gmail.com> 1218325412 +0200

Message:

+ handle WHOIS queries

The bot now exposes a whois(nick) method to make WHOIS queries to the
server. The extended syntax whois(nick, server) is also supported,
allowing another server to be queried (this is useful to retrieve info
which is only available on nick's server, such as idle time and signon
date).

Most if not all RFC-compliant replies are handled, although some of the
data received is currently ignored. Non-RFC extended replies such as
nickserv identification status are not hanlded yet, since they are
highly server-specific, both in numeric reply choice (e.g. 307 vs 320)
and in reply message syntax and meaning.

A new WhoisMessage? is also introduced, for plugin delegation. The source
is the originating server, the target is the user for which information
was requested. A #whois() method is provided holding all retrieved
information.

Files:

• lib/rbot/irc.rb (modified) (2 diffs)
• lib/rbot/ircbot.rb (modified) (2 diffs)
• lib/rbot/message.rb (modified) (1 diff)
• lib/rbot/rfc2812.rb (modified) (1 diff)

lib/rbot/irc.rb

@@ -923 +923 @@
-    alias :to_s :nick
-
-
+, :idle_since, :signon
-
-    # Create a new IRC User from a given Netmask (or anything that can be converted
@@ -935 +935 @@
-      @away = false
-      @real_name = String.new
+      @idle_since = nil
+      @signon = nil
-    end
-

lib/rbot/ircbot.rb

@@ -699 +699 @@
-      @plugins.delegate "modechange", m
-    }
+    @client[:whois] = proc {|data|
+      source = data[:source]
+      target = server.get_user(data[:whois][:nick])
+      m = WhoisMessage.new(self, server, source, target, data[:whois])
+      @plugins.delegate "whois", m
+    }
-    @client[:join] = proc {|data|
-      m = JoinMessage.new(self, server, data[:source], data[:channel], data[:message])
@@ -1210 +1216 @@
-  end
-
+  # asking whois
+  def whois(nick, target=nil)
+    sendq "WHOIS #{target} #{nick}", nil, 0
+  end
+
-  # kicking a user
-  def kick(channel, user, msg)

lib/rbot/message.rb

@@ -554 +554 @@
-  end
-
+  # class to manage WHOIS replies
+  class WhoisMessage < BasicUserMessage
+    attr_reader :whois
+    def initialize(bot, server, source, target, whois)
+      super(bot, server, source, target, "")
+      @address = (target == @bot.myself)
+      @whois = whois
+    end
+
+    def inspect
+      fields = ' whois=' << whois.inspect
+      super(fields)
+    end
+  end
+
-  # class to manage NAME replies
-  class NamesMessage < BasicUserMessage

lib/rbot/rfc2812.rb

@@ -1289 +1289 @@
-        when RPL_ENDOFWHO
-          handle(:eowho, data)
+        when RPL_WHOISUSER
+          @whois ||= Hash.new
+          @whois[:nick] = argv[1]
+          @whois[:user] = argv[2]
+          @whois[:host] = argv[3]
+          @whois[:real_name] = argv[-1]
+
+          user = @server.get_user(@whois[:nick])
+          user.user = @whois[:user]
+          user.host = @whois[:host]
+          user.real_name = @whois[:real_name]
+        when RPL_WHOISSERVER
+          @whois ||= Hash.new
+          @whois[:nick] = argv[1]
+          @whois[:server] = argv[2]
+          @whois[:server_info] = argv[-1]
+          # TODO update user info
+        when RPL_WHOISOPERATOR
+          @whois ||= Hash.new
+          @whois[:nick] = argv[1]
+          @whois[:operator] = argv[-1]
+          # TODO update user info
+        when RPL_WHOISIDLE
+          @whois ||= Hash.new
+          @whois[:nick] = argv[1]
+          user = @server.get_user(@whois[:nick])
+          @whois[:idle] = argv[2].to_i
+          user.idle_since = Time.now - @whois[:idle]
+          if argv[-1] == 'seconds idle, signon time'
+            @whois[:signon] = Time.at(argv[3].to_i)
+            user.signon = @whois[:signon]
+          end
+        when RPL_ENDOFWHOIS
+          @whois ||= Hash.new
+          @whois[:nick] = argv[1]
+          data[:whois] = @whois.dup
+          @whois.clear
+          handle(:whois, data)
+        when RPL_WHOISCHANNELS
+          @whois ||= Hash.new
+          @whois[:nick] = argv[1]
+          @whois[:channels] = []
+          user = @server.get_user(@whois[:nick])
+          argv[-1].split.each do |prechan|
+            pfx = prechan.scan(/[#{@server.supports[:prefix][:prefixes].join}]/)
+            modes = pfx.map { |p| @server.mode_for_prefix p }
+            chan = prechan[pfx.length..prechan.length]
+
+            channel = @server.get_channel(chan)
+            if channel
+              channel.add_user(user, :silent => true)
+              modes.map { |mode| channel.mode[mode].set(user) }
+            end
+
+            @whois[:channels] << [chan, modes]
+          end
-        when RPL_CHANNELMODEIS
-          parse_mode(serverstring, argv[1..-1], data)