Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Hide comments when parent resource is hidden #13554

Open
wants to merge 13 commits into
base: develop
Choose a base branch
from
Open

Hide comments when parent resource is hidden #13554

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
50266ff
Hide comments when parent resource is hidden
andra-panaite Oct 16, 2024
c223f4b
Merge branch 'develop' into fix/hiding-comments-of-hidden-proposal
andra-panaite Oct 17, 2024
cbf2cb1
Resolved comments
andra-panaite Oct 17, 2024
5481230
Merge branch 'develop' into fix/hiding-comments-of-hidden-proposal
andra-panaite Oct 18, 2024
bd3dc3e
Run linter
andra-panaite Oct 18, 2024
c3d34af
Run linter
andra-panaite Oct 18, 2024
11fff59
Added hide_replies method to handle reported comments with replies
andra-panaite Nov 5, 2024
55fc2e2
Run linter
andra-panaite Nov 5, 2024
561c9c5
Merge branch 'develop' into fix/hiding-comments-of-hidden-proposal
alecslupu Nov 19, 2024
0ba887a
Resolved comments
andra-panaite Nov 21, 2024
cff5a94
Fixed tests
andra-panaite Nov 21, 2024
2a76082
Merge branch 'develop' into fix/hiding-comments-of-hidden-proposal
alecslupu Dec 5, 2024
678a036
Fix User case
alecslupu Dec 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Run linter
  • Loading branch information
@andra-panaite
andra-panaite committed Oct 18, 2024
commit bd3dc3eb8047afc34066e54a77c2c52468a53757
2 changes: 1 addition & 1 deletion decidim-ai/lib/decidim/ai/spam_detection/resource/base.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ def error_message(klass, method_name)
end

def resource_hidden?(resource)
resource.class.included_modules.include?(Decidim::Reportable) && resource.hidden? && !spam_reasons.include?(resource.reports&.last.&reason)
resource.class.included_modules.include?(Decidim::Reportable) && resource.hidden? && spam_reasons.exclude?(resource.reports&.last&.reason)
alecslupu marked this conversation as resolved.
Show resolved Hide resolved
alecslupu marked this conversation as resolved.
Show resolved Hide resolved
end

def spam_reasons
alecslupu marked this conversation as resolved.
Show resolved Hide resolved
Expand Down
2 changes: 1 addition & 1 deletion decidim-core/lib/decidim/core/test/shared_examples/reports_examples.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@
expect(comment.reload).to be_hidden

visit decidim.search_path
expect(page).not_to have_content(translated(comment.body))
expect(page).to have_no_content(translated(comment.body))
end
end
end
Expand Down
6 changes: 4 additions & 2 deletions decidim-core/lib/decidim/moderation_tools.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,10 +94,12 @@ def hide_comments!

reportable.comments.each do |comment|
tool = Decidim::ModerationTools.new(comment, @current_user)
tool.create_report!({
unless Decidim::Report.exists?("decidim_moderation_id" => tool.moderation.id, "decidim_user_id" => @current_user.id)
tool.create_report!({
reason: "parent_hidden",
details: I18n.t("report_details", scope: "decidim.reports.parent_hidden")
}) unless Decidim::Report.exists?("decidim_moderation_id" => tool.moderation.id, "decidim_user_id" => @current_user.id)
})
end

tool.hide!
end
Expand Down
3 changes: 1 addition & 2 deletions decidim-core/spec/tasks/upgrade/clean_hidden_resources_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,8 @@
let!(:searchables) { create_list(:searchable_resource, 8, resource_type: "Decidim::Proposals") }

it "it hides the reported resource and associated comments from search results" do
comments = Decidim::Comments::Comment.where("decidim_root_commentable_id" => searchables.collect(&:id).sample(1))
comments = Decidim::Comments::Comment.where("decidim_root_commentable_id" => searchables.collect(&:id).sample(1))
expect { task.execute }.to change(Decidim::SearchableResource, :count).by(-comments.size)
end
end
end

Loading