60dc2cc12e
* Fixing weighted query hotness grab logic Prior to this commit, I carried over (albeit imprecisely) logic from the LargeForemExperimental. That logic was to help limit articles to those that were published since the user's latest page view. However, I introduced a bug in this transcription. Now both LargeForemExperimental and WeightedQueryStrategy use the same logic to determine the oldest publication date to search for in the feed. This resolves a bug reported where users were not seeing a large number of items in their feed. Incidentally, if a forem has little activity in the 18 hours, there might be very few items in the feed. I believe, going forward, we may need to better parameterize how many hours is considered "stale since last page view". Related to #15240 * Fixing implementation detail * Extracting helper method Prior to this commit, I had introduced a method an put it in a less ideal module space. This commit extracts that method to a more readily shareable module space. I've added a few more specs to help clarify and verify behavior. * Updating documentation * Renaming and documenting variables/constants * Fixing that which I broke
92 lines
3.7 KiB
Ruby
92 lines
3.7 KiB
Ruby
module Stories
|
|
class FeedsController < ApplicationController
|
|
respond_to :json
|
|
|
|
def show
|
|
@page = (params[:page] || 1).to_i
|
|
@stories = assign_feed_stories
|
|
|
|
add_pinned_article
|
|
end
|
|
|
|
private
|
|
|
|
def add_pinned_article
|
|
return if params[:timeframe].present?
|
|
|
|
pinned_article = PinnedArticle.get
|
|
return if pinned_article.nil? || @stories.detect { |story| story.id == pinned_article.id }
|
|
|
|
@stories.prepend(pinned_article.decorate)
|
|
end
|
|
|
|
def assign_feed_stories
|
|
stories = if params[:timeframe].in?(Timeframe::FILTER_TIMEFRAMES)
|
|
timeframe_feed
|
|
elsif params[:timeframe] == Timeframe::LATEST_TIMEFRAME
|
|
latest_feed
|
|
elsif user_signed_in?
|
|
signed_in_base_feed
|
|
else
|
|
signed_out_base_feed
|
|
end
|
|
|
|
ArticleDecorator.decorate_collection(stories)
|
|
end
|
|
|
|
def signed_in_base_feed
|
|
strategy = AbExperiment.get(experiment: :feed_strategy, controller: self, user: current_user,
|
|
default_value: "original")
|
|
feed = if strategy.weighted_query_strategy?
|
|
Articles::Feeds::WeightedQueryStrategy.new(user: current_user, page: @page, tags: params[:tag])
|
|
elsif Settings::UserExperience.feed_strategy == "basic"
|
|
Articles::Feeds::Basic.new(user: current_user, page: @page, tag: params[:tag])
|
|
else
|
|
Articles::Feeds::LargeForemExperimental.new(user: current_user, page: @page, tag: params[:tag])
|
|
end
|
|
Datadog.tracer.trace("feed.query",
|
|
span_type: "db",
|
|
resource: "#{self.class}.#{__method__}",
|
|
tags: { feed_class: feed.class.to_s.dasherize }) do
|
|
# Hey, why the to_a you say? Because the
|
|
# LargeForemExperimental has already done this. But the
|
|
# weighted strategy has not. I also don't want to alter the
|
|
# weighted query implementation as it returns a lovely
|
|
# ActiveRecord::Relation. So this is a compromise.
|
|
feed.more_comments_minimal_weight_randomized.to_a
|
|
end
|
|
end
|
|
|
|
def signed_out_base_feed
|
|
strategy = AbExperiment.get(experiment: :feed_strategy, controller: self, user: current_user,
|
|
default_value: "original")
|
|
feed = if strategy.weighted_query_strategy?
|
|
Articles::Feeds::WeightedQueryStrategy.new(user: current_user, page: @page, tags: params[:tag])
|
|
elsif Settings::UserExperience.feed_strategy == "basic"
|
|
# I'm a bit uncertain why we're skipping the user on this call.
|
|
Articles::Feeds::Basic.new(user: nil, page: @page, tag: params[:tag])
|
|
else
|
|
Articles::Feeds::LargeForemExperimental.new(user: current_user, page: @page, tag: params[:tag])
|
|
end
|
|
Datadog.tracer.trace("feed.query",
|
|
span_type: "db",
|
|
resource: "#{self.class}.#{__method__}",
|
|
tags: { feed_class: feed.class.to_s.dasherize }) do
|
|
# Hey, why the to_a you say? Because the
|
|
# LargeForemExperimental has already done this. But the
|
|
# weighted strategy has not. I also don't want to alter the
|
|
# weighted query implementation as it returns a lovely
|
|
# ActiveRecord::Relation. So this is a compromise.
|
|
feed.default_home_feed(user_signed_in: false).to_a
|
|
end
|
|
end
|
|
|
|
def timeframe_feed
|
|
Articles::Feeds::Timeframe.call(params[:timeframe], tag: params[:tag], page: @page)
|
|
end
|
|
|
|
def latest_feed
|
|
Articles::Feeds::Latest.call(tag: params[:tag], page: @page)
|
|
end
|
|
end
|
|
end
|