Merge pull request #4630 from HDInnovations/development

(Release) UNIT3D v9.0.5

Author: Roardom

app/Console/Commands/FetchMeta.php

@@ -58,6 +58,7 @@ final public function handle(): void
             ->whereRelation('category', 'movie_meta', '=', true)
             ->select('tmdb_movie_id')
             ->distinct()
+            ->whereNotNull('tmdb_movie_id')
             ->pluck('tmdb_movie_id');
 
         $this->info('Queueing all tmdb movie metadata fetching');
@@ -74,6 +75,7 @@ final public function handle(): void
             ->whereRelation('category', 'tv_meta', '=', true)
             ->select('tmdb_tv_id')
             ->distinct()
+            ->whereNotNull('tmdb_tv_id')
             ->pluck('tmdb_tv_id');
 
         $this->info('Queueing all tmdb tv metadata fetching');
@@ -90,6 +92,7 @@ final public function handle(): void
             ->whereRelation('category', 'game_meta', '=', true)
             ->select('igdb')
             ->distinct()
+            ->whereNotNull('igdb')
             ->pluck('igdb');
 
         $this->info('Queueing all igdb game metadata fetching');

app/Http/Controllers/RequestController.php

@@ -71,7 +71,6 @@ public function show(Request $request, TorrentRequest $torrentRequest): \Illumin
                     'genres',
                     'credits' => ['person', 'occupation'],
                     'networks',
-                    'seasons'
                 ])
                     ->find($torrentRequest->tmdb_tv_id),
                 ($torrentRequest->category->movie_meta && $torrentRequest->tmdb_movie_id) => TmdbMovie::with([

app/Http/Controllers/SimilarTorrentController.php

@@ -76,7 +76,8 @@ public function show(int $categoryId, int $tmdbId): \Illuminate\Contracts\View\F
                     'genres',
                     'companies',
                     'platforms',
-                ]);
+                ])
+                    ->findOrFail($tmdbId);
 
                 $igdb = $tmdbId;
 

app/Http/Controllers/StatsController.php

@@ -261,17 +261,6 @@ public function groups(): \Illuminate\Contracts\View\Factory|\Illuminate\View\Vi
         ]);
     }
 
-    /**
-     * Show Extra-Stats Groups.
-     */
-    public function group(int $id): \Illuminate\Contracts\View\Factory|\Illuminate\View\View
-    {
-        return view('stats.groups.group', [
-            'group' => Group::findOrFail($id),
-            'users' => User::with(['group'])->withTrashed()->where('group_id', '=', $id)->latest()->paginate(100),
-        ]);
-    }
-
     /**
      * Show Group Requirements.
      */

app/Http/Controllers/User/PasskeyController.php

@@ -51,23 +51,23 @@ protected function update(Request $request, User $user): \Illuminate\Http\Redire
 
         cache()->forget('user:'.$user->passkey);
 
-        Unit3dAnnounce::removeUser($user);
+        $newPasskey = md5(random_bytes(60).$user->password);
 
-        DB::transaction(static function () use ($user, $changedByStaff): void {
+        Unit3dAnnounce::addUser($user, $newPasskey);
+
+        DB::transaction(static function () use ($user, $changedByStaff, $newPasskey): void {
             $user->passkeys()->latest()->first()?->update(['deleted_at' => now()]);
 
             $user->update([
-                'passkey' => md5(random_bytes(60).$user->password)
+                'passkey' => $newPasskey,
             ]);
 
             $user->passkeys()->create(['content' => $user->passkey]);
 
             if ($changedByStaff) {
                 $user->notify(new PasskeyReset());
             }
-        });
-
-        Unit3dAnnounce::addUser($user);
+        }, 5);
 
         return to_route('users.passkeys.index', ['user' => $user])
             ->with('success', 'Your passkey was changed successfully.');

app/Http/Livewire/SimilarTorrent.php

@@ -37,7 +37,6 @@
 use Livewire\Attributes\Computed;
 use Livewire\Attributes\Url;
 use Livewire\Component;
-use MarcReichel\IGDBLaravel\Models\Game;
 
 class SimilarTorrent extends Component
 {
@@ -46,7 +45,7 @@ class SimilarTorrent extends Component
 
     public Category $category;
 
-    public TmdbMovie|TmdbTv|Game $work;
+    public TmdbMovie|TmdbTv|IgdbGame $work;
 
     public ?int $tmdbId;
 
@@ -282,7 +281,7 @@ final public function torrents(): \Illuminate\Support\Collection
             )
             ->when($this->category->tv_meta, fn ($query) => $query->where('tmdb_tv_id', '=', $this->tmdbId))
             ->when($this->category->movie_meta, fn ($query) => $query->where('tmdb_movie_id', '=', $this->tmdbId))
-            ->when($this->category->game_meta, fn ($query) => $query->where('igdb', '=', $this->tmdbId))
+            ->when($this->category->game_meta, fn ($query) => $query->where('igdb', '=', $this->igdbId))
             ->where((new TorrentSearchFiltersDTO(
                 name: $this->name,
                 description: $this->description,

app/Http/Livewire/TmdbTvSearch.php

@@ -62,6 +62,10 @@ public function handle(): void
 
         $movieScraper = new Client\Movie($this->id);
 
+        if ($movieScraper->getMovie() === null) {
+            return;
+        }
+
         $movie = TmdbMovie::updateOrCreate(['id' => $this->id], $movieScraper->getMovie());
 
         // Genres

app/Jobs/ProcessMovieJob.php

@@ -18,12 +18,10 @@
 
 use App\Models\TmdbCompany;
 use App\Models\TmdbCredit;
-use App\Models\TmdbEpisode;
 use App\Models\TmdbGenre;
 use App\Models\TmdbNetwork;
 use App\Models\TmdbPerson;
 use App\Models\TmdbRecommendation;
-use App\Models\TmdbSeason;
 use App\Models\Torrent;
 use App\Models\TmdbTv;
 use App\Services\Tmdb\Client;
@@ -64,6 +62,10 @@ public function handle(): void
 
         $tvScraper = new Client\TV($this->id);
 
+        if ($tvScraper->getTv() === null) {
+            return;
+        }
+
         $tv = TmdbTv::updateOrCreate(['id' => $this->id], $tvScraper->getTv());
 
         // Companies
@@ -106,21 +108,6 @@ public function handle(): void
         TmdbCredit::where('tmdb_tv_id', '=', $this->id)->delete();
         TmdbCredit::upsert($credits, ['tmdb_person_id', 'tmdb_movie_id', 'tmdb_tv_id', 'occupation_id', 'character']);
 
-        // Seasons and episodes
-
-        $seasons = [];
-        $episodes = [];
-
-        foreach ($tvScraper->getSeasons() as $season) {
-            $seasonScraper = new Client\Season($this->id, $season['season_number']);
-
-            $seasons[] = $seasonScraper->getSeason();
-            array_push($episodes, ...$seasonScraper->getEpisodes());
-        }
-
-        TmdbSeason::upsert($seasons, 'id');
-        TmdbEpisode::upsert($episodes, 'id');
-
         // Recommendations
 
         TmdbRecommendation::upsert($tvScraper->getRecommendations(), ['recommended_tmdb_tv_id', 'tmdb_tv_id']);