app/controllers/items_controller.rb

@@ -71,12 +71,9 @@ class ItemsController < ApplicationController
         @basic_colored_pet_types_by_species_id = PetType.special_color_or_basic(@item.special_color).
           includes_child_translations.group_by(&:species)
 
-        trading_closet_hangers = @item.closet_hangers.trading.newest.
-          user_is_active.includes(:user)
-
         @trading_closet_hangers_by_owned = {
-          true => trading_closet_hangers.filter { |c| c.owned? },
+          true => @item.closet_hangers.owned_trading.newest.includes(:user),
-          false => trading_closet_hangers.filter { |c| c.wanted? },
+          false => @item.closet_hangers.wanted_trading.newest.includes(:user)
         }
 
         if user_signed_in?

app/models/closet_hanger.rb

@@ -46,10 +46,20 @@ class ClosetHanger < ApplicationRecord
   scope :newest, -> { order(arel_table[:created_at].desc) }
   scope :owned_before_wanted, -> { order(arel_table[:owned].desc) }
   scope :unlisted, -> { where(:list_id => nil) }
-  scope :user_is_active, -> {
+
-    u = User.arel_table
+  {:owned => true, :wanted => false}.each do |name, owned|
-    joins(:user).where(u[:last_trade_activity_at].gteq(6.months.ago))
+    scope "#{name}_trading", -> {
-  }
+      joins(:user).includes(:list).
+        where(:owned => owned).
+        where((
+          arel_table[:list_id].eq(nil).and(
+            User.arel_table["#{name}_closet_hangers_visibility"].gteq(ClosetVisibility[:trading].id)
+          )
+          ).or(
+          ClosetList.arel_table[:visibility].gteq(ClosetVisibility[:trading].id)
+        ))
+      }
+  end
 
   before_validation :merge_quantities, :set_owned_by_list
 
@@ -64,10 +74,6 @@ class ClosetHanger < ApplicationRecord
     possibly_null_closet_list.trading?
   end
 
-  def wanted?
-    !owned?
-  end
-
   def possibly_null_list_id=(list_id_or_owned)
     if list_id_or_owned.to_s == 'true' || list_id_or_owned.to_s == 'false'
       self.list_id = nil