FIX: use allowlist and blocklist terminology (#10209)

This is a PR of the renaming whitelist to allowlist and blacklist to the blocklist.

script/import_scripts/base.rb

@@ -70,7 +70,7 @@ class ImportScripts::Base
 
   def get_site_settings_for_import
     {
-      email_domains_blacklist: '',
+      blocked_email_domains: '',
       min_topic_title_length: 1,
       min_post_length: 1,
       min_first_post_length: 1,

script/import_scripts/friendsmegplus.rb

@@ -68,12 +68,12 @@ class ImportScripts::FMGP < ImportScripts::Base
     @usermap = {}
 
     # G+ user IDs to filter out (spam, abuse) — no topics or posts, silence and suspend when creating
-    # loaded from blacklist.json as array of google ids `[ 92310293874, 12378491235293 ]`
-    @blacklist = Set[]
+    # loaded from blocklist.json as array of google ids `[ 92310293874, 12378491235293 ]`
+    @blocklist = Set[]
 
     # G+ user IDs whose posts are useful; if this is set, include only
-    # posts (and non-blacklisted comments) authored by these IDs
-    @whitelist = nil
+    # posts (and non-blocklisted comments) authored by these IDs
+    @allowlist = nil
 
     # Tags to apply to every topic; empty Array to not have any tags applied everywhere
     @globaltags = [ "gplus" ]
@@ -117,10 +117,10 @@ class ImportScripts::FMGP < ImportScripts::Base
         @categories = load_fmgp_json(arg)
       elsif arg.end_with?("usermap.json")
         @usermap = load_fmgp_json(arg)
-      elsif arg.end_with?('blacklist.json')
-        @blacklist = load_fmgp_json(arg).map { |i| i.to_s }.to_set
-      elsif arg.end_with?('whitelist.json')
-        @whitelist = load_fmgp_json(arg).map { |i| i.to_s }.to_set
+      elsif arg.end_with?('blocklist.json')
+        @blocklist = load_fmgp_json(arg).map { |i| i.to_s }.to_set
+      elsif arg.end_with?('allowlist.json')
+        @allowlist = load_fmgp_json(arg).map { |i| i.to_s }.to_set
       elsif arg.end_with?('.json')
         @feeds << load_fmgp_json(arg)
       elsif arg == '--dry-run'
@@ -149,8 +149,8 @@ class ImportScripts::FMGP < ImportScripts::Base
     @posts_imported = 0
     @topics_skipped = 0
     @posts_skipped = 0
-    @topics_blacklisted = 0
-    @posts_blacklisted = 0
+    @blocked_topics = 0
+    @blocked_posts = 0
     # count uploaded file size
     @totalsize = 0
 
@@ -324,10 +324,10 @@ class ImportScripts::FMGP < ImportScripts::Base
             newuser.approved = true
             newuser.approved_by_id = @system_user.id
             newuser.approved_at = newuser.created_at
-            if @blacklist.include?(id.to_s)
+            if @blocklist.include?(id.to_s)
               now = DateTime.now
               forever = 1000.years.from_now
-              # you can suspend as well if you want your blacklist to
+              # you can suspend as well if you want your blocklist to
               # be hard to recover from
               #newuser.suspended_at = now
               #newuser.suspended_till = forever
@@ -348,7 +348,7 @@ class ImportScripts::FMGP < ImportScripts::Base
         # user already on system
         u = User.find(google_user_info.user_id)
         if u.silenced? || u.suspended?
-          @blacklist.add(id)
+          @blocklist.add(id)
         end
         @users[id] = u
         email = u.email
@@ -371,7 +371,7 @@ class ImportScripts::FMGP < ImportScripts::Base
             category["posts"].each do |post|
               # G+ post / Discourse topic
               import_topic(post, category)
-              print("\r#{@topics_imported}/#{@posts_imported} topics/posts (skipped: #{@topics_skipped}/#{@posts_skipped} blacklisted: #{@topics_blacklisted}/#{@posts_blacklisted})       ")
+              print("\r#{@topics_imported}/#{@posts_imported} topics/posts (skipped: #{@topics_skipped}/#{@posts_skipped} blocklisted: #{@blocked_topics}/#{@blocked_posts})       ")
             end
           end
         end
@@ -389,13 +389,13 @@ class ImportScripts::FMGP < ImportScripts::Base
       @topics_skipped += 1
     else
       # new post
-      if !@whitelist.nil? && !@whitelist.include?(post["author"]["id"])
-        # only ignore non-whitelisted if whitelist defined
+      if !@allowlist.nil? && !@allowlist.include?(post["author"]["id"])
+        # only ignore non-allowlisted if allowlist defined
         return
       end
       postmap = make_postmap(post, category, nil)
       if postmap.nil?
-        @topics_blacklisted += 1
+        @blocked_topics += 1
         return
       end
       p = create_post(postmap, postmap[:id]) if !@dryrun
@@ -409,7 +409,7 @@ class ImportScripts::FMGP < ImportScripts::Base
       else
         commentmap = make_postmap(comment, nil, p)
         if commentmap.nil?
-          @posts_blacklisted += 1
+          @blocked_posts += 1
         else
           @posts_imported += 1
           new_comment = create_post(commentmap, commentmap[:id]) if !@dryrun
@@ -420,7 +420,7 @@ class ImportScripts::FMGP < ImportScripts::Base
 
   def make_postmap(post, category, parent)
     post_author_id = post["author"]["id"]
-    return nil if @blacklist.include?(post_author_id.to_s)
+    return nil if @blocklist.include?(post_author_id.to_s)
 
     raw = formatted_message(post)
     # if no message, image, or images, it's just empty

script/import_scripts/smf1.rb

@@ -497,10 +497,10 @@ class ImportScripts::Smf1 < ImportScripts::Base
   def import_banned_domains
     puts "", "Importing banned email domains..."
 
-    blacklist = SiteSetting.email_domains_blacklist.split("|")
+    blocklist = SiteSetting.blocked_email_domains.split("|")
     banned_domains = mysql_query("SELECT SUBSTRING(email_address, 3) domain FROM smf_ban_items WHERE email_address RLIKE '^%@[^%]+$' GROUP BY email_address").map { |r| r["domain"] }
 
-    SiteSetting.email_domains_blacklist = (blacklist + banned_domains).uniq.sort.join("|")
+    SiteSetting.blocked_email_domains = (blocklist + banned_domains).uniq.sort.join("|")
   end
 
   def import_banned_emails