detect spam registrations + include account approvals/rejections in transparancy log

1 files changed, 9 insertions, 8 deletions

diff --git a/app/models/user.rb b/app/models/user.rb
index a0786aa69..11289a0a5 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -198,7 +198,7 @@ class User < ApplicationRecord
     if new_user && approved?
       prepare_new_user!
     elsif new_user
-      notify_staff_about_pending_account!
+      RegistrationJanitorWorker.perform_async(id)
     end
   end
 
@@ -242,6 +242,14 @@ class User < ApplicationRecord
     save!
   end
 
+  def notify_staff_about_pending_account!
+    LogWorker.perform_async("\xf0\x9f\x86\x95 New account <#{Account.find(account_id).username}> is awaiting admin approval.\n\nReview (moderators only): https://#{Rails.configuration.x.web_domain || Rails.configuration.x.local_domain}/admin/pending_accounts")
+    User.staff.includes(:account).each do |u|
+      next unless u.allows_pending_account_emails?
+      AdminMailer.new_pending_account(u.account, self).deliver_later
+    end
+  end
+
   def wants_larger_menus?
     @wants_larger_menus ||= (settings.larger_menus || false)
   end
@@ -496,13 +504,6 @@ class User < ApplicationRecord
     regenerate_feed! if needs_feed_update?
   end
 
-  def notify_staff_about_pending_account!
-    User.staff.includes(:account).each do |u|
-      next unless u.allows_pending_account_emails?
-      AdminMailer.new_pending_account(u.account, self).deliver_later
-    end
-  end
-
   def regenerate_feed!
     return unless Redis.current.setnx("account:#{account_id}:regeneration", true)
     Redis.current.expire("account:#{account_id}:regeneration", 1.day.seconds)