User mode-checking methods now accept channel names and will try to resolve the corre...

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

diff --git a/lib/rbot/irc.rb b/lib/rbot/irc.rb
index 45e1495960569e30052d2e6b035311e42082bb55..0edfb35a4de903f0bfc57acf72670789d95dd473 100644 (file)
--- a/lib/rbot/irc.rb
+++ b/lib/rbot/irc.rb
@@ -321,7 +321,7 @@ class String
         raise "Unexpected match #{m} when converting #{self}"\r
       end\r
     }\r
-    Regexp.new(regmask)\r
+    Regexp.new("^#{regmask}$")\r
   end\r
 \r
 end\r
@@ -629,24 +629,48 @@ module Irc
       end\r
     end\r
 \r
-    # A Netmask is easily converted to a String for the usual representation\r
+    # A Netmask is easily converted to a String for the usual representation.\r
+    # We skip the user or host parts if they are "*", unless we've been asked\r
+    # for the full form\r
     #\r
+    def to_s\r
+      ret = nick.dup\r
+      ret << "!" << user unless user == "*"\r
+      ret << "@" << host unless host == "*"\r
+      return ret\r
+    end\r
+\r
     def fullform\r
       "#{nick}!#{user}@#{host}"\r
     end\r
-    alias :to_s :fullform\r
+\r
+    # This method downcases the fullform of the netmask. While this may not be\r
+    # significantly different from the #downcase() method provided by the\r
+    # ServerOrCasemap mixin, it's significantly different for Netmask\r
+    # subclasses such as User whose simple downcasing uses the nick only.\r
+    #\r
+    def full_irc_downcase(cmap=casemap)\r
+      self.fullform.irc_downcase(cmap)\r
+    end\r
+\r
+    # full_downcase() will return the fullform downcased according to the\r
+    # User's own casemap\r
+    #\r
+    def full_downcase\r
+      self.full_irc_downcase\r
+    end\r
 \r
     # Converts the receiver into a Netmask with the given (optional)\r
     # server/casemap association. We return self unless a conversion\r
     # is needed (different casemap/server)\r
     #\r
-    # Subclasses of Netmask will return a new Netmask\r
+    # Subclasses of Netmask will return a new Netmask, using full_downcase\r
     #\r
     def to_irc_netmask(opts={})\r
       if self.class == Netmask\r
         return self if fits_with_server_and_casemap?(opts)\r
       end\r
-      return self.downcase.to_irc_netmask(opts)\r
+      return self.full_downcase.to_irc_netmask(opts)\r
     end\r
 \r
     # Converts the receiver into a User with the given (optional)\r
@@ -900,7 +924,7 @@ module Irc
     # Checks if a User is well-known or not by looking at the hostname and user\r
     #\r
     def known?\r
-      return nick!= "*" && user!="*" && host!="*"\r
+      return nick != "*" && user != "*" && host != "*"\r
     end\r
 \r
     # Is the user away?\r
@@ -920,21 +944,6 @@ module Irc
       end\r
     end\r
 \r
-    # Users can be either simply downcased (their nick only)\r
-    # or fully downcased: this will return the fullform downcased\r
-    # according to the given casemap.\r
-    #\r
-    def full_irc_downcase(cmap=casemap)\r
-      self.fullform.irc_downcase(cmap)\r
-    end\r
-\r
-    # full_downcase() will return the fullform downcased according to the\r
-    # User's own casemap\r
-    #\r
-    def full_downcase\r
-      self.full_irc_downcase\r
-    end\r
-\r
     # Since to_irc_user runs the same checks on server and channel as\r
     # to_irc_netmask, we just try that and return self if it works.\r
     #\r
@@ -961,6 +970,35 @@ module Irc
       end\r
     end\r
 \r
+    def modes_on(channel)\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
+      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
+      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
 \r
@@ -1164,7 +1202,7 @@ module Irc
       #\r
       def initialize(text="", set_by="", set_on=Time.new)\r
         @text = text\r
-        @set_by = set_by.to_irc_user\r
+        @set_by = set_by.to_irc_netmask\r
         @set_on = set_on\r
       end\r
 \r
@@ -1327,6 +1365,21 @@ module Irc
       @mode[sym.to_sym] = kl.new(self)\r
     end\r
 \r
+    def modes_of(user)\r
+      l = []\r
+      @mode.map { |s, m|\r
+        l << s if (m.class <= UserMode and m.list[user])\r
+      }\r
+      l\r
+    end\r
+\r
+    def has_op?(user)\r
+      @mode.has_key?(:o) and @mode[:o].list[user]\r
+    end\r
+\r
+    def has_voice?(user)\r
+      @mode.has_key?(:v) and @mode[:v].list[user]\r
+    end\r
   end\r
 \r
 \r