Merge branch 'main' into develop

.github/dependabot.yml

@@ -0,0 +1,40 @@
+version: 2
+updates:
+  # Composer dependencies (PHP)
+  - package-ecosystem: "composer"
+    directory: "/"
+    schedule:
+      interval: "daily"
+      time: "15:00" # 10am EST
+    open-pull-requests-limit: 10
+    target-branch: "develop"
+    labels:
+      - "dependencies"
+    assignees:
+      - "Refringe"
+
+  # GitHub Actions
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "daily"
+      time: "15:00" # 10am EST
+    open-pull-requests-limit: 10
+    target-branch: "develop"
+    labels:
+      - "dependencies"
+    assignees:
+      - "Refringe"
+
+  # npm modules (JavaScript)
+  - package-ecosystem: "npm"
+    directory: "/"
+    schedule:
+      interval: "daily"
+      time: "15:00" # 10am EST
+    open-pull-requests-limit: 10
+    target-branch: "develop"
+    labels:
+      - "dependencies"
+    assignees:
+      - "Refringe"

app/Jobs/Import/ImportHubDataJob.php

@@ -57,6 +57,9 @@ class ImportHubDataJob implements ShouldBeUnique, ShouldQueue
         $this->importMods();
         $this->importModVersions();
 
+        // Remove mods that are no longer on the hub.
+        $this->removeDeletedMods();
+
         // Ensure that we've disconnected from the Hub database, clearing temporary tables.
         DB::connection('mysql_hub')->disconnect();
 
@@ -1076,6 +1079,19 @@ class ImportHubDataJob implements ShouldBeUnique, ShouldQueue
             }, 'versionID');
     }
 
+    /**
+     * Remove mods that are no longer on the Hub.
+     */
+    private function removeDeletedMods(): void
+    {
+        $mods = Mod::select('hub_id')->get();
+        foreach ($mods as $mod) {
+            if (DB::connection('mysql_hub')->table('filebase1_file')->where('fileID', $mod->hub_id)->doesntExist()) {
+                $mod->delete();
+            }
+        }
+    }
+
     /**
      * The job failed to process.
      */

config/horizon.php

@@ -207,7 +207,7 @@ return [
             'maxJobs' => 0,
             'memory' => 256,
             'tries' => 1,
-            'timeout' => 1500, // 25 Minutes
+            'timeout' => 2700, // 45 Minutes
             'nice' => 0,
         ],
     ],