FIX: redirect to top wasn't working

This commit is contained in:
Régis Hanol
2017-10-04 22:08:41 +02:00
parent 4aa30cba2e
commit e212435545
3 changed files with 19 additions and 12 deletions

View File

@@ -3,9 +3,12 @@ module Jobs
class UpdateTopRedirection < Jobs::Base
def execute(args)
if user = User.find_by(id: args[:user_id])
user.user_option.update_column(:last_redirected_to_top_at, args[:redirected_at])
end
return if args[:user_id].blank? || args[:redirected_at].blank?
UserOption
.where(user_id: args[:user_id])
.limit(1)
.update_all(last_redirected_to_top_at: args[:redirected_at])
end
end

View File

@@ -77,7 +77,7 @@ class UserOption < ActiveRecord::Base
$redis.expire(key, delay)
# delay the update
Jobs.enqueue_in(delay / 2, :update_top_redirection, user_id: self.id, redirected_at: Time.zone.now)
Jobs.enqueue_in(delay / 2, :update_top_redirection, user_id: self.user_id, redirected_at: Time.zone.now)
end
def should_be_redirected_to_top
@@ -92,10 +92,10 @@ class UserOption < ActiveRecord::Base
return if user.trust_level > 0 && user.last_seen_at && user.last_seen_at > 1.month.ago
# top must be in the top_menu
return unless SiteSetting.top_menu =~ /(^|\|)top(\||$)/i
return unless SiteSetting.top_menu[/\btop\b/i]
# not enough topics
return unless period = SiteSetting.min_redirected_to_top_period(1.days.ago)
return unless period = SiteSetting.min_redirected_to_top_period(1.day.ago)
if !user.seen_before? || (user.trust_level == 0 && !redirected_to_top_yet?)
update_last_redirected_to_top!