app/models/closet_hanger.rb

@@ -19,27 +19,29 @@ class ClosetHanger < ApplicationRecord
   }
   scope :trading, -> {
     ch = arel_table
-    # sigh… our default-lists continue to be a pain
     cl = ClosetList.arel_table
     u = User.arel_table
-    joins(:user).left_outer_joins(:list).where(
-      ch[:list_id].not_eq(nil).and(cl[:visibility].gteq(
+    joins(:user, :list).where(
+      # sigh… our default-lists continue to be a pain
+      (
+        ch[:list_id].not_eq(nil).and(cl[:visibility].gteq(
           ClosetVisibility[:trading].id))
-    ).or(where(
-      (
-        ch[:list_id].eq(nil).and(ch[:owned].eq(true))
-      ).and(
-        u[:owned_closet_hangers_visibility].gteq(
-          ClosetVisibility[:trading].id)
+      ).or(
+        (
+          ch[:list_id].eq(nil).and(ch[:owned].eq(true))
+        ).and(
+          u[:owned_closet_hangers_visibility].gteq(
+            ClosetVisibility[:trading].id)
+        )
+      ).or(
+        (
+          ch[:list_id].eq(nil).and(ch[:owned].eq(false))
+        ).and(
+          u[:wanted_closet_hangers_visibility].gteq(
+            ClosetVisibility[:trading].id)
+        )
       )
-    )).or(where(
-      (
-        ch[:list_id].eq(nil).and(ch[:owned].eq(false))
-      ).and(
-        u[:wanted_closet_hangers_visibility].gteq(
-          ClosetVisibility[:trading].id)
-      )
-    ))
+    )
   }
   scope :newest, -> { order(arel_table[:created_at].desc) }
   scope :owned_before_wanted, -> { order(arel_table[:owned].desc) }

app/views/items/show.html.haml

@@ -35,11 +35,6 @@
           = list_zones @restricted_zones
 
     #trade-hangers
-      - if Time.now < Date.new(2024, 1, 26)
-        %p
-          ✨⏳️
-          %i We now only show recently-updated lists here!
-          ⏳️✨
       - [true, false].each do |owned|
         %p
           %strong