chinwag/chinwagsocial
2
0
Fork 0
Code Issues Pull requests Releases 2 Wiki Activity

Fix #6331 (#6341)

Browse source 
UserTrackingConcern is circumvented by SessionsController#create
because it calls warden, which calls the User#update_tracked_fields!
method directly. Move returning user logic to that method.
This commit is contained in:
Eugen Rochko 2018-01-23 20:52:30 +01:00 committed by GitHub
parent 4ec9d8b4d9
commit 1cc44cba81
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
app/controllers/concerns/user_tracking_concern.rb
View file

@ -3,7 +3,6 @@
module UserTrackingConcern module UserTrackingConcern
extend ActiveSupport::Concern extend ActiveSupport::Concern
REGENERATE_FEED_DAYS = 14
UPDATE_SIGN_IN_HOURS = 24 UPDATE_SIGN_IN_HOURS = 24
included do included do
@ -14,25 +13,10 @@ module UserTrackingConcern
def set_user_activity def set_user_activity
return unless user_needs_sign_in_update? return unless user_needs_sign_in_update?
# Mark as signed-in today
current_user.update_tracked_fields!(request) current_user.update_tracked_fields!(request)
ActivityTracker.record('activity:logins', current_user.id)
# Regenerate feed if needed
regenerate_feed! if user_needs_feed_update?
end end
def user_needs_sign_in_update? def user_needs_sign_in_update?
user_signed_in? && (current_user.current_sign_in_at.nil? || current_user.current_sign_in_at < UPDATE_SIGN_IN_HOURS.hours.ago) user_signed_in? && (current_user.current_sign_in_at.nil? || current_user.current_sign_in_at < UPDATE_SIGN_IN_HOURS.hours.ago)
end end
def user_needs_feed_update?
current_user.last_sign_in_at < REGENERATE_FEED_DAYS.days.ago
end
def regenerate_feed!
Redis.current.setnx("account:#{current_user.account_id}:regeneration", true) && Redis.current.expire("account:#{current_user.account_id}:regeneration", 1.day.seconds)
RegenerationWorker.perform_async(current_user.account_id)
end
end end

25
app/models/user.rb
View file

@ -129,7 +129,7 @@ class User < ApplicationRecord
new_user = !confirmed? new_user = !confirmed?
super super
update_statistics! if new_user prepare_new_user! if new_user
end end
def confirm! def confirm!
@ -137,7 +137,12 @@ class User < ApplicationRecord
skip_confirmation! skip_confirmation!
save! save!
update_statistics! if new_user prepare_new_user! if new_user
end
def update_tracked_fields!(request)
super
prepare_returning_user!
end end
def promote! def promote!
@ -220,9 +225,23 @@ class User < ApplicationRecord
filtered_languages.reject!(&:blank?) filtered_languages.reject!(&:blank?)
end end
def update_statistics! def prepare_new_user!
BootstrapTimelineWorker.perform_async(account_id) BootstrapTimelineWorker.perform_async(account_id)
ActivityTracker.increment('activity:accounts:local') ActivityTracker.increment('activity:accounts:local')
UserMailer.welcome(self).deliver_later UserMailer.welcome(self).deliver_later
end end
def prepare_returning_user!
ActivityTracker.record('activity:logins', id)
regenerate_feed! if needs_feed_update?
end
def regenerate_feed!
Redis.current.setnx("account:#{account_id}:regeneration", true) && Redis.current.expire("account:#{account_id}:regeneration", 1.day.seconds)
RegenerationWorker.perform_async(account_id)
end
def needs_feed_update?
last_sign_in_at < ACTIVE_DURATION.ago
end
end end