From 1d793fcc490f2c44f845049d74979cd1791edfbf Mon Sep 17 00:00:00 2001
From: CSammy <github@csammy.net>
Date: Mon, 15 Aug 2016 04:35:46 +0200
Subject: [PATCH] Reused tag stream query for tag pages.

---
 lib/stream/tag.rb           | 20 ++++++++++----------
 spec/lib/stream/tag_spec.rb |  2 +-
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/lib/stream/tag.rb b/lib/stream/tag.rb
index d8f3ba06b..53372ba57 100644
--- a/lib/stream/tag.rb
+++ b/lib/stream/tag.rb
@@ -29,7 +29,16 @@ class Stream::Tag < Stream::Base
   end
 
   def posts
-    @posts ||= construct_post_query
+    @posts ||= if user
+                 StatusMessage.user_tag_stream(user, tag.id)
+               else
+                 StatusMessage.public_tag_stream(tag.id)
+               end
+  end
+
+  def stream_posts
+    return [] unless tag
+    super
   end
 
   def tag_name=(tag_name)
@@ -42,13 +51,4 @@ class Stream::Tag < Stream::Base
   def publisher_opts
     {:open => true}
   end
-
-  def construct_post_query
-    posts = if user.present?
-              StatusMessage.owned_or_visible_by_user(user)
-            else
-              StatusMessage.all_public
-            end
-    posts.tagged_with(tag_name, :any => true)
-  end
 end
diff --git a/spec/lib/stream/tag_spec.rb b/spec/lib/stream/tag_spec.rb
index 5e1205c83..7bcbf559a 100644
--- a/spec/lib/stream/tag_spec.rb
+++ b/spec/lib/stream/tag_spec.rb
@@ -80,7 +80,7 @@ describe Stream::Tag do
 
   describe 'shared behaviors' do
     before do
-      @stream = Stream::Tag.new(FactoryGirl.create(:user), "test")
+      @stream = Stream::Tag.new(FactoryGirl.create(:user), FactoryGirl.create(:tag).name)
     end
     it_should_behave_like 'it is a stream'
   end