diff options
| author | Akihiko Odaki <akihiko.odaki.4i@stu.hosei.ac.jp> | 2017-05-21 20:32:13 +0900 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2017-05-21 13:32:13 +0200 |
| commit | 2af5cd96fee1718324061bf44f043022a3648572 (patch) | |
| tree | 033532138b901928a4cb4223697fdce82c31e3b5 /app/models/concerns/account_interactions.rb | |
| parent | 860f408475c864425f431d13db558dcb65e95de6 (diff) | |
Fix mutes_controller error and incorrect statuses_controller report (#3202)
This commit fixes a regression in commit f55480756337dd4df7513e89673e81e003f1201a.
Diffstat (limited to 'app/models/concerns/account_interactions.rb')
| -rw-r--r-- | app/models/concerns/account_interactions.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/models/concerns/account_interactions.rb b/app/models/concerns/account_interactions.rb index 0ef7512e2..de5979958 100644 --- a/app/models/concerns/account_interactions.rb +++ b/app/models/concerns/account_interactions.rb @@ -50,6 +50,8 @@ module AccountInteractions # Mute relationships has_many :mute_relationships, class_name: 'Mute', foreign_key: 'account_id', dependent: :destroy has_many :muting, -> { order('mutes.id desc') }, through: :mute_relationships, source: :target_account + has_many :muted_by_relationships, class_name: 'Mute', foreign_key: :target_account_id, dependent: :destroy + has_many :muted_by, -> { order('mutes.id desc') }, through: :muted_by_relationships, source: :account has_many :conversation_mutes, dependent: :destroy has_many :domain_blocks, class_name: 'AccountDomainBlock', dependent: :destroy end |