From 85e97ecab6db67faefb64557af9b2271d2b23735 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Thu, 30 Nov 2017 03:50:05 +0100
Subject: Fix too many forwards (#5854)

* Avoid sending explicit Undo->Announce when original deleted

* Do not forward a reply back to the server that sent it

* Deduplicate inboxes of rebloggers' followers for delete forwarding

* Adjust test

* Fix wrong class, bad SQL, wrong variable, outdated comment
---
 app/models/account.rb | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'app/models/account.rb')

diff --git a/app/models/account.rb b/app/models/account.rb
index f3f604eda..b6d46b2cc 100644
--- a/app/models/account.rb
+++ b/app/models/account.rb
@@ -214,6 +214,10 @@ class Account < ApplicationRecord
     Rails.cache.fetch("exclude_domains_for:#{id}") { domain_blocks.pluck(:domain) }
   end
 
+  def preferred_inbox_url
+    shared_inbox_url.presence || inbox_url
+  end
+
   class << self
     def readonly_attributes
       super - %w(statuses_count following_count followers_count)
-- 
cgit