about summary refs log tree commit diff
path: root/app/models
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2017-11-30 03:50:05 +0100
committerGitHub <noreply@github.com>2017-11-30 03:50:05 +0100
commit85e97ecab6db67faefb64557af9b2271d2b23735 (patch)
tree1cb8904147f87bcb567e77763e1c1541b1378d61 /app/models
parentdc1ebd45a30d806fcef2dc33679457285ba430b4 (diff)
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
Diffstat (limited to 'app/models')
-rw-r--r--app/models/account.rb4
1 files changed, 4 insertions, 0 deletions
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)