ignore unofficial achievements

RetroAchievements · Feb 1, 2025 · afa7fd1 · afa7fd1
1 parent a97b32d
commit afa7fd1
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 3 deletions.
diff --git a/app/Filament/Resources/EventResource/RelationManagers/AchievementsRelationManager.php b/app/Filament/Resources/EventResource/RelationManagers/AchievementsRelationManager.php
@@ -94,12 +94,12 @@ public function table(Table $table): Table
                         $numberOfAchievements = (int) $data['numberOfAchievements'];
                         /** @var Event $event */
                         $event = $this->getOwnerRecord();
-                        $user_id = $event->achievements->first()?->achievement->user_id ?? EventAchievement::RAEVENTS_USER_ID;
+                        $user_id = $event->publishedAchievements->first()?->achievement->user_id ?? EventAchievement::RAEVENTS_USER_ID;
 
                         (new AddAchievementsToEventAction())->execute($event, $numberOfAchievements, $user_id);
 
                         Notification::make()
-                            ->title("Created $numberOfAchievements new " . Str::Plural('achievement', $numberOfAchievements))
+                            ->title("Created $numberOfAchievements new " . Str::plural('achievement', $numberOfAchievements))
                             ->success()
                             ->send();
                     })

diff --git a/app/Models/Event.php b/app/Models/Event.php
@@ -136,6 +136,14 @@ public function achievements(): HasManyThrough
         )->with('achievement.game');
     }
 
+    /**
+     * @return HasManyThrough<EventAchievement>
+     */
+    public function publishedAchievements(): HasManyThrough
+    {
+        return $this->achievements()->published();
+    }
+
     /**
      * @return BelongsToMany<GameSet>
      */

diff --git a/app/Models/EventAchievement.php b/app/Models/EventAchievement.php
@@ -146,11 +146,22 @@ public function scopeActive(Builder $query, ?Carbon $timestamp = null): Builder
     {
         $timestamp ??= Carbon::now();
 
-        return $query->where(function ($q) use ($timestamp) {
+        return $query->published()->where(function ($q) use ($timestamp) {
                 $q->where('active_from', '<=', $timestamp)->orWhereNull('active_from');
             })
             ->where(function ($q) use ($timestamp) {
                 $q->where('active_until', '>', $timestamp)->orWhereNull('active_until');
             });
     }
+
+    /**
+     * @param Builder<EventAchievement> $query
+     * @return Builder<EventAchievement>
+     */
+    public function scopePublished(Builder $query): Builder
+    {
+        return $query->whereHas('achievement', function ($q) {
+            $q->published();
+        });
+    }
 }