diff options
| author | Jenkins <jenkins@jenkins.ninjawedding.org> | 2017-11-30 03:17:12 +0000 |
|---|---|---|
| committer | Jenkins <jenkins@jenkins.ninjawedding.org> | 2017-11-30 03:17:12 +0000 |
| commit | ad46bc9772dfc52c7ed522658eda1a3ef608a7b3 (patch) | |
| tree | 12be46cac80eadcddc3ab122f1bda36d9c67a07c /app/models | |
| parent | d020ed1e05278a4b3e5d1ed60ee03e511bb513e3 (diff) | |
| parent | 4c6b5dbe96b565d3db3cbf0912f3b9911bc3922a (diff) | |
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/account.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/app/models/account.rb b/app/models/account.rb index 19186b697..ffd19fa52 100644 --- a/app/models/account.rb +++ b/app/models/account.rb @@ -216,6 +216,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) |