commit: b510a56c0c3d8c1a48bb295a85b688af94466723
parent: 4c53af64f0b10bc11473df5e3fd1cd7a11b755f6
Author: Eugen Rochko <eugen@zeonfederated.com>
Date: Tue, 4 Apr 2017 02:00:10 +0200
Only call regeneration worker after first login after a 14 day break
Diffstat:
4 files changed, 19 insertions(+), 13 deletions(-)
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
@@ -39,7 +39,14 @@ class ApplicationController < ActionController::Base
end
def set_user_activity
- current_user.touch(:current_sign_in_at) if !current_user.nil? && (current_user.current_sign_in_at.nil? || current_user.current_sign_in_at < 24.hours.ago)
+ return unless !current_user.nil? && (current_user.current_sign_in_at.nil? || current_user.current_sign_in_at < 24.hours.ago)
+
+ # Mark user as signed-in today
+ current_user.update_tracked_fields(request)
+
+ # If the sign in is after a two week break, we need to regenerate their feed
+ RegenerationWorker.perform_async(current_user.account_id) if current_user.last_sign_in_at < 14.days.ago
+ return
end
def check_suspension
diff --git a/app/controllers/oauth/authorizations_controller.rb b/app/controllers/oauth/authorizations_controller.rb
@@ -3,6 +3,7 @@
class Oauth::AuthorizationsController < Doorkeeper::AuthorizationsController
skip_before_action :authenticate_resource_owner!
+ before_action :set_locale
before_action :store_current_location
before_action :authenticate_resource_owner!
@@ -11,4 +12,10 @@ class Oauth::AuthorizationsController < Doorkeeper::AuthorizationsController
def store_current_location
store_location_for(:user, request.url)
end
+
+ def set_locale
+ I18n.locale = current_user.try(:locale) || I18n.default_locale
+ rescue I18n::InvalidLocale
+ I18n.locale = I18n.default_locale
+ end
end
diff --git a/app/models/feed.rb b/app/models/feed.rb
@@ -10,17 +10,9 @@ class Feed
max_id = '+inf' if max_id.blank?
since_id = '-inf' if since_id.blank?
unhydrated = redis.zrevrangebyscore(key, "(#{max_id}", "(#{since_id}", limit: [0, limit], with_scores: true).map(&:last).map(&:to_i)
+ status_map = Status.where(id: unhydrated).cache_ids.map { |s| [s.id, s] }.to_h
- # If we're after most recent items and none are there, we need to precompute the feed
- if unhydrated.empty? && max_id == '+inf' && since_id == '-inf'
- RegenerationWorker.perform_async(@account.id, @type)
- @statuses = Status.send("as_#{@type}_timeline", @account).cache_ids.paginate_by_max_id(limit, nil, nil)
- else
- status_map = Status.where(id: unhydrated).cache_ids.map { |s| [s.id, s] }.to_h
- @statuses = unhydrated.map { |id| status_map[id] }.compact
- end
-
- @statuses
+ unhydrated.map { |id| status_map[id] }.compact
end
private
diff --git a/app/workers/regeneration_worker.rb b/app/workers/regeneration_worker.rb
@@ -5,7 +5,7 @@ class RegenerationWorker
sidekiq_options queue: 'pull', backtrace: true
- def perform(account_id, timeline_type)
- PrecomputeFeedService.new.call(timeline_type, Account.find(account_id))
+ def perform(account_id, _ = :home)
+ PrecomputeFeedService.new.call(:home, Account.find(account_id))
end
end