mirror of
https://github.com/discourse/discourse.git
synced 2024-11-25 10:20:58 -06:00
FIX: Query the items in the queue to calculate a user's flagged post count. (#14028)
When a staff member clicks on a user's number of flagged posts, we redirect them to the review queue, so it makes sense to count the number of items there to calculate the count. We used to look at post action items to calculate this number, which doesn't match the number of items in the queue if old flags exist.
This commit is contained in:
parent
b2e4c91818
commit
29bb79de37
@ -1220,12 +1220,7 @@ class User < ActiveRecord::Base
|
||||
end
|
||||
|
||||
def number_of_flagged_posts
|
||||
Post.with_deleted
|
||||
.where(user_id: self.id)
|
||||
.where(id: PostAction.where(post_action_type_id: PostActionType.notify_flag_type_ids)
|
||||
.where(disagreed_at: nil)
|
||||
.select(:post_id))
|
||||
.count
|
||||
ReviewableFlaggedPost.where(target_created_by: self.id).count
|
||||
end
|
||||
|
||||
def number_of_rejected_posts
|
||||
|
@ -1649,6 +1649,20 @@ describe User do
|
||||
expect(user.number_of_rejected_posts).to eq(0)
|
||||
end
|
||||
end
|
||||
|
||||
describe '#number_of_flagged_posts' do
|
||||
it 'counts flagged posts from the user' do
|
||||
Fabricate(:reviewable_flagged_post, target_created_by: user)
|
||||
|
||||
expect(user.number_of_flagged_posts).to eq(1)
|
||||
end
|
||||
|
||||
it 'ignores flagged posts from another user' do
|
||||
Fabricate(:reviewable_flagged_post, target_created_by: Fabricate(:user))
|
||||
|
||||
expect(user.number_of_flagged_posts).to eq(0)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
describe "new_user?" do
|
||||
|
Loading…
Reference in New Issue
Block a user