FEATURE: Log user approvals. (#7121)

app/models/user.rb

@@ -421,6 +421,8 @@ def approve(approved_by, send_mail = true)
       DiscourseEvent.trigger(:user_approved, self)
     end
 
+    StaffActionLogger.new(approved_by).log_user_approve(self)
+
     result
   end
 

app/models/user_history.rb

@@ -84,7 +84,8 @@ def self.actions
       merge_user: 65,
       entity_export: 66,
       change_password: 67,
-      topic_timestamps_changed: 68
+      topic_timestamps_changed: 68,
+      approve_user: 69
     )
   end
 
@@ -147,7 +148,8 @@ def self.staff_actions
       :merge_user,
       :entity_export,
       :change_name,
-      :topic_timestamps_changed
+      :topic_timestamps_changed,
+      :approve_user
     ]
   end
 

app/services/staff_action_logger.rb

@@ -503,6 +503,13 @@ def log_revoke_email(user, reason, opts = {})
     ))
   end
 
+  def log_user_approve(user, opts = {})
+    UserHistory.create!(params(opts).merge(
+      action: UserHistory.actions[:approve_user],
+      target_user_id: user.id
+    ))
+  end
+
   def log_user_deactivate(user, reason, opts = {})
     raise Discourse::InvalidParameters.new(:user) unless user
     UserHistory.create!(params(opts).merge(

config/locales/client.en.yml

@@ -3689,6 +3689,7 @@ en:
             entity_export: "export entity"
             change_name: "change name"
             topic_timestamps_changed: "topic timestamps changed"
+            approve_user: "approved user"
         screened_emails:
           title: "Screened Emails"
           description: "When someone tries to create a new account, the following email addresses will be checked and the registration will be blocked, or some other action performed."

spec/requests/admin/users_controller_spec.rb

@@ -71,6 +71,7 @@
       expect(response.status).to eq(200)
       evil_trout.reload
       expect(evil_trout.approved).to eq(true)
+      expect(UserHistory.where(action: UserHistory.actions[:approve_user], target_user_id: evil_trout.id).count).to eq(1)
     end
   end