basics botmodule: use #to_s to stringify multiword parameters

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

diff --git a/lib/rbot/irc.rb b/lib/rbot/irc.rb
index 38c4a3e97061ba108d77baca201a2ce8700cc2e0..129f947e61d1d9d906e1b02d7b7e7deb486fd5f3 100644 (file)
--- a/lib/rbot/irc.rb
+++ b/lib/rbot/irc.rb
@@ -885,6 +885,8 @@ module Irc
   class User < Netmask\r
     alias :to_s :nick\r
 \r
+    attr_accessor :real_name\r
+\r
     # Create a new IRC User from a given Netmask (or anything that can be converted\r
     # into a Netmask) provided that the given Netmask does not have globs.\r
     #\r
@@ -894,6 +896,7 @@ module Irc
       raise ArgumentError, "#{str.inspect} must not have globs (unescaped * or ?)" if user.has_irc_glob? && user != "*"\r
       raise ArgumentError, "#{str.inspect} must not have globs (unescaped * or ?)" if host.has_irc_glob? && host != "*"\r
       @away = false\r
+      @real_name = String.new\r
     end\r
 \r
     # The nick of a User may be changed freely, but it must not contain glob patterns.\r
@@ -971,15 +974,33 @@ module Irc
     end\r
 \r
     def modes_on(channel)\r
-      channel.modes_of(self)\r
+      case channel\r
+      when Channel\r
+        channel.modes_of(self)\r
+      else\r
+        return @server.channel(channel).modes_of(self) if @server\r
+        raise "Can't resolve channel #{channel}"\r
+      end\r
     end\r
 \r
     def is_op?(channel)\r
-      channel.has_op?(self)\r
+      case channel\r
+      when Channel\r
+        channel.has_op?(self)\r
+      else\r
+        return @server.channel(channel).has_op?(self) if @server\r
+        raise "Can't resolve channel #{channel}"\r
+      end\r
     end\r
 \r
     def is_voice?(channel)\r
-      channel.has_voice?(self)\r
+      case channel\r
+      when Channel\r
+        channel.has_voice?(self)\r
+      else\r
+        return @server.channel(channel).has_voice?(self) if @server\r
+        raise "Can't resolve channel #{channel}"\r
+      end\r
     end\r
   end\r
 \r
@@ -1254,7 +1275,7 @@ module Irc
     # Checks if the receiver already has a user with the given _nick_\r
     #\r
     def has_user?(nick)\r
-      user_nicks.index(nick.irc_downcase(casemap))\r
+      @users.index(nick.to_irc_user(server_and_casemap))\r
     end\r
 \r
     # Returns the user with nick _nick_, if available\r
@@ -1268,8 +1289,8 @@ module Irc
     #\r
     def add_user(user, opts={})\r
       silent = opts.fetch(:silent, false) \r
-      if has_user?(user) && !silent\r
-        warn "Trying to add user #{user} to channel #{self} again"\r
+      if has_user?(user)\r
+        warn "Trying to add user #{user} to channel #{self} again" unless silent\r
       else\r
         @users << user.to_irc_user(server_and_casemap)\r
       end\r