-
-
Notifications
You must be signed in to change notification settings - Fork 125
feat: add media contribution site awards, only for non-dev community contributions #4828
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.
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
Merged
wescopeland
merged 9 commits into
RetroAchievements:master
from
wescopeland:game-screenshot-awards
May 6, 2026
Merged
Changes from 8 commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
e192017
feat: add media contribution site awards
wescopeland bebc2ae
chore: swap tiers
wescopeland 7585ea4
feat: only consider community contributions
wescopeland ee645a7
fix: update tiers
wescopeland e57d5c3
refactor: simplify
wescopeland 80c067f
Merge branch 'master' into game-screenshot-awards
wescopeland 55cc085
fix: show badge progress in the tooltip
wescopeland 58aa5ea
fix: address feedback
wescopeland 30a2cea
Merge branch 'master' into game-screenshot-awards
wescopeland File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
68 changes: 68 additions & 0 deletions
68
app/Platform/Actions/RevalidateMediaContributionBadgeEligibilityAction.php
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,68 @@ | ||
| <?php | ||
|
|
||
| declare(strict_types=1); | ||
|
|
||
| namespace App\Platform\Actions; | ||
|
|
||
| use App\Community\Enums\AwardType; | ||
| use App\Models\GameScreenshot; | ||
| use App\Models\PlayerBadge; | ||
| use App\Models\User; | ||
| use App\Platform\Events\SiteBadgeAwarded; | ||
|
|
||
| class RevalidateMediaContributionBadgeEligibilityAction | ||
| { | ||
| public function execute(User $user): ?PlayerBadge | ||
| { | ||
| $eligibleCount = GameScreenshot::query() | ||
| ->eligibleForMediaContributionBy($user) | ||
| ->count(); | ||
| $expectedTier = PlayerBadge::getNewBadgeTier(AwardType::MediaContribution, 0, $eligibleCount); | ||
|
|
||
| $existingBadges = $user->playerBadges() | ||
| ->where('award_type', AwardType::MediaContribution) | ||
| ->orderByDesc('award_key') | ||
| ->get(); | ||
|
|
||
| if ($expectedTier === null) { | ||
| // Media contribution badges represent current community screenshot credit. | ||
| // If later dev activity makes those screenshots ineligible, remove the badge. | ||
| if ($existingBadges->isNotEmpty()) { | ||
| PlayerBadge::whereKey($existingBadges->modelKeys())->delete(); | ||
| } | ||
|
|
||
| return null; | ||
| } | ||
|
|
||
| $previousHighestBadge = $existingBadges->first(); | ||
|
|
||
| // If only some screenshots stopped counting, keep the earned tier that still | ||
| // matches current eligibility and remove any higher tiers. | ||
| $tooHighIds = $existingBadges | ||
| ->where('award_key', '>', $expectedTier) | ||
| ->modelKeys(); | ||
| if ($tooHighIds) { | ||
| PlayerBadge::whereKey($tooHighIds)->delete(); | ||
| } | ||
|
|
||
| $expectedBadge = $existingBadges->first( | ||
| fn (PlayerBadge $badge) => $badge->award_key === $expectedTier && $badge->award_tier === 0, | ||
| ); | ||
| if ($expectedBadge) { | ||
| return $expectedBadge; | ||
| } | ||
|
|
||
| $newBadge = AddSiteAward( | ||
| user: $user, | ||
| awardType: AwardType::MediaContribution, | ||
| data: $expectedTier, | ||
| displayOrder: $previousHighestBadge?->order_column ?? PlayerBadge::getNextDisplayOrder($user), | ||
| ); | ||
|
|
||
| if ($previousHighestBadge === null || $newBadge->award_key > $previousHighestBadge->award_key) { | ||
| SiteBadgeAwarded::dispatch($newBadge); | ||
| } | ||
|
|
||
| return $newBadge; | ||
| } | ||
| } |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.