github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-06-01 02:34:28 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Better filtering out private messages on user stream.

Browse Source
This commit is contained in:
Robin Ward
2013-02-15 17:08:28 -05:00
parent fc1c120014
commit b440e30f45
2 changed files with 81 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/models/user_action.rb
View File

@ -4,6 +4,7 @@ require_dependency 'sql_builder'
class UserAction < ActiveRecord::Base
belongs_to :user
belongs_to :target_post, :class_name => "Post"
belongs_to :target_topic, :class_name => "Topic"
attr_accessible :acting_user_id, :action_type, :target_topic_id, :target_post_id, :target_user_id, :user_id
validates_presence_of :action_type
@ -38,16 +39,18 @@ class UserAction < ActiveRecord::Base
].each_with_index.to_a.flatten]
def self.stats(user_id, guardian)
results = UserAction.select("action_type, COUNT(*) count, '' description")
results = UserAction.select("action_type, COUNT(*) count, '' AS description")
.joins(:target_topic)
.where(user_id: user_id)
.group('action_type')
.to_a
.group('action_type', 'topics.archetype')
# should push this into the sql at some point, but its simple enough for now
unless guardian.can_see_private_messages?(user_id)
results.reject!{|a| [GOT_PRIVATE_MESSAGE, NEW_PRIVATE_MESSAGE].include?(a.action_type)}
results = results.where('topics.archetype <> ?', Archetype::private_message)
end
results = results.to_a
results.sort!{|a,b| ORDER[a.action_type] <=> ORDER[b.action_type]}
results.each do |row|
row.description = self.description(row.action_type, detailed: true)
@ -100,7 +103,7 @@ JOIN users pu on pu.id = COALESCE(p.user_id, t.user_id)
end
if !guardian.can_see_private_messages?(user_id) || ignore_private_messages
builder.where("a.action_type not in (#{NEW_PRIVATE_MESSAGE},#{GOT_PRIVATE_MESSAGE})")
builder.where("t.archetype != :archetype", archetype: Archetype::private_message)
end
if action_id