gearheads/mastodon
Archived
2
0
Fork 0
Code Releases 4 Activity

Extract user tracking into concern (#2600)

Browse source
This commit is contained in:
Matt Jankowski 2017-04-29 18:28:16 -04:00 • committed by Eugen Rochko
parent 964035b118
commit fdcf884cf7
3 changed files with 90 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

12
app/controllers/application_controller.rb
View file

@ -8,6 +8,7 @@ class ApplicationController < ActionController::Base
force_ssl if: :https_enabled?
include Localized
include UserTrackingConcern
helper_method :current_account
helper_method :single_user_mode?
@ -17,7 +18,6 @@ class ApplicationController < ActionController::Base
rescue_from ActionController::InvalidAuthenticityToken, with: :unprocessable_entity
before_action :store_current_location, except: :raise_not_found, unless: :devise_controller?
before_action :set_user_activity
before_action :check_suspension, if: :user_signed_in?
def raise_not_found
@ -38,16 +38,6 @@ class ApplicationController < ActionController::Base
redirect_to root_path unless current_user&.admin?
end
def set_user_activity
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
end
def check_suspension
head 403 if current_user.account.suspended?
end

30
app/controllers/concerns/user_tracking_concern.rb Normal file
View file

@ -0,0 +1,30 @@
# frozen_string_literal: true
module UserTrackingConcern
extend ActiveSupport::Concern
REGENERATE_FEED_DAYS = 14
UPDATE_SIGN_IN_HOURS = 24
included do
before_action :set_user_activity, if: %i(user_signed_in? user_needs_sign_in_update?)
end
private
def set_user_activity
# Mark as signed-in today
current_user.update_tracked_fields!(request)
# Regenerate feed if needed
RegenerationWorker.perform_async(current_user.account_id) if user_needs_feed_update?
end
def user_needs_sign_in_update?
current_user.current_sign_in_at.nil? || current_user.current_sign_in_at < UPDATE_SIGN_IN_HOURS.hours.ago
end
def user_needs_feed_update?
current_user.last_sign_in_at < REGENERATE_FEED_DAYS.days.ago
end
end