From 50f7616d0491091bf575e962f4652b56bdfcd61c Mon Sep 17 00:00:00 2001
From: Sam <sam.saffron@gmail.com>
Date: Fri, 18 Mar 2016 16:26:20 +1100
Subject: [PATCH] FIX: include pinned status in search results

---
 app/controllers/search_controller.rb | 2 ++
 lib/search/grouped_search_results.rb | 8 ++++++++
 2 files changed, 10 insertions(+)

diff --git a/app/controllers/search_controller.rb b/app/controllers/search_controller.rb
index 0b857278f03..92380185d26 100644
--- a/app/controllers/search_controller.rb
+++ b/app/controllers/search_controller.rb
@@ -25,6 +25,8 @@ class SearchController < ApplicationController
     search = Search.new(params[:q], search_args)
     result = search.execute
 
+    result.find_user_data(guardian)
+
     serializer = serialize_data(result, GroupedSearchResultSerializer, result: result)
 
     respond_to do |format|
diff --git a/lib/search/grouped_search_results.rb b/lib/search/grouped_search_results.rb
index 387696c300c..2fa450bb745 100644
--- a/lib/search/grouped_search_results.rb
+++ b/lib/search/grouped_search_results.rb
@@ -25,6 +25,14 @@ class Search
       @users = []
     end
 
+    def find_user_data(guardian)
+      if user = guardian.user
+        topics = @posts.map(&:topic)
+        topic_lookup = TopicUser.lookup_for(user, topics)
+        topics.each { |ft| ft.user_data = topic_lookup[ft.id] }
+      end
+    end
+
     def blurb(post)
       GroupedSearchResults.blurb_for(post.cooked, @term, @blurb_length)
     end