diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2020-05-28 13:44:57 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2020-05-28 13:44:57 +0200 |
| commit | ef6bfaf12ed9ac71ea9912c79dcbad8b2b6ea260 (patch) | |
| tree | 0e381b3df9405d665dc22fd5081de913bfd83907 /app/models | |
| parent | ead09f5ddc73034fcd573b459868dd1ca13b647a (diff) | |
| parent | 57e5e656877604f813bfe511f7b248326ad36ad2 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/import.rb | 2 | ||||
| -rw-r--r-- | app/models/status.rb | 2 |
2 files changed, 2 insertions, 2 deletions
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) |