diff options
| author | Fire Demon <firedemon@creature.cafe> | 2020-09-17 12:05:45 -0500 |
|---|---|---|
| committer | Fire Demon <firedemon@creature.cafe> | 2020-09-17 12:08:35 -0500 |
| commit | e56e3d187f8ddd3db72fc90c5d200f552d5c1c04 (patch) | |
| tree | 59204082c7f9731d301716f08865f8639149452c /app/presenters | |
| parent | 4a1b8bcf34ce834ee8c30f1ac94c29f4e56a2b41 (diff) | |
[Filters] Merge thread muting and hiding into a single action
Diffstat (limited to 'app/presenters')
| -rw-r--r-- | app/presenters/status_relationships_presenter.rb | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/app/presenters/status_relationships_presenter.rb b/app/presenters/status_relationships_presenter.rb index 260ea48fe..d898a9188 100644 --- a/app/presenters/status_relationships_presenter.rb +++ b/app/presenters/status_relationships_presenter.rb @@ -4,7 +4,7 @@ class StatusRelationshipsPresenter attr_reader :reblogs_map, :favourites_map, :mutes_map, :pins_map, :bookmarks_map - attr_reader :hidden_conversations_map, :hidden_statuses_map + attr_reader :hidden_statuses_map def initialize(statuses, current_account_id = nil, **options) if current_account_id.nil? @@ -14,8 +14,7 @@ class StatusRelationshipsPresenter @mutes_map = {} @pins_map = {} - @hidden_conversations_map = {} - @hidden_statuses_map = {} + @hidden_statuses_map = {} else statuses = statuses.compact status_ids = statuses.flat_map { |s| [s.id, s.reblog_of_id] }.uniq.compact @@ -28,8 +27,7 @@ class StatusRelationshipsPresenter @mutes_map = Status.mutes_map(conversation_ids, current_account_id).merge(options[:mutes_map] || {}) @pins_map = Status.pins_map(pinnable_status_ids, current_account_id).merge(options[:pins_map] || {}) - @hidden_conversations_map = Status.hidden_conversations_map(conversation_ids, current_account_id).merge(options[:hidden_conversations_map] || {}) - @hidden_statuses_map = Status.hidden_statuses_map(status_ids, current_account_id).merge(options[:hidden_statuses_map] || {}) + @hidden_statuses_map = Status.hidden_statuses_map(status_ids, current_account_id).merge(options[:hidden_statuses_map] || {}) end end end |