diff options
Diffstat (limited to 'app/models/user.rb')
| -rw-r--r-- | app/models/user.rb | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/app/models/user.rb b/app/models/user.rb index 0fbbce1c36e..714c449ffd3 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -1666,9 +1666,7 @@ class User < ApplicationRecord DELETION_DELAY_IN_DAYS = 7.days def delete_async(deleted_by:, params: {}) - is_deleting_own_record = deleted_by.id == id - - if is_deleting_own_record && ::Feature.enabled?(:delay_delete_own_user) + if should_delay_delete?(deleted_by) new_note = format(_("User deleted own account on %{timestamp}"), timestamp: Time.zone.now) self.note = "#{new_note}\n#{note}".strip @@ -2351,6 +2349,11 @@ class User < ApplicationRecord ban end + def should_delay_delete?(deleted_by) + is_deleting_own_record = deleted_by.id == id + is_deleting_own_record && ::Feature.enabled?(:delay_delete_own_user) + end + def pbkdf2? return false unless otp_backup_codes&.any? |