Skip to content

AO3-7182 Hide restricted works from guests on prompts page #5685

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
luis-pabon-tf wants to merge 12 commits into
base: master
Choose a base branch
from
+28 −2
Open

AO3-7182 Hide restricted works from guests on prompts page #5685

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
56da2a8
If the user is a guest, fulfilled prompt works display as restricted
luis-pabon-tf Mar 28, 2026
feba22b
Added scopes for pulling the fulfilled and restricted claims
luis-pabon-tf Apr 1, 2026
d90677b
Updated prompt notice to look better when there's multiple restricted…
luis-pabon-tf Apr 1, 2026
8a307b5
Style - Lambda can be one line
luis-pabon-tf Apr 1, 2026
b51471c
Change lock imagetag to match other code
luis-pabon-tf Apr 1, 2026
8740292
Updated the hash syntax
luis-pabon-tf Apr 1, 2026
b41ec5d
Do not render the "Fulfilled By" box for guests if there are no unres…
luis-pabon-tf Apr 12, 2026
adb54b9
Remove newly unused string
luis-pabon-tf Apr 12, 2026
7a17a64
Change new scope to be chainable and have a more fitting name
luis-pabon-tf Apr 22, 2026
4e634e2
Use empty check instead of count where possible
luis-pabon-tf Apr 22, 2026
67e22b1
Added feature test for restricted challenge claims
luis-pabon-tf Apr 25, 2026
af9d279
Clean up feature test based on feedback
luis-pabon-tf Apr 27, 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/challenge_claim.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,8 @@ def self.order_by_offering_pseud(dir="ASC")
CollectionItem.user_approval_statuses[:approved], CollectionItem.collection_approval_statuses[:approved])
}

# TODO: AO3-6024 for making sure we also exclude works hidden by admin
scope :work_visible_to_all, -> { where("works.restricted = 0") }

scope :posted, -> { joins(WORKS_JOIN).where("challenge_claims.creation_id IS NOT NULL AND works.posted = 1") }

Expand Down
3 changes: 3 additions & 0 deletions app/models/prompt.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,6 +209,9 @@ def fulfilled_claims
self.request_claims.fulfilled
end

def fulfilled_claims_visible_to_all
self.request_claims.fulfilled.work_visible_to_all
end
# Computes the "full" tag set (tag_set + optional_tag_set), and stores the
# result as an instance variable for speed. This is used by the matching
# algorithm, which doesn't change any signup/prompt/tagset information, so
Expand Down
6 changes: 4 additions & 2 deletions app/views/prompts/_prompt_blurb.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,13 +80,15 @@
<% end %>

<% # if prompt has been fulfilled list works %>
<% unless prompt.unfulfilled? %>
<% unless prompt.unfulfilled? || (guest? && prompt.fulfilled_claims_visible_to_all.empty?) %>
<div class="work listbox group">
<h5 class="heading"><%= ts("Fulfilled By")%></h5>
<ul class="index group">
<% prompt.fulfilled_claims.map(&:creation).each do |creation| %>
<% if creation.is_a?(Work) %>
<%= render "works/work_blurb", :work => creation %>
<% unless guest? && creation.restricted %>
<%= render "works/work_blurb", work: creation %>
<% end %>
<% end %>
<% end %>
</ul>
Expand Down
19 changes: 19 additions & 0 deletions features/prompt_memes_b/challenge_promptmeme_posting_fills.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -593,3 +593,22 @@ Feature: Prompt Meme Challenge
And I uncheck "Battle 12 (prompter)"
And I press "Update"
Then I should see "For prompter."

Scenario: When a prompt is filled with a restricted work, the work should only be visible to logged-in users

Given I have Battle 12 prompt meme fully set up
And I am logged in as "myname1"
And I sign up for Battle 12
And I am logged in as "myname2"
And I claim a prompt from "Battle 12"
And I start to fulfill my claim with "Restricted Fill"
And I lock the work
And I press "Post"
When I view prompts for "Battle 12"
Then I should see "Fulfilled By"
Copy link
Copy Markdown
Collaborator

@sarken sarken Apr 25, 2026

Choose a reason for hiding this comment

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

Let's be extra thorough and also check for the work with And I should see "Restricted Fill" (and do the opposite at the end, with And I should not see "Restricted Fill")

And I should see "Restricted Fill"
When I log out
And I go to "Battle 12" collection's page
And I follow "Prompts ("
Then I should not see "Fulfilled By"
And I should not see "Restricted Fill"
Loading