diff options
| author | ThibG <thib@sitedethib.com> | 2021-01-11 13:44:57 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-11 13:44:57 +0100 |
| commit | a7a47834e50645746355e2b9a88244c1804c73cd (patch) | |
| tree | 3b81b1d2a4b2c2d2e4b29948c72a7995a21fa449 /app/presenters | |
| parent | d42e7e01dcd464f80637682d4eee6e5a7f36f26e (diff) | |
| parent | 31e68bf3d35b80e794c1a44b3d60dabcf10f2a3d (diff) | |
Merge pull request #1483 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
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 3cc905a75..f4849d245 100644 --- a/app/presenters/status_relationships_presenter.rb +++ b/app/presenters/status_relationships_presenter.rb @@ -14,7 +14,7 @@ class StatusRelationshipsPresenter else statuses = statuses.compact status_ids = statuses.flat_map { |s| [s.id, s.reblog_of_id] }.uniq.compact - conversation_ids = statuses.map(&:conversation_id).compact.uniq + 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) @reblogs_map = Status.reblogs_map(status_ids, current_account_id).merge(options[:reblogs_map] || {}) |