From 9f22be286554b0015a48b976ce6956a26638a767 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Fri, 20 Mar 2015 11:32:28 -0400 Subject: [PATCH] Restrict User Directory results more based on privacy --- app/models/directory_item.rb | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/app/models/directory_item.rb b/app/models/directory_item.rb index facd8d48745..759e1b1d81a 100644 --- a/app/models/directory_item.rb +++ b/app/models/directory_item.rb @@ -44,11 +44,16 @@ class DirectoryItem < ActiveRecord::Base LEFT OUTER JOIN user_actions AS ua ON ua.user_id = u.id LEFT OUTER JOIN topics AS t ON ua.target_topic_id = t.id LEFT OUTER JOIN posts AS p ON ua.target_post_id = p.id + LEFT OUTER JOIN categories AS c ON t.category_id = c.id WHERE u.active AND NOT u.blocked AND COALESCE(ua.created_at, :since) >= :since AND t.deleted_at IS NULL + AND COALESCE(t.visible, true) + AND COALESCE(t.archetype, 'regular') = 'regular' AND p.deleted_at IS NULL + AND NOT (COALESCE(p.hidden, false)) + AND NOT COALESCE(c.read_restricted, false) AND u.id > 0 GROUP BY u.id", period_type: period_types[period_type],