diff options
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/concerns/.keep | 0 | ||||
| -rw-r--r-- | app/models/domain_block.rb | 2 | ||||
| -rw-r--r-- | app/models/import.rb | 8 | ||||
| -rw-r--r-- | app/models/status.rb | 4 |
4 files changed, 11 insertions, 3 deletions
diff --git a/app/models/concerns/.keep b/app/models/concerns/.keep deleted file mode 100644 index e69de29bb..000000000 --- a/app/models/concerns/.keep +++ /dev/null diff --git a/app/models/domain_block.rb b/app/models/domain_block.rb index 3548ccd69..89c81f766 100644 --- a/app/models/domain_block.rb +++ b/app/models/domain_block.rb @@ -3,6 +3,8 @@ class DomainBlock < ApplicationRecord enum severity: [:silence, :suspend] + attr_accessor :retroactive + validates :domain, presence: true, uniqueness: true def self.blocked?(domain) diff --git a/app/models/import.rb b/app/models/import.rb index 3013bc50e..85f6ca4bd 100644 --- a/app/models/import.rb +++ b/app/models/import.rb @@ -1,13 +1,15 @@ # frozen_string_literal: true class Import < ApplicationRecord + FILE_TYPES = ['text/plain', 'text/csv'].freeze + self.inheritance_column = false - enum type: [:following, :blocking, :muting] + belongs_to :account, required: true - belongs_to :account + enum type: [:following, :blocking, :muting] - FILE_TYPES = ['text/plain', 'text/csv'].freeze + validates :type, presence: true has_attached_file :data, url: '/system/:hash.:extension', hash_secret: ENV['PAPERCLIP_SECRET'] validates_attachment_content_type :data, content_type: FILE_TYPES diff --git a/app/models/status.rb b/app/models/status.rb index 22d93947a..5393acfcc 100644 --- a/app/models/status.rb +++ b/app/models/status.rb @@ -110,6 +110,10 @@ class Status < ApplicationRecord results end + def non_sensitive_with_media? + !sensitive? && media_attachments.any? + end + class << self def as_home_timeline(account) where(account: [account] + account.following) |