From 99f78ad10c163a64c588868003fb3dff75aea799 Mon Sep 17 00:00:00 2001 From: nyanpasu Date: Thu, 19 May 2016 08:59:59 +0800 Subject: [PATCH] Send pm instead of email on invite disable --- app/mailers/disable_invite_notification.rb | 16 ---------------- app/models/user.rb | 12 +++++++++++- .../disable_invite_notification/notify.text.erb | 6 ------ 3 files changed, 11 insertions(+), 23 deletions(-) delete mode 100644 app/mailers/disable_invite_notification.rb delete mode 100644 app/views/disable_invite_notification/notify.text.erb diff --git a/app/mailers/disable_invite_notification.rb b/app/mailers/disable_invite_notification.rb deleted file mode 100644 index 1f4d4bc..0000000 --- a/app/mailers/disable_invite_notification.rb +++ /dev/null @@ -1,16 +0,0 @@ -class DisableInviteNotification < ActionMailer::Base - default :from => "#{Rails.application.name} " << - "" - - def notify(user, mod, reason) - @mod = mod - @reason = reason - - mail( - :from => "#{@mod.username} ", - :replyto => "#{@mod.username} <#{@mod.email}>", - :to => user.email, - :subject => "[#{Rails.application.name}] Your invite privileges have been removed" - ) - end -end diff --git a/app/models/user.rb b/app/models/user.rb index 653a008..7927195 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -115,7 +115,17 @@ class User < ActiveRecord::Base self.disabled_invite_by_user_id = disabler.id self.disabled_invite_reason = reason - DisableInviteNotification.notify(self, disabler, reason) + msg = Message.new + msg.deleted_by_author = true + msg.author_user_id = disabler.id + msg.recipient_user_id = self.id + msg.subject = "Your invite privileges have been revoked" + msg.body = "The reason given:\n" << + "\n" << + "> *#{reason}*\n" << + "\n" << + "*This is an automated message.*" + msg.save m = Moderation.new m.moderator_user_id = disabler.id diff --git a/app/views/disable_invite_notification/notify.text.erb b/app/views/disable_invite_notification/notify.text.erb deleted file mode 100644 index df7634e..0000000 --- a/app/views/disable_invite_notification/notify.text.erb +++ /dev/null @@ -1,6 +0,0 @@ -Invitations have been disabled for you on <%= Rails.application.name %> by <%= @mod.username %> for: - - <%= word_wrap(@reason, :line_width => 72).gsub(/\n/, "\n ") %> - -You can no longer allowed send invites. If you wish, you can discuss this with -the moderator by replying to this e-mail.