Skip to content

A self-hosted media server and file management system

fix: guest compatible table names spread across two files

aminnausin6e69c60b4698
diff --git a/app/Jobs/Maintenance/PurgeStaleGuestData.php b/app/Jobs/Maintenance/PurgeStaleGuestData.php
index 1121fd90..804de6ac 100644
--- a/app/Jobs/Maintenance/PurgeStaleGuestData.php
+++ b/app/Jobs/Maintenance/PurgeStaleGuestData.php
@@ -5,14 +5,11 @@ namespace App\Jobs\Maintenance;
use App\Enums\TaskStatus;
use App\Jobs\ManagedSubTask;
use App\Models\SubTask;
+use App\Services\Auth\GuestMergeService;
use App\Services\TaskService;
use Illuminate\Support\Facades\DB;
class PurgeStaleGuestData extends ManagedSubTask {
- private array $tables = [
- 'playback_progress',
- ];
-
/**
* Create a new job instance.
*
@@ -35,7 +32,7 @@ class PurgeStaleGuestData extends ManagedSubTask {
try {
$expiry = now()->subDays(30);
- foreach ($this->tables as $table) {
+ foreach (GuestMergeService::getGuestTableNames() as $table) {
DB::table($table)
->whereNotNull('guest_token')
->where('updated_at', '<', $expiry)
diff --git a/app/Services/Auth/GuestMergeService.php b/app/Services/Auth/GuestMergeService.php
index ce0108ab..6f4287f8 100644
--- a/app/Services/Auth/GuestMergeService.php
+++ b/app/Services/Auth/GuestMergeService.php
@@ -40,6 +40,10 @@ class GuestMergeService {
});
}
+ public static function getGuestTableNames(): array {
+ return array_keys((new static())->tables);
+ }
+
private function mergeTable(string $table, array $config, User $user, string $guestToken): void {
$updateClause = $this->buildUpdateClause($table, $config['columns']);
$columnNames = implode(', ', array_keys($config['columns']));