Skip to content

AO3-7488 Prevent deleted and spam comments from being resubmitted to Akismet #5844

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

Open
marcus8448 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

AO3-7488 Prevent deleted and spam comments from being resubmitted to Akismet #5844

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
04dfd3f
AO3-7488 Prevent deleted and spam comments from being resubmitted to …
marcus8448 May 30, 2026
de7fdbd
AO3-7488 Use create_invalid to create comments marked as spam
marcus8448 May 30, 2026
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
2 changes: 2 additions & 0 deletions app/models/comment.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -510,6 +510,8 @@ def spam?
end

def submit_spam
return unless approved && !is_deleted

AkismetClient.submit_spam(akismet_attributes)
end

Expand Down
30 changes: 28 additions & 2 deletions spec/models/comment_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -928,22 +928,48 @@ def queue_adapter_for_test
expect(comment.approved).to be_falsey
expect(comment.spam).to be_truthy
end

it "submits the comment to Akismet" do
expect(AkismetClient).to receive(:submit_spam)

comment.mark_as_spam!
end
end

context "when the comment is already marked as spam" do
let(:comment) { create(:comment, approved: false, spam: false) }
let(:comment) { build(:comment, approved: false, spam: true) }

before { comment.save!(validate: false) }

@Bilka2 Bilka2 May 30, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We have create_invalid to make this a bit shorter. But that's a nitpick, so approving anyway, thank you!


it "flags the comment as spam" do
comment.mark_as_spam!
comment.reload
expect(comment.approved).to be_falsey
expect(comment.spam).to be_truthy
end

it "does not resubmit the comment to Akismet" do
expect(AkismetClient).not_to receive(:submit_spam)

comment.mark_as_spam!
end
end

context "when the comment is deleted" do
let(:comment) { create(:comment, approved: true, spam: false, is_deleted: true) }

it "does not submit the comment to akismet" do
expect(AkismetClient).not_to receive(:submit_spam)

comment.mark_as_spam!
end
end
end

describe "#mark_as_ham!" do
let(:comment) { create(:comment, approved: false, spam: true) }
let(:comment) { build(:comment, approved: false, spam: true) }

before { comment.save!(validate: false) }

it "flags the comment as legitimate" do
comment.mark_as_ham!
Expand Down
Loading