Fix mastodon#2120 - Use Status#as_tag_timeline on public hashtag page (…

…mastodon#2182) * Fix mastodon#2120 - Use Status#as_tag_timeline on public hashtag page * Update tags_controller.rb
satzz · Apr 20, 2017 · cae2a26 · cae2a26
1 parent b79ba3d
commit cae2a26
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/app/controllers/tags_controller.rb b/app/controllers/tags_controller.rb
@@ -4,8 +4,8 @@ class TagsController < ApplicationController
   layout 'public'
 
   def show
-    @tag      = Tag.find_by!(name: params[:id].downcase)
-    @statuses = @tag.statuses.order('id desc').paginate_by_max_id(20, params[:max_id])
+    @tag      = Tag.find_by(name: params[:id].downcase)
+    @statuses = @tag.nil? ? [] : Status.as_tag_timeline(@tag, current_account, params[:local]).paginate_by_max_id(20, params[:max_id])
     @statuses = cache_collection(@statuses, Status)
   end
 end