youtube: not all urls have v= as first CGI param

[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 72cada7808e5cea6affde4de03b59c05909adc24..ced5c1e7fb0eab0bbec478edf62a275a4bc619c8 100644 (file)
--- a/lib/rbot/core/userdata.rb
+++ b/lib/rbot/core/userdata.rb
@@ -4,8 +4,6 @@
 # :title: rbot user data management from IRC
 #
 # Author:: Giuseppe "Oblomov" Bilotta <giuseppe.bilotta@gmail.com>
-# Copyright:: (C) 2006,2007 Giuseppe Bilotta
-# License:: GPL v2
 
 module ::Irc
   class User
@@ -27,7 +25,7 @@ module ::Irc
     #
     # If you have to do large-scale editing of the Bot data Hash,
     # please use with_botdata.
-    # 
+    #
     def set_botdata(key, value=nil, &block)
       Irc::Utils.bot.plugins['userdata'].set_data(self, key, value, &block)
     end
@@ -40,6 +38,13 @@ module ::Irc
       Irc::Utils.bot.plugins['userdata'].with_data(self, &block)
     end
 
+    # This method removes the data associated with the key, returning
+    # the value of the deleted key.
+
+    def delete_botdata(*keys)
+      Irc::Utils.bot.plugins['userdata'].delete_data(self, *keys)
+    end
+
   end
 end
 
@@ -90,10 +95,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?
 
@@ -136,6 +145,14 @@ class UserDataModule < CoreBotModule
     return h
   end
 
+  def delete_data(user, *keys)
+    h = get_data_hash(user)
+    debug h
+    rv = keys.map { |k| h.delete k }
+    set_data_hash(user, h)
+    rv.size == 1 ? rv.first : rv
+  end
+
   def handle_get(m, params)
     user = m.server.get_user(params[:nick]) || m.source
     key = params[:key].intern