FEATURE: wider search with more context

app/assets/javascripts/discourse/lib/search.js

@@ -21,7 +21,7 @@ Discourse.Search = {
     if (!opts) opts = {};
 
     // Only include the data we have
-    var data = { term: term };
+    var data = { term: term, include_blurbs: 'true' };
     if (opts.typeFilter) data.type_filter = opts.typeFilter;
     if (opts.searchForId) data.search_for_id = true;
 

app/assets/javascripts/discourse/templates/search/topic_result.js.handlebars

@@ -1,3 +1,10 @@
-<a href='{{unbound url}}'>
+<a class='search-link' href='{{unbound url}}'>
+  <span class='topic'>
   {{unbound title}}
+  </span>
+  {{#unless Discourse.Mobile.mobileView}}
+  <span class='blurb'>
+  {{{unbound blurb}}}
+  </span>
+  {{/unless}}
 </a>

app/assets/stylesheets/desktop/header.scss

@@ -65,3 +65,13 @@ and (max-width : 570px) {
     }
   }
 }
+
+.search-link .blurb {
+  color: scale-color($primary, $lightness: 45%);
+  display: block;
+  font-size: 11px;
+}
+
+.d-dropdown#search-dropdown {
+  width: 540px;
+}

config/locales/server.en.yml

@@ -1025,7 +1025,7 @@ en:
     granted_badge: "You earned %{link}"
 
   search:
-    within_post: "#%{post_number} by %{username}: %{excerpt}"
+    within_post: "#%{post_number} by %{username}"
     types:
       category: 'Categories'
       topic: 'Results'

lib/search.rb

@@ -279,17 +279,24 @@ class Search
     end
 
     def aggregate_search
-      cols = ['topics.id', 'topics.title', 'topics.slug']
+      cols = ['topics.id', 'topics.title', 'topics.slug', 'cooked']
       topics = posts_query(@limit, aggregate_search: true)
                 .group(*cols)
                 .pluck('min(posts.post_number)',*cols)
 
+
       topics.each do |t|
+        post_number, topic_id, title, slug, cooked = t
+
+        cooked = SearchObserver::HtmlScrubber.scrub(cooked).squish
+        blurb = SearchResult.blurb(cooked, @term)
+
         @results.add_result(SearchResult.new(type: :topic,
-                                             topic_id: t[1],
+                                             topic_id: topic_id,
-                                             id: t[1],
+                                             id: topic_id,
-                                             title: t[2],
+                                             title: title,
-                                             url: "/t/#{t[3]}/#{t[1]}/#{t[0]}"))
+                                             url: "/t/#{slug}/#{topic_id}/#{post_number}",
+                                             blurb: blurb))
       end
     end
 

lib/search/search_result.rb

@@ -1,3 +1,5 @@
+require 'sanitize'
+
 class Search
 
   class SearchResult
@@ -55,24 +57,23 @@ class Search
       SearchResult.new(type: :topic, topic_id: t.id, id: t.id, title: options[:custom_title] || t.title, url: t.relative_url, blurb: options[:custom_blurb])
     end
 
+    def self.blurb(raw, term)
+      blurb = TextHelper.excerpt(raw, term.split(/\s+/)[0], radius: 100)
+      blurb = TextHelper.truncate(raw, length: 200) if blurb.blank?
+      Sanitize.clean(blurb)
+    end
+
     def self.from_post(p, context, term, include_blurbs=false)
       custom_title =
         if context && context.id == p.topic_id
-          # TODO: rewrite this
-          # 1. convert markdown to text
-          # 2. grab full words
-          excerpt = TextHelper.excerpt(p.raw, term.split(/\s+/)[0], radius: 30)
-          excerpt = TextHelper.truncate(p.raw, length: 50) if excerpt.blank?
           I18n.t("search.within_post",
                  post_number: p.post_number,
-                 username: p.user && p.user.username,
+                 username: p.user && p.user.username
-                 excerpt: excerpt
                 )
         end
       if include_blurbs
         #add a blurb from the post to the search results
-        custom_blurb = TextHelper.excerpt(p.raw, term.split(/\s+/)[0], radius: 100)
+        custom_blurb = blurb(p.raw, term)
-        custom_blurb = TextHelper.truncate(p.raw, length: 200) if custom_blurb.blank?
       end
       if p.post_number == 1
         # we want the topic link when it's the OP

spec/components/search_spec.rb

@@ -34,17 +34,12 @@ describe Search do
       @post = Fabricate(:post, topic: @topic, raw: 'this <b>fun test</b> <img src="bla" title="my image">')
       @indexed = @post.post_search_data.search_data
     end
-    it "should include body in index" do
-      @indexed.should =~ /fun/
-    end
-    it "should include title in index" do
-      @indexed.should =~ /sam/
-    end
-    it "should include category in index" do
-      @indexed.should =~ /america/
-    end
 
-    it "should pick up on title updates" do
+    it "should index correctly" do
+      @indexed.should =~ /fun/
+      @indexed.should =~ /sam/
+      @indexed.should =~ /america/
+
       @topic.title = "harpi is the new title"
       @topic.save!
       @post.post_search_data.reload
@@ -186,8 +181,8 @@ describe Search do
       it 'returns the post' do
         result.should be_present
         result[:title].should == topic.title
-
         result[:url].should == topic.relative_url + "/2"
+        result[:blurb].should == "this reply has no quotes"
       end
     end