Bump qs from 6.11.0 to 6.11.1

[rails.git] / app / models / message.rb

diff --git a/app/models/message.rb b/app/models/message.rb
index 2a0cea4a1faa7840c10d5b9f2c2f79169a989237..49c11e900898923beb558d78d8d2b6e35845a158 100644 (file)
--- a/app/models/message.rb
+++ b/app/models/message.rb
@@ -1,11 +1,36 @@
-require "validators"
+# == Schema Information
+#
+# Table name: messages
+#
+#  id                :bigint(8)        not null, primary key
+#  from_user_id      :bigint(8)        not null
+#  title             :string           not null
+#  body              :text             not null
+#  sent_on           :datetime         not null
+#  message_read      :boolean          default(FALSE), not null
+#  to_user_id        :bigint(8)        not null
+#  to_user_visible   :boolean          default(TRUE), not null
+#  from_user_visible :boolean          default(TRUE), not null
+#  body_format       :enum             default("markdown"), not null
+#
+# Indexes
+#
+#  messages_from_user_id_idx  (from_user_id)
+#  messages_to_user_id_idx    (to_user_id)
+#
+# Foreign Keys
+#
+#  messages_from_user_id_fkey  (from_user_id => users.id)
+#  messages_to_user_id_fkey    (to_user_id => users.id)
+#
 
-class Message < ActiveRecord::Base
+class Message < ApplicationRecord
   belongs_to :sender, :class_name => "User", :foreign_key => :from_user_id
   belongs_to :recipient, :class_name => "User", :foreign_key => :to_user_id
 
   validates :title, :presence => true, :utf8 => true, :length => 1..255
-  validates :body, :sent_on, :sender, :recipient, :presence => true
+  validates :body, :sent_on, :presence => true
+  validates :title, :body, :characters => true
 
   def self.from_mail(mail, from, to)
     if mail.multipart?