mirror of
https://github.com/discourse/discourse.git
synced 2025-02-25 18:55:32 -06:00
FIX: Don't update User#last_seen_at
when PG is readonly take 2.
This commit is contained in:
@@ -12,7 +12,7 @@ class AdminConstraint
|
||||
provider.current_user &&
|
||||
provider.current_user.admin? &&
|
||||
custom_admin_check(request)
|
||||
rescue Discourse::InvalidAccess
|
||||
rescue Discourse::InvalidAccess, Discourse::ReadOnly
|
||||
false
|
||||
end
|
||||
|
||||
|
@@ -25,6 +25,7 @@ class Auth::DefaultCurrentUserProvider
|
||||
# our current user, return nil if none is found
|
||||
def current_user
|
||||
return @env[CURRENT_USER_KEY] if @env.key?(CURRENT_USER_KEY)
|
||||
raise Discourse::ReadOnly if Discourse.pg_readonly_mode?
|
||||
|
||||
# bypass if we have the shared session header
|
||||
if shared_key = @env['HTTP_X_SHARED_SESSION_KEY']
|
||||
@@ -241,8 +242,6 @@ class Auth::DefaultCurrentUserProvider
|
||||
end
|
||||
|
||||
def should_update_last_seen?
|
||||
return false if Discourse.pg_readonly_mode?
|
||||
|
||||
if @request.xhr?
|
||||
@env["HTTP_DISCOURSE_VISIBLE".freeze] == "true".freeze
|
||||
elsif !!(@env[API_KEY_ENV]) || !!(@env[USER_API_KEY_ENV])
|
||||
|
@@ -9,7 +9,7 @@ class HomePageConstraint
|
||||
provider = Discourse.current_user_provider.new(request.env)
|
||||
homepage = provider&.current_user&.user_option&.homepage || SiteSetting.anonymous_homepage
|
||||
homepage == @filter
|
||||
rescue Discourse::InvalidAccess
|
||||
rescue Discourse::InvalidAccess, Discourse::ReadOnly
|
||||
false
|
||||
end
|
||||
end
|
||||
|
@@ -7,7 +7,7 @@ class StaffConstraint
|
||||
provider.current_user &&
|
||||
provider.current_user.staff? &&
|
||||
custom_staff_check(request)
|
||||
rescue Discourse::InvalidAccess
|
||||
rescue Discourse::InvalidAccess, Discourse::ReadOnly
|
||||
false
|
||||
end
|
||||
|
||||
|
Reference in New Issue
Block a user