Merge pull request #626 from Aldione/patch-15

Add per-user expiration with date & time for PlaylistAuth and PlaylistAlias

Author: sparkison

app/Filament/Resources/PlaylistAliases/PlaylistAliasResource.php

@@ -468,6 +468,13 @@ public static function getForm(): array
                         ->columnSpan(1)
                         ->password()
                         ->revealable(),
+                    Forms\Components\DateTimePicker::make('expires_at')
+                        ->label('Expiration (date & time)')
+                        ->seconds(false)
+                        ->native(false)
+                        ->helperText('If set, this alias credentials will stop working at that exact time.')
+                        ->nullable()
+                        ->columnSpan(2),
                 ]),
         ];
     }

app/Filament/Resources/PlaylistAuths/PlaylistAuthResource.php

@@ -16,6 +16,7 @@
 use Filament\Actions\DeleteBulkAction;
 use Filament\Actions\EditAction;
 use Filament\Forms;
+use Filament\Forms\Components\DateTimePicker;
 use Filament\Forms\Components\Select;
 use Filament\Forms\Components\TextInput;
 use Filament\Forms\Components\Toggle;
@@ -145,6 +146,13 @@ public static function getForm(): array
                 ->required()
                 ->revealable()
                 ->columnSpan(1),
+            DateTimePicker::make('expires_at')
+                ->label('Expiration (date & time)')
+                ->seconds(false)
+                ->native(false)
+                ->helperText('If set, this account will stop working at that exact time.')
+                ->nullable()
+                ->columnSpan(2),
         ];
 
         return [

app/Http/Controllers/XtreamStreamController.php

@@ -33,6 +33,10 @@ private function findAuthenticatedPlaylistAndStreamModel(string $username, strin
             ->where('enabled', true)
             ->first();
 
+        if ($playlistAuth && $playlistAuth->isExpired()) {
+            $playlistAuth = null;
+        }
+
         if ($playlistAuth) {
             $playlist = $playlistAuth->getAssignedModel();
             if ($playlist) {

app/Models/PlaylistAlias.php

@@ -25,6 +25,7 @@ class PlaylistAlias extends Model
         'enabled' => 'boolean',
         'enable_proxy' => 'boolean',
         'priority' => 'integer',
+        'expires_at' => 'datetime',
         'custom_headers' => 'array',
         'strict_live_ts' => 'boolean',
     ];
@@ -113,6 +114,18 @@ public function customPlaylist(): BelongsTo
         return $this->belongsTo(CustomPlaylist::class);
     }
 
+    /**
+     * Determine whether this alias auth credential is expired.
+     */
+    public function isExpired(): bool
+    {
+        if ($this->expires_at === null) {
+            return false;
+        }
+
+        return now()->greaterThanOrEqualTo($this->expires_at);
+    }
+
     /**
      * Get the effective playlist (either the main playlist or custom playlist)
      * This method returns the playlist that should be used for configuration

app/Models/PlaylistAuth.php

@@ -24,13 +24,26 @@ class PlaylistAuth extends Model
         'id' => 'integer',
         'enabled' => 'boolean',
         'user_id' => 'integer',
+        'expires_at' => 'datetime',
     ];
 
     public function user(): BelongsTo
     {
         return $this->belongsTo(User::class);
     }
 
+    /**
+     * Determine whether this auth credential is expired.
+     */
+    public function isExpired(): bool
+    {
+        if ($this->expires_at === null) {
+            return false;
+        }
+
+        return now()->greaterThanOrEqualTo($this->expires_at);
+    }
+
     public function playlists(): HasMany
     {
         return $this->hasMany(PlaylistAuthPivot::class, 'playlist_auth_id')

app/Services/PlaylistService.php

@@ -384,6 +384,10 @@ public function authenticate($username, $password): array|bool
             ->where('enabled', true)
             ->first();
 
+        if ($playlistAuth && $playlistAuth->isExpired()) {
+            $playlistAuth = null;
+        }
+
         if ($playlistAuth) {
             $playlist = $playlistAuth->getAssignedModel();
             if ($playlist) {

database/migrations/2026_01_09_000001_add_expires_at_to_playlist_auths_table.php

@@ -0,0 +1,23 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    public function up(): void
+    {
+        Schema::table('playlist_auths', function (Blueprint $table) {
+            $table->dateTime('expires_at')->nullable()->after('password')->index();
+        });
+    }
+
+    public function down(): void
+    {
+        Schema::table('playlist_auths', function (Blueprint $table) {
+            $table->dropIndex(['expires_at']);
+            $table->dropColumn('expires_at');
+        });
+    }
+};

database/migrations/2026_01_09_000002_add_expires_at_to_playlist_aliases_table.php

@@ -0,0 +1,23 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    public function up(): void
+    {
+        Schema::table('playlist_aliases', function (Blueprint $table) {
+            $table->dateTime('expires_at')->nullable()->after('password')->index();
+        });
+    }
+
+    public function down(): void
+    {
+        Schema::table('playlist_aliases', function (Blueprint $table) {
+            $table->dropIndex(['expires_at']);
+            $table->dropColumn('expires_at');
+        });
+    }
+};