diff options
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/account.rb | 6 | ||||
| -rw-r--r-- | app/models/application_record.rb | 3 | ||||
| -rw-r--r-- | app/models/favourite.rb | 2 | ||||
| -rw-r--r-- | app/models/follow.rb | 2 | ||||
| -rw-r--r-- | app/models/mention.rb | 2 | ||||
| -rw-r--r-- | app/models/status.rb | 2 | ||||
| -rw-r--r-- | app/models/stream_entry.rb | 2 | ||||
| -rw-r--r-- | app/models/user.rb | 2 |
8 files changed, 12 insertions, 9 deletions
diff --git a/app/models/account.rb b/app/models/account.rb index f61f4c765..cc050dfa3 100644 --- a/app/models/account.rb +++ b/app/models/account.rb @@ -1,10 +1,10 @@ -class Account < ActiveRecord::Base +class Account < ApplicationRecord include Targetable # Local users has_one :user, inverse_of: :account - validates :username, uniqueness: { scope: :domain, case_sensitive: false }, if: 'local?' - validates :username, uniqueness: { scope: :domain, case_sensitive: true }, unless: 'local?' + validates :username, presence: true, uniqueness: { scope: :domain, case_sensitive: false }, if: 'local?' + validates :username, presence: true, uniqueness: { scope: :domain, case_sensitive: true }, unless: 'local?' # Avatar upload has_attached_file :avatar, styles: { large: '300x300#', medium: '96x96#', small: '48x48#' }, default_url: 'avatars/missing.png' diff --git a/app/models/application_record.rb b/app/models/application_record.rb new file mode 100644 index 000000000..10a4cba84 --- /dev/null +++ b/app/models/application_record.rb @@ -0,0 +1,3 @@ +class ApplicationRecord < ActiveRecord::Base + self.abstract_class = true +end diff --git a/app/models/favourite.rb b/app/models/favourite.rb index 46310a5ff..6032e539c 100644 --- a/app/models/favourite.rb +++ b/app/models/favourite.rb @@ -1,4 +1,4 @@ -class Favourite < ActiveRecord::Base +class Favourite < ApplicationRecord include Streamable belongs_to :account, inverse_of: :favourites diff --git a/app/models/follow.rb b/app/models/follow.rb index 94263b1a7..456e2c4f4 100644 --- a/app/models/follow.rb +++ b/app/models/follow.rb @@ -1,4 +1,4 @@ -class Follow < ActiveRecord::Base +class Follow < ApplicationRecord include Streamable belongs_to :account diff --git a/app/models/mention.rb b/app/models/mention.rb index 9fefa657a..b39fa2cbb 100644 --- a/app/models/mention.rb +++ b/app/models/mention.rb @@ -1,4 +1,4 @@ -class Mention < ActiveRecord::Base +class Mention < ApplicationRecord belongs_to :account, inverse_of: :mentions belongs_to :status diff --git a/app/models/status.rb b/app/models/status.rb index 7ea92df2c..14a698aae 100644 --- a/app/models/status.rb +++ b/app/models/status.rb @@ -1,4 +1,4 @@ -class Status < ActiveRecord::Base +class Status < ApplicationRecord include Paginable include Streamable diff --git a/app/models/stream_entry.rb b/app/models/stream_entry.rb index 2972d94f6..165f62f20 100644 --- a/app/models/stream_entry.rb +++ b/app/models/stream_entry.rb @@ -1,4 +1,4 @@ -class StreamEntry < ActiveRecord::Base +class StreamEntry < ApplicationRecord include Paginable belongs_to :account, inverse_of: :stream_entries diff --git a/app/models/user.rb b/app/models/user.rb index a80efb50d..71e310cc8 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -1,4 +1,4 @@ -class User < ActiveRecord::Base +class User < ApplicationRecord devise :database_authenticatable, :registerable, :recoverable, :rememberable, :trackable, :validatable belongs_to :account, inverse_of: :user |