From 2af5cd96fee1718324061bf44f043022a3648572 Mon Sep 17 00:00:00 2001 From: Akihiko Odaki Date: Sun, 21 May 2017 20:32:13 +0900 Subject: Fix mutes_controller error and incorrect statuses_controller report (#3202) This commit fixes a regression in commit f55480756337dd4df7513e89673e81e003f1201a. --- app/models/concerns/account_interactions.rb | 2 ++ 1 file changed, 2 insertions(+) (limited to 'app/models/concerns/account_interactions.rb') 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 -- cgit