diff options
| author | Starfall <admin@plural.cafe> | 2020-05-31 12:56:29 -0500 |
|---|---|---|
| committer | Starfall <admin@plural.cafe> | 2020-05-31 12:56:29 -0500 |
| commit | 76f79dd29909d39f1d36ef48e6892223d59e29d7 (patch) | |
| tree | 8a5ace5fea5cf8a4c6f1c55e01db99a289c4b1e3 /app/models | |
| parent | 0167552bed46508efeed266853a1ee4437e12998 (diff) | |
| parent | ddcd9fe9f0e85b1db12ae584749e680146611f9a (diff) | |
Merge branch 'glitch'
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/form/admin_settings.rb | 1 | ||||
| -rw-r--r-- | app/models/import.rb | 2 | ||||
| -rw-r--r-- | app/models/status.rb | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/app/models/form/admin_settings.rb b/app/models/form/admin_settings.rb index 84a656864..fcec3e686 100644 --- a/app/models/form/admin_settings.rb +++ b/app/models/form/admin_settings.rb @@ -41,6 +41,7 @@ class Form::AdminSettings show_domain_blocks show_domain_blocks_rationale noindex + outgoing_spoilers ).freeze BOOLEAN_KEYS = %i( diff --git a/app/models/import.rb b/app/models/import.rb index a7a0d8065..c78a04d07 100644 --- a/app/models/import.rb +++ b/app/models/import.rb @@ -17,7 +17,7 @@ # class Import < ApplicationRecord - FILE_TYPES = %w(text/plain text/csv).freeze + FILE_TYPES = %w(text/plain text/csv application/csv).freeze MODES = %i(merge overwrite).freeze self.inheritance_column = false diff --git a/app/models/status.rb b/app/models/status.rb index 341f72090..594ae98c0 100644 --- a/app/models/status.rb +++ b/app/models/status.rb @@ -145,7 +145,7 @@ class Status < ApplicationRecord ids << account_id if local? if preloaded.nil? - ids += mentions.where(account: Account.local).pluck(:account_id) + ids += mentions.where(account: Account.local, silent: false).pluck(:account_id) ids += favourites.where(account: Account.local).pluck(:account_id) ids += reblogs.where(account: Account.local).pluck(:account_id) ids += bookmarks.where(account: Account.local).pluck(:account_id) |