IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-23 01:16:38 -06:00
Code Issues Packages Projects Releases Wiki Activity

DEV: Don't deactivate suspended users during import

Browse Source 
Otherwise a cleanup job might delete those deactivated users.
This commit is contained in:
Gerhard Schlager 2020-03-11 18:27:37 +01:00
parent 8022e51179
commit ba1b840816
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
script/import_scripts/base.rb
View File

@ -367,8 +367,6 @@ class ImportScripts::Base
if u.custom_fields['import_email'] if u.custom_fields['import_email']
u.suspended_at = Time.zone.at(Time.now) u.suspended_at = Time.zone.at(Time.now)
u.suspended_till = 200.years.from_now u.suspended_till = 200.years.from_now
ban_reason = 'Invalid email address on import'
u.active = false
u.save! u.save!
user_option = u.user_option user_option = u.user_option
@ -377,7 +375,7 @@ class ImportScripts::Base
user_option.email_messages_level = UserOption.email_level_types[:never] user_option.email_messages_level = UserOption.email_level_types[:never]
user_option.save! user_option.save!
if u.save if u.save
StaffActionLogger.new(Discourse.system_user).log_user_suspend(u, ban_reason) StaffActionLogger.new(Discourse.system_user).log_user_suspend(u, 'Invalid email address on import')
else else
Rails.logger.error("Failed to suspend user #{u.username}. #{u.errors.try(:full_messages).try(:inspect)}") Rails.logger.error("Failed to suspend user #{u.username}. #{u.errors.try(:full_messages).try(:inspect)}")
end end