config core module: default command auth fixes

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

diff --git a/lib/rbot/core/userdata.rb b/lib/rbot/core/userdata.rb
index 844a6c5874c1cf90f6050e9f2b36ff5c5be174df..f7c74a4a5fa7f9b0657910e7c5c01241fe016413 100644 (file)
--- a/lib/rbot/core/userdata.rb
+++ b/lib/rbot/core/userdata.rb
@@ -52,21 +52,35 @@ class UserDataModule < CoreBotModule
   def initialize
     super
     @ircuser = @registry.sub_registry('ircuser')
+    @transient = @registry.sub_registry('transient')
     @botuser = @registry.sub_registry('botuser')
   end
 
-  def get_data_hash(user)
+  def get_data_hash(user, opts={})
+    plain = opts[:plain]
     iu = user.to_irc_user
     bu = iu.botuser
 
     ih = @ircuser[iu.nick] || {}
 
-    if bu.transient? or bu.default?
+    if bu.default?
       return ih
+    elsif bu.transient?
+      bh = @transient[bu.netmasks.first.fullform] || {}
     else
       bh = @botuser[bu.username] || {}
-      return ih.merge! bh
     end
+    ih.merge!(bh)
+
+    unless plain
+      class << ih
+        alias :single_retrieve :[]
+        alias :single_assign :[]=
+          include DottedIndex
+      end
+    end
+
+    return ih
   end
 
   def get_data(user, key=nil)
@@ -76,6 +90,25 @@ class UserDataModule < CoreBotModule
     return h[key]
   end
 
+  def set_data_hash(user, hh)
+    iu = user.to_irc_user
+    bu = iu.botuser
+
+    # we .dup the hash to remove singleton methods
+    # and make it dump-able
+    h = hh.dup
+
+    @ircuser[iu.nick] = h
+    return h if bu.default?
+
+    if bu.transient?
+      @transient[bu.netmasks.first.fullform] = h
+    else
+      @botuser[bu.username] = h
+    end
+    return h
+  end
+
   def set_data(user, key, value=nil, &block)
     h = get_data_hash(user)
     debug h
@@ -92,14 +125,8 @@ class UserDataModule < CoreBotModule
     end
     debug ret
 
-    iu = user.to_irc_user
-    bu = iu.botuser
+    set_data_hash(user, h)
 
-    if bu.transient? or bu.default?
-      @ircuser[iu.nick] = h
-    else
-      @botuser[bu.username] = h
-    end
     return ret
   end
 
@@ -108,14 +135,8 @@ class UserDataModule < CoreBotModule
     debug h
     yield h
 
-    iu = user.to_irc_user
-    bu = iu.botuser
+    set_data_hash(user, h)
 
-    if bu.transient? or bu.default?
-      @ircuser[iu.nick] = h
-    else
-      @botuser[bu.username] = h
-    end
     return h
   end
 
@@ -124,13 +145,13 @@ class UserDataModule < CoreBotModule
     key = params[:key].intern
     data = get_data(user, key)
     if data
-      m.reply (_("%{key} data for %{user}: %{data}") % {
+      m.reply(_("%{key} data for %{user}: %{data}") % {
         :key => key,
         :user => user.nick,
         :data => data
       })
     else
-      m.reply (_("sorry, no %{key} data for %{user}") % {
+      m.reply(_("sorry, no %{key} data for %{user}") % {
         :key => key,
         :user => user.nick,
       })
@@ -146,6 +167,28 @@ class UserDataModule < CoreBotModule
   #   data = params[:data].to_s
   # end
 
+  def event_botuser(action, opts={})
+    case action
+    when :copy, :rename
+      source = opts[:source]
+      return unless @botuser.key?(source)
+      dest = opts[:dest]
+      @botuser[dest] = @botuser[source].dup
+      @botuser.delete(source) if action == :rename
+    when :pre_perm
+      @permification ||= {}
+      k = [opts[:irc_user], opts[:bot_user]]
+      @permification[k] = get_data_hash(opts[:irc_user], :plain => true)
+    when :post_perm
+      @permification ||= {}
+      k = [opts[:irc_user], opts[:bot_user]]
+      if @permification.has_key?(k)
+        @botuser[opts[:bot_user]] = @permification[k]
+        @permification.delete(k)
+      end
+    end
+  end
+
 end
 
 plugin = UserDataModule.new