diff options
| -rw-r--r-- | app/mailers/redstoner_mailer.rb | 2 | ||||
| -rw-r--r-- | app/models/message.rb | 9 |
2 files changed, 8 insertions, 3 deletions
diff --git a/app/mailers/redstoner_mailer.rb b/app/mailers/redstoner_mailer.rb index f804440..db7841f 100644 --- a/app/mailers/redstoner_mailer.rb +++ b/app/mailers/redstoner_mailer.rb @@ -48,6 +48,6 @@ class RedstonerMailer < ActionMailer::Base def new_message_mail(user, message) @user = user @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 diff --git a/app/models/message.rb b/app/models/message.rb index 8480e48..0634b6b 100644 --- a/app/models/message.rb +++ b/app/models/message.rb @@ -7,6 +7,8 @@ class Message < ActiveRecord::Base validates_presence_of :user_sender, :user_target, :text, on: :create + validates_length_of :text, in: 1..8000 + def sender @sender ||= if self.user_sender.present? user_sender @@ -16,8 +18,11 @@ class Message < ActiveRecord::Base end def target - # can be nil - @target ||= user_target + @target ||= if self.user_target.present? + user_target + else + User.first + end end def send_new_message_mail |