Added message length validity (1..8000) and rewrote 'target' method

This commit is contained in:
MrYummy
2017-06-12 21:59:39 +02:00
parent fbae985d86
commit dd63941657
2 changed files with 8 additions and 3 deletions
+1 -1
View File
@@ -48,6 +48,6 @@ class RedstonerMailer < ActionMailer::Base
def new_message_mail(user, message) def new_message_mail(user, message)
@user = user @user = user
@message = message @message = message
mail(to: @user.email, subject: "#{message.user_sender.name} sent you a new message.") mail(to: @user.email, subject: "#{message.user_sender.name} sent you a new message")
end end
end end
+7 -2
View File
@@ -7,6 +7,8 @@ class Message < ActiveRecord::Base
validates_presence_of :user_sender, :user_target, :text, on: :create validates_presence_of :user_sender, :user_target, :text, on: :create
validates_length_of :text, in: 1..8000
def sender def sender
@sender ||= if self.user_sender.present? @sender ||= if self.user_sender.present?
user_sender user_sender
@@ -16,8 +18,11 @@ class Message < ActiveRecord::Base
end end
def target def target
# can be nil @target ||= if self.user_target.present?
@target ||= user_target user_target
else
User.first
end
end end
def send_new_message_mail def send_new_message_mail