diff --git a/app/models/user.rb b/app/models/user.rb index d23c2d2b..eb78a4d6 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -144,8 +144,6 @@ class User < ApplicationRecord if new_user && approved? prepare_new_user! - elsif new_user - notify_staff_about_pending_account! end end @@ -319,13 +317,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) diff --git a/app/services/report_service.rb b/app/services/report_service.rb index 73bd6694..d8c55eac 100644 --- a/app/services/report_service.rb +++ b/app/services/report_service.rb @@ -9,7 +9,6 @@ class ReportService < BaseService @options = options create_report! - notify_staff! forward_to_origin! if !@target_account.local? && ActiveModel::Type::Boolean.new.cast(@options[:forward]) @report @@ -26,15 +25,6 @@ class ReportService < BaseService ) end - def notify_staff! - return if @report.unresolved_siblings? - - User.staff.includes(:account).each do |u| - next unless u.allows_report_emails? - AdminMailer.new_report(u.account, @report).deliver_later - end - end - def forward_to_origin! ActivityPub::DeliveryWorker.perform_async( payload,