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 bfe71dd71f7aaf94adf3eca58a2730f2fb67585f..f7c74a4a5fa7f9b0657910e7c5c01241fe016413 100644 (file)
--- a/lib/rbot/core/userdata.rb
+++ b/lib/rbot/core/userdata.rb
@@ -56,7 +56,8 @@ class UserDataModule < CoreBotModule
     @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
 
@@ -69,7 +70,17 @@ class UserDataModule < CoreBotModule
     else
       bh = @botuser[bu.username] || {}
     end
-    return ih.merge!(bh)
+    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)
@@ -79,10 +90,14 @@ class UserDataModule < CoreBotModule
     return h[key]
   end
 
-  def set_data_hash(user, h)
+  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?
 
@@ -153,12 +168,25 @@ class UserDataModule < CoreBotModule
   # end
 
   def event_botuser(action, opts={})
-    return unless [:copy, :rename].include?(action)
-    source = opts[:source]
-    return unless @botuser.key?(source)
-    dest = opts[:dest]
-    @botuser[dest] = @botuser[source].dup
-    @botuser.delete(source) if action == :rename
+    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