X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=data%2Frbot%2Fplugins%2Fnote.rb;h=e0a7be293a05a192375e4aed7e03cebe72ad347c;hb=8b811d21babf8f9e5a10a953b595d55ebd08820d;hp=66e0c1ecd75fbad043f22a1b71894e9f5a4080e9;hpb=8e055d24373d965a568431c6bacc71019553a953;p=user%2Fhenk%2Fcode%2Fruby%2Frbot.git

diff --git a/data/rbot/plugins/note.rb b/data/rbot/plugins/note.rb
index 66e0c1ec..e0a7be29 100644
--- a/data/rbot/plugins/note.rb
+++ b/data/rbot/plugins/note.rb
@@ -9,30 +9,56 @@
 # License:: MIT license
 
 class NotePlugin < Plugin
+
   Note = Struct.new('Note', :time, :from, :private, :text)
 
-  def help(plugin, topic="")
-    "note <nick> <string> => stores a note (<string>) for <nick>"
+  Config.register Config::BooleanValue.new 'note.private_message',
+    :default => false,
+    :desc => 'Send all notes in private messages instead of channel messages.'
+
+  def initialize
+    super
+    return if @registry.length < 1
+    debug 'Checking registry for old-formatted notes...'
+    n = 0
+    @registry.keys.each do |key|
+      unless key == key.downcase
+        @registry[key.downcase] = @registry[key] + (@registry[key.downcase] || [])
+        @registry.delete key
+        n += 1
+      end
+    end
+    debug "#{n} entries converted and merged."
+  end
+
+  def help(plugin, topic='')
+    'note <nick> <string> => stores a note (<string>) for <nick>'
   end
 
   def message(m)
     begin
-      return unless @registry.has_key? m.sourcenick
+      nick = m.sourcenick.downcase
+      # Keys are case insensitive to avoid storing a message
+      # for <person> instead of <Person> or visa-versa.
+      return unless @registry.has_key? nick
       pub = []
       priv = []
-      @registry[m.sourcenick].each do |n|
-        s = "[#{n.time.strftime('%H:%M')}] <#{n.from}> #{n.text}"
-        (n.private ? priv : pub).push s
+      @registry[nick].each do |n|
+        s = "[#{n.time.strftime('%b-%e %H:%M')}] <#{n.from}> #{n.text}"
+        if n.private or @bot.config['note.private_message']
+          priv << s
+        else
+          pub << s
+        end
       end
-      if !pub.empty?
+      unless pub.empty?
         @bot.say m.replyto, "#{m.sourcenick}, you have notes! " +
           pub.join(' ')
       end
-
-      if !priv.empty?
-        @bot.say m.sourcenick, "you have notes! " + priv.join(' ')
+      unless priv.empty?
+        @bot.say m.sourcenick, 'you have notes! ' + priv.join(' ')
       end
-      @registry.delete m.sourcenick
+      @registry.delete nick
     rescue Exception => e
       m.reply e.message
     end
@@ -40,11 +66,12 @@ class NotePlugin < Plugin
 
   def note(m, params)
     begin
-      q = @registry[params[:nick]] || Array.new
+      nick = params[:nick].downcase
+      q = @registry[nick] || Array.new
       s = params[:string].to_s.strip
       raise 'cowardly discarding the empty note' if s.empty?
       q.push Note.new(Time.now, m.sourcenick, m.private?, s)
-      @registry[params[:nick]] = q
+      @registry[nick] = q
       m.okay
     rescue Exception => e
       m.reply "error: #{e.message}"