mkrieger/byos_laravel
1
0
Fork 0
mirror of https://github.com/usetrmnl/byos_laravel.git synced 2026-01-13 15:07:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

fix(#135): use user configured timezone in Playlists

Browse source
This commit is contained in:
Benjamin Nussbaum 2025-12-29 22:16:29 +01:00
parent d4b5cf99d5
commit e6d66af298
2 changed files with 63 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

24
app/Models/Playlist.php
View file

@ -6,6 +6,7 @@ use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\BelongsTo;
use Illuminate\Database\Eloquent\Relations\HasMany;
use Illuminate\Support\Carbon;
class Playlist extends Model
{
@ -37,21 +38,32 @@ class Playlist extends Model
return false;
}
// Check weekday
if ($this->weekdays !== null && ! in_array(now()->dayOfWeek, $this->weekdays)) {
// Get user's timezone or fall back to app timezone
$timezone = $this->device->user->timezone ?? config('app.timezone');
$now = now($timezone);
// Check weekday (using timezone-aware time)
if ($this->weekdays !== null && ! in_array($now->dayOfWeek, $this->weekdays)) {
return false;
}
if ($this->active_from !== null && $this->active_until !== null) {
$now = now();
// Create timezone-aware datetime objects for active_from and active_until
$activeFrom = $now->copy()
->setTimeFrom($this->active_from)
->timezone($timezone);
$activeUntil = $now->copy()
->setTimeFrom($this->active_until)
->timezone($timezone);
// Handle time ranges that span across midnight
if ($this->active_from > $this->active_until) {
if ($activeFrom > $activeUntil) {
// Time range spans midnight (e.g., 09:01 to 03:58)
if ($now >= $this->active_from || $now <= $this->active_until) {
if ($now >= $activeFrom || $now <= $activeUntil) {
return true;
}
} elseif ($now >= $this->active_from && $now <= $this->active_until) {
} elseif ($now >= $activeFrom && $now <= $activeUntil) {
return true;
}