about summary refs log tree commit diff
path: root/app/controllers/settings
diff options
context:
space:
mode:
authorFire Demon <firedemon@creature.cafe>2020-09-20 21:10:14 -0500
committerFire Demon <firedemon@creature.cafe>2020-09-20 22:53:42 -0500
commite3cb18ba7520997a0f605c7f90db258ccccd5e33 (patch)
tree77ad166f04c96b2bf97bf989eabc8ca1fa61948c /app/controllers/settings
parent8ede83b2179488e0a28101033e8ce9e6978ea849 (diff)
parent787d5d728923393f12421a480b3c7aee789a11fe (diff)
Merge remote-tracking branch 'upstream/master' into merge-glitch
Diffstat (limited to 'app/controllers/settings')
-rw-r--r--app/controllers/settings/featured_tags_controller.rb8
1 files changed, 4 insertions, 4 deletions
diff --git a/app/controllers/settings/featured_tags_controller.rb b/app/controllers/settings/featured_tags_controller.rb
index 3a3241425..e9861da56 100644
--- a/app/controllers/settings/featured_tags_controller.rb
+++ b/app/controllers/settings/featured_tags_controller.rb
@@ -6,7 +6,7 @@ class Settings::FeaturedTagsController < Settings::BaseController
   before_action :authenticate_user!
   before_action :set_featured_tags, only: :index
   before_action :set_featured_tag, except: [:index, :create]
-  before_action :set_most_used_tags, only: :index
+  before_action :set_recently_used_tags, only: :index
 
   def index
     @featured_tag = FeaturedTag.new
@@ -20,7 +20,7 @@ class Settings::FeaturedTagsController < Settings::BaseController
       redirect_to settings_featured_tags_path
     else
       set_featured_tags
-      set_most_used_tags
+      set_recently_used_tags
 
       render :index
     end
@@ -41,8 +41,8 @@ class Settings::FeaturedTagsController < Settings::BaseController
     @featured_tags = current_account.featured_tags.order(statuses_count: :desc).reject(&:new_record?)
   end
 
-  def set_most_used_tags
-    @most_used_tags = Tag.most_used(current_account).where.not(id: @featured_tags.map(&:id)).limit(10)
+  def set_recently_used_tags
+    @recently_used_tags = Tag.recently_used(current_account).where.not(id: @featured_tags.map(&:id)).limit(10)
   end
 
   def featured_tag_params