Skip to content

AO3-7325 Don't attach HTML of work to Abuse ticket when reporting bookmarks #5713

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
ScottVenkataraman wants to merge 6 commits into
base: master
Choose a base branch
from
Open

AO3-7325 Don't attach HTML of work to Abuse ticket when reporting bookmarks #5713

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e301d4f
Add exclusion pattern for bookmarks in reported_work_id of abuse_repo…
ScottVenkataraman Apr 7, 2026
467337c
Add tests for abuse report
ScottVenkataraman Apr 20, 2026
a823f0c
Add trailing slash to bookmarks in abuse_report, update test to refle…
ScottVenkataraman Apr 20, 2026
6fb8b87
Update tests to set field without mocks
ScottVenkataraman May 30, 2026
c38b622
Fixing copy paste errors
ScottVenkataraman Jun 2, 2026
b885451
Add trailing slash to url with bookmarks test
ScottVenkataraman Jun 2, 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
5 changes: 3 additions & 2 deletions app/models/abuse_report.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,10 +182,11 @@ def creator_ids
end
end

# ID of the reported work, unless the report is about comment(s) on the work
# ID of the reported work, unless the report is about comment(s) or bookmark(s) on the work
def reported_work_id
comments = url[%r{/comments/}, 0]
url[%r{/works/(\d+)}, 1] if comments.nil?
bookmarks = url[%r{/bookmarks/}, 0]
url[%r{/works/(\d+)}, 1] if comments.nil? && bookmarks.nil?
end

# ID of the reported comment
Expand Down
37 changes: 37 additions & 0 deletions spec/models/abuse_report_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -669,6 +669,43 @@ def queue_adapter_for_test
end
end

describe "#reported_work_id" do
context "for a plain work URL" do
it "returns the work id" do
allow(subject).to receive(:url).and_return("http://archiveofourown.org/works/123/")
expect(subject.reported_work_id).to eq("123")
end
end

context "for a work URL with bookmark-form anchor" do
it "returns the work id" do
allow(subject).to receive(:url).and_return("http://archiveofourown.org/works/123#bookmark-form")
expect(subject.reported_work_id).to eq("123")
end
end

context "for a work URL with comments" do
it "returns nil" do
allow(subject).to receive(:url).and_return("http://archiveofourown.org/works/123/comments/")
Comment thread
ScottVenkataraman marked this conversation as resolved.
Outdated
expect(subject.reported_work_id).to be_nil
end
end

context "for a work URL with bookmarks" do
it "returns nil" do
allow(subject).to receive(:url).and_return("http://archiveofourown.org/works/123/bookmarks/")
expect(subject.reported_work_id).to be_nil
end
end

context "for a work URL with a specific bookmark" do
it "returns nil" do
allow(subject).to receive(:url).and_return("http://archiveofourown.org/works/123/bookmarks/456/")
expect(subject.reported_work_id).to be_nil
end
end
end

describe "#creator_ids" do
it "returns no creator ids for non-work URLs" do
allow(subject).to receive(:url).and_return("http://archiveofourown.org/users/someone/")
Expand Down
Loading