X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=data%2Frbot%2Fplugins%2Fseen.rb;h=1483062cd206a9f6bcaaa8ccb97a18c7c89f0bd6;hb=783ffa4235330029d661752b1023db635b26f2b3;hp=a8dc1af7b8afc3bdc298f9b6a77f30111b373c34;hpb=d30940cb5ff75cf7eab81f6a588b3b5297a762ad;p=user%2Fhenk%2Fcode%2Fruby%2Frbot.git

diff --git a/data/rbot/plugins/seen.rb b/data/rbot/plugins/seen.rb
index a8dc1af7..1483062c 100644
--- a/data/rbot/plugins/seen.rb
+++ b/data/rbot/plugins/seen.rb
@@ -1,10 +1,17 @@
-Saw = Struct.new("Saw", :nick, :time, :type, :where, :message)
+#-- vim:sw=2:et
+#++
+#
+# :title: Seen Plugin
+#
+# Keep a database of who last said/did what
+
+define_structure :Saw, :nick, :time, :type, :where, :message
 
 class SeenPlugin < Plugin
   def help(plugin, topic="")
     "seen <nick> => have you seen, or when did you last see <nick>"
   end
-  
+
   def privmsg(m)
     unless(m.params =~ /^(\S)+$/)
       m.reply "incorrect usage: " + help(m.plugin)
@@ -21,69 +28,67 @@ class SeenPlugin < Plugin
   end
 
   def listen(m)
+    return unless m.source
     # keep database up to date with who last said what
-    if m.kind_of?(PrivMessage)
+    now = Time.new
+    case m
+    when PrivMessage
       return if m.private?
-      if m.action?
-        @registry[m.sourcenick] = Saw.new(m.sourcenick.dup, Time.new, "ACTION", 
-                                          m.target, m.message.dup)
-      else
-        @registry[m.sourcenick] = Saw.new(m.sourcenick.dup, Time.new, "PUBLIC",
-                                          m.target, m.message.dup)
-      end
-    elsif m.kind_of?(QuitMessage)
-      return if m.address?
-      @registry[m.sourcenick] = Saw.new(m.sourcenick.dup, Time.new, "QUIT", 
-                                        nil, m.message.dup)
-    elsif m.kind_of?(NickMessage)
+      type = m.action? ? 'ACTION' : 'PUBLIC'
+      @registry[m.sourcenick] = Saw.new(m.sourcenick.dup, now, type,
+                                          m.target.to_s, m.message.dup)
+    when QuitMessage
       return if m.address?
-      @registry[m.message] = Saw.new(m.sourcenick.dup, Time.new, "NICK", 
+      @registry[m.sourcenick] = Saw.new(m.sourcenick.dup, now, "QUIT",
                                         nil, m.message.dup)
-      @registry[m.sourcenick] = Saw.new(m.sourcenick.dup, Time.new, "NICK", 
-                                        nil, m.message.dup)
-    elsif m.kind_of?(PartMessage)
+    when NickMessage
       return if m.address?
-      @registry[m.sourcenick] = Saw.new(m.sourcenick.dup, Time.new, "PART", 
-                                        m.target, m.message.dup)
-    elsif m.kind_of?(JoinMessage)
+      saw = Saw.new(m.oldnick, now, "NICK", nil, m.newnick)
+      @registry[m.oldnick] = saw
+      @registry[m.newnick] = saw
+    when PartMessage
       return if m.address?
-      @registry[m.sourcenick] = Saw.new(m.sourcenick.dup, Time.new, "JOIN", 
-                                        m.target, m.message.dup)
-    elsif m.kind_of?(TopicMessage)
+      @registry[m.sourcenick] = Saw.new(m.sourcenick.dup, Time.new, "PART",
+                                        m.target.to_s, m.message.dup)
+    when JoinMessage
       return if m.address?
-      @registry[m.sourcenick] = Saw.new(m.sourcenick.dup, Time.new, "TOPIC", 
-                                        m.target, m.message.dup)
+      @registry[m.sourcenick] = Saw.new(m.sourcenick.dup, Time.new, "JOIN",
+                                        m.target.to_s, m.message.dup)
+    when TopicMessage
+      return if m.address? or m.info_or_set == :info
+      @registry[m.sourcenick] = Saw.new(m.sourcenick.dup, Time.new, "TOPIC",
+                                        m.target.to_s, m.message.dup)
     end
   end
-  
+
   def seen(saw)
     ret = "#{saw.nick} was last seen "
     ago = Time.new - saw.time
-    
+
     if (ago.to_i == 0)
-      ret += "just now, "
+      ret << "just now, "
     else
-      ret += Utils.secs_to_string(ago) + " ago, "
+      ret << Utils.secs_to_string(ago) + " ago, "
     end
 
-    case saw.type
-    when "PUBLIC"
-      ret += "saying #{saw.message}"
-    when "ACTION"
-      ret += "doing #{saw.nick} #{saw.message}"
-    when "NICK"
-      ret += "changing nick from #{saw.nick} to #{saw.message}"
-    when "PART"
-      ret += "leaving #{saw.where}"
-    when "JOIN"
-      ret += "joining #{saw.where}"
-    when "QUIT"
-      ret += "quiting IRC (#{saw.message})"
-    when "TOPIC"
-      ret += "changing the topic of #{saw.where} to #{saw.message}"
+    case saw.type.to_sym
+    when :PUBLIC
+      ret << "saying #{saw.message}"
+    when :ACTION
+      ret << "doing #{saw.nick} #{saw.message}"
+    when :NICK
+      ret << "changing nick from #{saw.nick} to #{saw.message}"
+    when :PART
+      ret << "leaving #{saw.where}"
+    when :JOIN
+      ret << "joining #{saw.where}"
+    when :QUIT
+      ret << "quitting IRC (#{saw.message})"
+    when :TOPIC
+      ret << "changing the topic of #{saw.where} to #{saw.message}"
     end
   end
-  
+
 end
 plugin = SeenPlugin.new
 plugin.register("seen")