diff options
author | Claire <claire.github-309c@sitedethib.com> | 2021-01-26 14:01:30 +0100 |
---|---|---|
committer | Claire <claire.github-309c@sitedethib.com> | 2021-01-26 14:01:30 +0100 |
commit | b81710c02c9d8f27d417aa11b288a5b4e32bd5d5 (patch) | |
tree | 2f5ba10c2eb3c667dab2dfdb77c3d1724677ce87 /app/presenters | |
parent | d1255ab8a5101bc04af4a5214f975edf443a37d9 (diff) | |
parent | 7f1c56954b46b26b4dadfa92047f1ee5d7f9ad0a (diff) |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `CONTRIBUTING.md`: Not a real conflict, glitch-soc quotes the upstream file, which has been changed. Update the quote.
Diffstat (limited to 'app/presenters')
-rw-r--r-- | app/presenters/status_relationships_presenter.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/presenters/status_relationships_presenter.rb b/app/presenters/status_relationships_presenter.rb index f4849d245..70fb2ba90 100644 --- a/app/presenters/status_relationships_presenter.rb +++ b/app/presenters/status_relationships_presenter.rb @@ -15,7 +15,7 @@ class StatusRelationshipsPresenter statuses = statuses.compact status_ids = statuses.flat_map { |s| [s.id, s.reblog_of_id] }.uniq.compact conversation_ids = statuses.filter_map(&:conversation_id).uniq - pinnable_status_ids = statuses.map(&:proper).select { |s| s.account_id == current_account_id && %w(public unlisted).include?(s.visibility) }.map(&:id) + pinnable_status_ids = statuses.map(&:proper).filter_map { |s| s.id if s.account_id == current_account_id && %w(public unlisted).include?(s.visibility) } @reblogs_map = Status.reblogs_map(status_ids, current_account_id).merge(options[:reblogs_map] || {}) @favourites_map = Status.favourites_map(status_ids, current_account_id).merge(options[:favourites_map] || {}) |