New Auth Framework: BotUser#default? and owner? methods

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

diff --git a/lib/rbot/botuser.rb b/lib/rbot/botuser.rb
index 1504a65652e568c2659eabdbfb6240d1cfd6caa1..f2c48421eb93e540e335e363810bea29c2e0c60c 100644 (file)
--- a/lib/rbot/botuser.rb
+++ b/lib/rbot/botuser.rb
@@ -237,9 +237,6 @@ class Bot
       attr_reader :password\r
       attr_reader :netmasks\r
       attr_reader :perm\r
-      # Please remember to #set_changed() the Auth.manager\r
-      # when modifying data\r
-      attr_reader :data\r
       attr_writer :login_by_mask\r
       attr_writer :transient\r
 \r
@@ -275,6 +272,10 @@ class Bot
         @transient = false\r
         reset_autologin\r
         reset_password # or not?\r
+        @netmasks.dup.each do |m|\r
+          delete_netmask(m)\r
+          add_netmask(m.generalize)\r
+        end\r
       end\r
 \r
       # Create a new BotUser with given username\r
@@ -313,9 +314,6 @@ class Bot
         raise "must provide a usable mask for transient BotUser #{@username}" if @transient and @netmasks.empty?\r
 \r
         @perm = {}\r
-\r
-        # @data = AuthNotifyingHash.new\r
-        @data = {}\r
       end\r
 \r
       # Inspection\r
@@ -328,11 +326,6 @@ class Bot
         str << " @perm=#{@perm.inspect}"\r
         str << " @login_by_mask=#{@login_by_mask}"\r
         str << " @autologin=#{@autologin}"\r
-        if @data.empty?\r
-          str << " no data"\r
-        else\r
-          str << " data for #{@data.keys.join(', ')}"\r
-        end\r
         str << ">"\r
       end\r
 \r
@@ -350,7 +343,6 @@ class Bot
           :perm => @perm,\r
           :login_by_mask => @login_by_mask,\r
           :autologin => @autologin,\r
-          :data => @data\r
         }\r
       end\r
 \r
@@ -389,7 +381,6 @@ class Bot
           @netmasks.each { |n| Auth.manager.maskdb.add(self, n) } if @autologin\r
         end\r
         @perm = h[:perm] if h.has_key?(:perm)\r
-        @data.replace(h[:data]) if h.has_key?(:data)\r
       end\r
 \r
       # This method sets the password if the proposed new password\r
@@ -610,6 +601,19 @@ class Bot
     end\r
 \r
 \r
+    class BotUser\r
+      # Check if the current BotUser is the default one\r
+      def default?\r
+        return DefaultBotUserClass === self\r
+      end\r
+\r
+      # Check if the current BotUser is the owner\r
+      def owner?\r
+        return BotOwnerClass === self\r
+      end\r
+    end\r
+\r
+\r
     # This is the ManagerClass singleton, used to manage\r
     # Irc::User/Irc::Bot::Auth::BotUser connections and everything\r
     #\r
@@ -664,7 +668,6 @@ class Bot
         [everyone, botowner].each do |x|\r
           @allbotusers[x.username.to_sym] = x\r
         end\r
-        @transients = Set.new\r
       end\r
 \r
       def load_array(ary, forced)\r
@@ -778,7 +781,6 @@ class Bot
         begin\r
           bu = BotUser.new(ircuser, :transient => true, :masks => ircuser)\r
           bu.login(ircuser)\r
-          @transients << bu\r
         rescue\r
           warning "failed to create transient for #{user}"\r
           error $!\r
@@ -792,7 +794,7 @@ class Bot
       def logout_transients(m)\r
         debug "to check: #{@botusers.keys.join ' '}"\r
         @botusers.keys.each do |iu|\r
-          debug "checking #{iu.fullform} agains #{m.fullform}"\r
+          debug "checking #{iu.fullform} against #{m.fullform}"\r
           bu = @botusers[iu]\r
           bu.transient? or next\r
           iu.matches?(m) or next\r
@@ -820,7 +822,6 @@ class Bot
         return nil unless tuser\r
         raise TypeError, "#{tuser} is not transient" unless tuser.transient?\r
 \r
-        @transients.delete(tuser)\r
         tuser.make_permanent(name)\r
         @allbotusers[tuser.username.to_sym] = tuser\r
 \r
@@ -903,44 +904,6 @@ end
     def botuser\r
       Irc::Bot::Auth.manager.irc_to_botuser(self)\r
     end\r
-\r
-    # Bot-specific data can be stored with Irc::Users. This is\r
-    # internally obtained by storing data to the associated BotUser,\r
-    # but this is a detail plugin writers shouldn't care about.\r
-    # bot_data(:key) can be used to retrieve a particular data set.\r
-    # This method is intended for data retrieval, and if the retrieved\r
-    # data is modified directly there is no guarantee the changes will\r
-    # be saved back. Use #set_bot_data() for that.\r
-    #\r
-    def bot_data(key=nil)\r
-      return self.botuser.data if key.nil?\r
-      return self.botuser.data[key]\r
-    end\r
-\r
-    # This method is used to store bot-specific data for the receiver.\r
-    # If no block is passed, _value_ is stored for the key _key_;\r
-    # if a block is passed, it will be called with the previous\r
-    # _key_ value as parameter, and its return value will be stored\r
-    # as the new value. If _value_ is present in the block form, it\r
-    # will be used to initialize _key_ if it's missing\r
-    # \r
-    def set_bot_data(key,value=nil,&block)\r
-      if not block_given?\r
-        self.botuser.data[key]=value\r
-        Irc::Bot::Auth.manager.set_changed\r
-        return value\r
-      end\r
-      if value and not bot_data.has_key?(key)\r
-        set_bot_data(key, value)\r
-      end\r
-      r = value\r
-      begin\r
-        r = yield bot_data(key)\r
-      ensure\r
-        Irc::Bot::Auth.manager.set_changed\r
-      end\r
-      return r\r
-    end\r
   end\r
 \r
 end\r