X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=data%2Frbot%2Fplugins%2Fsearch.rb;h=aec8b1345611a2994a23f711e3573664ed7c6f81;hb=890cd1f8817a7ff8ad995d78091696429730a7c7;hp=95b88a0c9f52577e510689e6bb41f422ed043f3f;hpb=58fa16fbb206c87dc54d401307b6822f5952c15e;p=user%2Fhenk%2Fcode%2Fruby%2Frbot.git

diff --git a/data/rbot/plugins/search.rb b/data/rbot/plugins/search.rb
index 95b88a0c..aec8b134 100644
--- a/data/rbot/plugins/search.rb
+++ b/data/rbot/plugins/search.rb
@@ -91,16 +91,19 @@ class SearchPlugin < Plugin
       return
     end
     results = wml.scan(GOOGLE_WAP_LINK)
+
     if results.length == 0
       m.reply "no results found for #{what}"
       return
     end
+
     single ||= (results.length==1)
+
     urls = Array.new
     n = 0
     results = results[0...hits].map { |res|
       n += 1
-      t = Utils.decode_html_entities res[2].gsub(filter, '').strip
+      t = res[2].ircify_html(:img => "[%{src} %{alt} %{dimensions}]").strip
       u = URI.unescape(res[0] || res[1])
       urls.push(u)
       "%{n}%{b}%{t}%{b}%{sep}%{u}" % {
@@ -108,20 +111,22 @@ class SearchPlugin < Plugin
         :sep => (single ? " -- " : ": "),
         :b => Bold, :t => t, :u => u
       }
-    }.join(" | ")
+    }
 
     if params[:lucky]
       m.reply results.first
       return
     end
 
+    result_string = results.join(" | ")
+
     # If we return a single, full result, change the output to a more compact representation
     if single
-      m.reply "Result for %s: %s -- %s" % [what, results, Utils.get_first_pars(urls, first_pars)], :overlong => :truncate
+      m.reply "Result for %s: %s -- %s" % [what, result_string, Utils.get_first_pars(urls, first_pars)], :overlong => :truncate
       return
     end
 
-    m.reply "Results for #{what}: #{results}", :split_at => /\s+\|\s+/
+    m.reply "Results for #{what}: #{result_string}", :split_at => /\s+\|\s+/
 
     return unless first_pars > 0