weather plugin: fix 163

[user/henk/code/ruby/rbot.git] / data / rbot / plugins / factoids.rb

diff --git a/data/rbot/plugins/factoids.rb b/data/rbot/plugins/factoids.rb
index 395ca6dcb6c4d7eaf2fd6a690d451315d79d726a..38793bec3c0df22a23d3b1ae501c1ae7490bb5b3 100644 (file)
--- a/data/rbot/plugins/factoids.rb
+++ b/data/rbot/plugins/factoids.rb
@@ -20,8 +20,27 @@ class FactoidsPlugin < Plugin
       end
     end
 
-    def to_s
-      @hash[:fact]
+    def to_s(opts={})
+      show_meta = opts[:meta]
+      fact = @hash[:fact]
+      if !show_meta
+        return fact
+      end
+      meta = ""
+      metadata = []
+      if @hash[:who]
+        metadata << _("from %{who}" % @hash)
+      end
+      if @hash[:when]
+        metadata << _("on %{when}" % @hash)
+      end
+      if @hash[:where]
+        metadata << _("in %{where}" % @hash)
+      end
+      unless metadata.empty?
+        meta << _(" [%{data}]" % {:data => metadata.join(" ")})
+      end
+      return fact+meta
     end
 
     def [](*args)
@@ -142,25 +161,53 @@ class FactoidsPlugin < Plugin
       :who => m.source.fullform,
       :where => m.channel.to_s
     )
-    if @factoids.index(factoid)
-      m.reply _("I already know that %{factoid}" % { :factoid => factoid })
+    if idx = @factoids.index(factoid)
+      m.reply _("I already know that %{factoid} [#%{idx}]" % {
+        :factoid => factoid,
+        :idx => idx
+      })
     else
       @factoids << factoid
       @changed = true
       m.okay
+      fact(m, :index => @factoids.length.to_s)
     end
   end
 
   def forget(m, params)
-    factoid = params[:stuff].to_s
-    if @factoids.delete(factoid)
-      @changed = true
-      m.okay
+    if params[:index]
+      idx = params[:index].scan(/\d+/).first.to_i
+      total = @factoids.length
+      if idx <= 0 or idx > total
+        m.reply _("please select a fact number between 1 and %{total}" % { :total => total })
+        return
+      end
+      if factoid = @factoids.delete_at(idx-1)
+        m.reply _("I forgot that %{factoid}" % { :factoid => factoid })
+        @changed = true
+      else
+        m.reply _("I couldn't delete factoid %{idx}" % { :idx => idx })
+      end
     else
-      m.reply _("I didn't know that %{factoid}" % { :factoid => factoid })
+      factoid = params[:stuff].to_s
+      if @factoids.delete(factoid)
+        @changed = true
+        m.okay
+      else
+        m.reply _("I didn't know that %{factoid}" % { :factoid => factoid })
+      end
     end
   end
 
+  def long_fact(fact,index=nil,total=@factoids.length)
+    idx = index || @factoids.index(fact)+1
+    _("fact #%{idx} of %{total}: %{fact}" % {
+      :idx => idx,
+      :total => total,
+      :fact => fact.to_s(:meta => true)
+    })
+  end
+
   def facts(m, params)
     total = @factoids.length
     if params[:words].empty?
@@ -168,11 +215,12 @@ class FactoidsPlugin < Plugin
     else
       rx = Regexp.new(params[:words].to_s, true)
       known = @factoids.grep(rx)
+      reply = []
       if known.empty?
-        m.reply _("I know nothing about %{words}" % params)
+        reply << _("I know nothing about %{words}" % params)
       else
         # TODO config
-        max_facts = 3
+        max_facts = 5
         len = known.length
         if len > max_facts
           m.reply _("%{len} out of %{total} facts refer to %{words}, I'll only show %{max}" % {
@@ -181,9 +229,15 @@ class FactoidsPlugin < Plugin
             :words => params[:words].to_s,
             :max => max_facts
           })
+          while known.length > max_facts
+            known.delete_one
+          end
         end
-        [max_facts, len].min.times { m.reply known.delete_one }
+        known.each { |f|
+          reply << long_fact(f)
+        }
       end
+      m.reply reply.join(" -- ")
     end
   end
 
@@ -217,26 +271,7 @@ class FactoidsPlugin < Plugin
       fact = known.pick_one
       idx = @factoids.index(fact)+1
     end
-    meta = nil
-    metadata = []
-    if fact[:who]
-      metadata << _("from %{who}" % fact.to_hash)
-    end
-    if fact[:when]
-      metadata << _("on %{when}" % fact.to_hash)
-    end
-    if fact[:where]
-      metadata << _("in %{where}" % fact.to_hash)
-    end
-    unless metadata.empty?
-      meta = _(" [learnt %{data}]" % {:data => metadata.join(" ")})
-    end
-    m.reply _("fact #%{idx} of %{total}: %{fact}%{meta}" % {
-      :idx => idx,
-      :total => total,
-      :fact => fact,
-      :meta => meta
-    })
+    m.reply long_fact(fact, idx, total)
   end
 
   def edit_fact(m, params)
@@ -305,6 +340,7 @@ plugin.default_auth('import', false)
 
 plugin.map 'learn that *stuff'
 plugin.map 'forget that *stuff', :auth_path => 'edit'
+plugin.map 'forget fact :index', :requirements => { :index => /^#?\d+$/ }, :auth_path => 'edit'
 plugin.map 'facts [about *words]'
 plugin.map 'fact [about *words]'
 plugin.map 'fact :index', :requirements => { :index => /^#?\d+$/ }