diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2021-01-11 11:55:42 +0100 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2021-01-11 11:55:42 +0100 |
| commit | 33d30632fb627ba1742eff3e0c5fc84ccd156cdb (patch) | |
| tree | b7c15bb354c9d2f0ef25c50ab387007703f599d6 /app/models/concerns/status_threading_concern.rb | |
| parent | d42e7e01dcd464f80637682d4eee6e5a7f36f26e (diff) | |
| parent | 11d603101a7b3389c679b8c155a3cb06203ca31a (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - `app/models/public_feed.rb`: Upstream refactored a bit, glitch-soc had specific code for local-only statuses. Updated glitch-soc's specific code accordingly.
Diffstat (limited to 'app/models/concerns/status_threading_concern.rb')
| -rw-r--r-- | app/models/concerns/status_threading_concern.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/concerns/status_threading_concern.rb b/app/models/concerns/status_threading_concern.rb index a0ead1995..5c04108e4 100644 --- a/app/models/concerns/status_threading_concern.rb +++ b/app/models/concerns/status_threading_concern.rb @@ -83,7 +83,7 @@ module StatusThreadingConcern def find_statuses_from_tree_path(ids, account, promote: false) statuses = Status.with_accounts(ids).to_a account_ids = statuses.map(&:account_id).uniq - domains = statuses.map(&:account_domain).compact.uniq + domains = statuses.filter_map(&:account_domain).uniq relations = relations_map_for_account(account, account_ids, domains) statuses.reject! { |status| StatusFilter.new(status, account, relations).filtered? } |