diff --git a/app/controllers/collections/columns/streams_controller.rb b/app/controllers/collections/columns/streams_controller.rb index 16a2bf671..6ff567c9b 100644 --- a/app/controllers/collections/columns/streams_controller.rb +++ b/app/controllers/collections/columns/streams_controller.rb @@ -2,7 +2,7 @@ class Collections::Columns::StreamsController < ApplicationController include CollectionScoped def show - set_page_and_extract_portion_from @collection.cards.awaiting_triage.reverse_chronologically.with_golden_first + set_page_and_extract_portion_from @collection.cards.awaiting_triage.by_last_activity.with_golden_first fresh_when etag: [ @collection, @page.records ] end end diff --git a/app/controllers/collections_controller.rb b/app/controllers/collections_controller.rb index d14f26c32..005bf595c 100644 --- a/app/controllers/collections_controller.rb +++ b/app/controllers/collections_controller.rb @@ -51,7 +51,7 @@ class CollectionsController < ApplicationController end def show_columns - set_page_and_extract_portion_from @collection.cards.awaiting_triage.reverse_chronologically.with_golden_first + set_page_and_extract_portion_from @collection.cards.awaiting_triage.by_last_activity.with_golden_first fresh_when etag: [ @collection, @page.records, @user_filtering ] end diff --git a/app/controllers/public/collections/columns/streams_controller.rb b/app/controllers/public/collections/columns/streams_controller.rb index 18a90aa83..904cab2e5 100644 --- a/app/controllers/public/collections/columns/streams_controller.rb +++ b/app/controllers/public/collections/columns/streams_controller.rb @@ -6,7 +6,7 @@ class Public::Collections::Columns::StreamsController < ApplicationController layout "public" def show - set_page_and_extract_portion_from @collection.cards.awaiting_triage.reverse_chronologically.with_golden_first + set_page_and_extract_portion_from @collection.cards.awaiting_triage.by_last_activity.with_golden_first # To enable caching at intermediate proxies during traffic spikes expires_in 5.seconds, public: true diff --git a/app/controllers/public/collections_controller.rb b/app/controllers/public/collections_controller.rb index 0aacb1f3f..1e208f766 100644 --- a/app/controllers/public/collections_controller.rb +++ b/app/controllers/public/collections_controller.rb @@ -6,7 +6,7 @@ class Public::CollectionsController < ApplicationController layout "public" def show - set_page_and_extract_portion_from @collection.cards.awaiting_triage.reverse_chronologically.with_golden_first + set_page_and_extract_portion_from @collection.cards.awaiting_triage.by_last_activity.with_golden_first # To enable caching at intermediate proxies during traffic spikes expires_in 5.seconds, public: true diff --git a/app/models/card.rb b/app/models/card.rb index 2368d10ed..83a96dd6a 100644 --- a/app/models/card.rb +++ b/app/models/card.rb @@ -17,6 +17,7 @@ class Card < ApplicationRecord scope :reverse_chronologically, -> { order created_at: :desc, id: :desc } scope :chronologically, -> { order created_at: :asc, id: :asc } scope :latest, -> { order updated_at: :desc, id: :desc } + scope :by_last_activity, -> { order last_active_at: :desc, id: :desc } scope :indexed_by, ->(index) do case index