Skip to content

A platform for community discussion. Free, open, simple.

MT: Ensure bulk-imported users are approved

Gerhard Schlagerb96e5e60fa32
diff --git a/script/bulk_import/base.rb b/script/bulk_import/base.rb
index 72ef2fce77d..1b8b546274d 100644
--- a/script/bulk_import/base.rb
+++ b/script/bulk_import/base.rb
@@ -564,6 +564,9 @@ class BulkImport::Base
trust_level
admin
moderator
+ approved
+ approved_at
+ approved_by_id
date_of_birth
ip_address
registration_ip_address
@@ -1390,6 +1393,12 @@ class BulkImport::Base
user[:last_emailed_at] ||= NOW
user[:created_at] ||= NOW
user[:updated_at] ||= user[:created_at]
+
+ user[:approved] = true if user[:approved].nil?
+ if user[:approved]
+ user[:approved_at] ||= user[:created_at]
+ user[:approved_by_id] ||= Discourse::SYSTEM_USER_ID
+ end
user[:suspended_at] ||= user[:suspended_at]
user[:suspended_till] ||= user[:suspended_till] ||
(200.years.from_now if user[:suspended_at].present?)
diff --git a/script/bulk_import/generic_bulk.rb b/script/bulk_import/generic_bulk.rb
index a635a866088..3107afca5ff 100644
--- a/script/bulk_import/generic_bulk.rb
+++ b/script/bulk_import/generic_bulk.rb
@@ -603,6 +603,9 @@ class BulkImport::Generic < BulkImport::Base
last_seen_at: to_datetime(row["last_seen_at"]),
admin: row["admin"],
moderator: row["moderator"],
+ approved: row["approved"].nil? ? nil : row["approved"] == 1,
+ approved_at: to_datetime(row["approved_at"]),
+ approved_by_id: user_id_from_imported_id(row["approved_by_id"]),
suspended_at: suspended_at,
suspended_till: suspended_till,
trust_level: row["trust_level"],