X-Git-Url: https://git.localhorst.tv/?a=blobdiff_plain;f=app%2FConsole%2FCommands%2FSyncSpeedGaming.php;h=b2ac7f1b315fd94f2bcd15d571f9bcc958323959;hb=15aa14e6a7fade13a2dd5c135b8da62c5e65d150;hp=d75da5078bfea496aea043793149395154959b61;hpb=e2af94795e9d8e8a2eb8c272201b4e54ebb130f0;p=alttp.git diff --git a/app/Console/Commands/SyncSpeedGaming.php b/app/Console/Commands/SyncSpeedGaming.php index d75da50..b2ac7f1 100644 --- a/app/Console/Commands/SyncSpeedGaming.php +++ b/app/Console/Commands/SyncSpeedGaming.php @@ -61,7 +61,7 @@ class SyncSpeedGaming extends Command { private function syncEvent(Event $event) { $sgHandle = substr($event->external_schedule, 3); $from = now()->sub(1, 'day'); - $to = now()->add(6, 'day'); + $to = now()->add(14, 'day'); $sgSchedule = HTTP::get('https://speedgaming.org/api/schedule/', [ 'event' => $sgHandle, 'from' => $from->toIso8601String(), @@ -87,6 +87,8 @@ class SyncSpeedGaming extends Command { ->where('start', '<=', $to) ->whereNotIn('ext_id', $ext_ids); foreach ($to_purge->get() as $episode) { + $episode->channels()->detach(); + $episode->crew()->delete(); $episode->players()->delete(); } $to_purge->delete(); @@ -102,7 +104,11 @@ class SyncSpeedGaming extends Command { $episode->event()->associate($event); $episode->title = $sgEntry['match1']['title']; $start = Carbon::createFromFormat('Y-m-d\TH:i:sP', $sgEntry['when']); - if ($start->ne($episode->start)) { + // if speedgaming is in DST, it fucks up the timestamp + if (Carbon::now(new \DateTimeZone('America/Chicago'))->dst) { + $start->add(1, 'hour'); + } + if (!$episode->start || $start->ne($episode->start)) { $episode->start = $start; } $episode->estimate = $sgEntry['length'] * 60; @@ -176,10 +182,13 @@ class SyncSpeedGaming extends Command { foreach ($sgEntry['channels'] as $sgChannel) { $ext_ids[] = 'sg:'.$sgChannel['id']; } - $episode->channels() - ->where('ext_id', 'LIKE', 'sg:%') - ->whereNotIn('ext_id', $ext_ids) - ->detach(); + $channels = $episode->channels() + ->where('ext_id', 'LIKE', 'sg:%') + ->whereNotIn('ext_id', $ext_ids) + ->get(); + if (!$channels->isEmpty()) { + $episode->channels()->detach($channels->pluck('id')); + } } private function syncChannel(Episode $episode, $sgChannel) { @@ -278,6 +287,9 @@ class SyncSpeedGaming extends Command { if ($channel) { return $channel; } + return $episode->channels() + ->where('ext_id', 'LIKE', 'sg:%') + ->first(); } private function getUserBySGPlayer($player) { @@ -301,7 +313,7 @@ class SyncSpeedGaming extends Command { $tag = explode('#', $player['discordTag']); $user = User::firstWhere([ ['username', 'LIKE', $tag[0]], - ['username', 'LIKE', $tag[1]], + ['discriminator', '=', $tag[1]], ]); if ($user) return $user; }