diff options
| author | David Yip <yipdw@member.fsf.org> | 2017-12-06 15:40:59 -0600 |
|---|---|---|
| committer | David Yip <yipdw@member.fsf.org> | 2017-12-06 15:40:59 -0600 |
| commit | f1cbea77a4a52929244198dcbde26d63d837489a (patch) | |
| tree | 82645dbc9eec65f870ce7a211355deb6bdc29f29 /app/presenters/account_relationships_presenter.rb | |
| parent | 21e28a5caa5e92165322c4127c89a6f88e68198a (diff) | |
| parent | 8ca91cef45417947607079118b1af07c9774ae58 (diff) | |
Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-master
Diffstat (limited to 'app/presenters/account_relationships_presenter.rb')
| -rw-r--r-- | app/presenters/account_relationships_presenter.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/presenters/account_relationships_presenter.rb b/app/presenters/account_relationships_presenter.rb index a30558bac..bf1ba3716 100644 --- a/app/presenters/account_relationships_presenter.rb +++ b/app/presenters/account_relationships_presenter.rb @@ -4,7 +4,7 @@ class AccountRelationshipsPresenter attr_reader :following, :followed_by, :blocking, :muting, :requested, :domain_blocking - def initialize(account_ids, current_account_id, options = {}) + def initialize(account_ids, current_account_id, **options) @following = Account.following_map(account_ids, current_account_id).merge(options[:following_map] || {}) @followed_by = Account.followed_by_map(account_ids, current_account_id).merge(options[:followed_by_map] || {}) @blocking = Account.blocking_map(account_ids, current_account_id).merge(options[:blocking_map] || {}) |