diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2019-04-01 21:28:31 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2019-04-01 21:28:31 +0200 |
| commit | 12dae9d58316bec32adaac016998ab1cf69d2b45 (patch) | |
| tree | 4ddadcc66d07a1edfcfb9ff0f9cda7cf107d6b46 /app/presenters | |
| parent | 925830d11bb5c132e282f82bdb2ca893d87c9c24 (diff) | |
| parent | 120544067fcca4bf6e71ba1ffb276c451c17c656 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - app/models/form/admin_settings.rb - config/locales/ja.yml
Diffstat (limited to 'app/presenters')
| -rw-r--r-- | app/presenters/account_relationships_presenter.rb | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/app/presenters/account_relationships_presenter.rb b/app/presenters/account_relationships_presenter.rb index b05673a3d..e4aaa65f6 100644 --- a/app/presenters/account_relationships_presenter.rb +++ b/app/presenters/account_relationships_presenter.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true class AccountRelationshipsPresenter - attr_reader :following, :followed_by, :blocking, :blocked_by, + attr_reader :following, :followed_by, :blocking, :muting, :requested, :domain_blocking, :endorsed @@ -12,7 +12,6 @@ class AccountRelationshipsPresenter @following = cached[:following].merge(Account.following_map(@uncached_account_ids, @current_account_id)) @followed_by = cached[:followed_by].merge(Account.followed_by_map(@uncached_account_ids, @current_account_id)) @blocking = cached[:blocking].merge(Account.blocking_map(@uncached_account_ids, @current_account_id)) - @blocked_by = cached[:blocked_by].merge(Account.blocked_by_map(@uncached_account_ids, @current_account_id)) @muting = cached[:muting].merge(Account.muting_map(@uncached_account_ids, @current_account_id)) @requested = cached[:requested].merge(Account.requested_map(@uncached_account_ids, @current_account_id)) @domain_blocking = cached[:domain_blocking].merge(Account.domain_blocking_map(@uncached_account_ids, @current_account_id)) @@ -23,7 +22,6 @@ class AccountRelationshipsPresenter @following.merge!(options[:following_map] || {}) @followed_by.merge!(options[:followed_by_map] || {}) @blocking.merge!(options[:blocking_map] || {}) - @blocked_by.merge!(options[:blocked_by_map] || {}) @muting.merge!(options[:muting_map] || {}) @requested.merge!(options[:requested_map] || {}) @domain_blocking.merge!(options[:domain_blocking_map] || {}) @@ -39,7 +37,6 @@ class AccountRelationshipsPresenter following: {}, followed_by: {}, blocking: {}, - blocked_by: {}, muting: {}, requested: {}, domain_blocking: {}, @@ -67,7 +64,6 @@ class AccountRelationshipsPresenter following: { account_id => following[account_id] }, followed_by: { account_id => followed_by[account_id] }, blocking: { account_id => blocking[account_id] }, - blocked_by: { account_id => blocked_by[account_id] }, muting: { account_id => muting[account_id] }, requested: { account_id => requested[account_id] }, domain_blocking: { account_id => domain_blocking[account_id] }, |