Skip to content
Snippets Groups Projects
Commit 68783a93 authored by Dan Notestein's avatar Dan Notestein
Browse files

Merge branch 'jsalyers-order-blacklists' into 'develop'

[JES] Add ordering to blacklists for consistency

See merge request !422
parents 7b0cab06 91130af4
No related branches found
No related tags found
2 merge requests!456Release candidate v1 24,!422[JES] Add ordering to blacklists for consistency
...@@ -8,11 +8,11 @@ SELECT observer_accounts.id AS observer_id, ...@@ -8,11 +8,11 @@ SELECT observer_accounts.id AS observer_id,
JOIN hive_accounts following_accounts ON ((hive_follows.following = following_accounts.id))) JOIN hive_accounts following_accounts ON ((hive_follows.following = following_accounts.id)))
JOIN hive_accounts observer_accounts ON ((hive_follows.follower = observer_accounts.id))) JOIN hive_accounts observer_accounts ON ((hive_follows.follower = observer_accounts.id)))
WHERE hive_follows.blacklisted WHERE hive_follows.blacklisted
UNION UNION ALL
SELECT observer_accounts.id AS observer_id, SELECT observer_accounts.id AS observer_id,
following_accounts.id AS blacklisted_id, following_accounts.id AS blacklisted_id,
following_accounts.name AS blacklisted_name, following_accounts.name AS blacklisted_name,
string_agg(('blacklisted by '::text || (indirect_accounts.name)::text), ','::text) AS source string_agg(('blacklisted by '::text || (indirect_accounts.name)::text), ','::text ORDER BY indirect_accounts.name) AS source
FROM (((hive_follows hive_follows_direct FROM (((hive_follows hive_follows_direct
JOIN hive_follows hive_follows_indirect ON ((hive_follows_direct.following = hive_follows_indirect.follower))) JOIN hive_follows hive_follows_indirect ON ((hive_follows_direct.following = hive_follows_indirect.follower)))
JOIN hive_accounts following_accounts ON ((hive_follows_indirect.following = following_accounts.id))) JOIN hive_accounts following_accounts ON ((hive_follows_indirect.following = following_accounts.id)))
......
Subproject commit 7e65efd650e0d8bc41e194638121ce4b195ae29c Subproject commit 9adc05954e347c3e2441e64c9e0e523d9f21361a
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment