X-Git-Url: https://git.localhorst.tv/?a=blobdiff_plain;f=app%2FConsole%2FCommands%2FSyncSpeedGaming.php;h=41286ce95f2971ece8ce61877f9540214dd9a6e8;hb=771f1761f0abec996838c0ccc71cec0219bad71a;hp=6d0fa1faa777801f213af2f38abfb8c62ec33047;hpb=e7eb3495728ca9c2883d7cf07b363b48a95231fe;p=alttp.git diff --git a/app/Console/Commands/SyncSpeedGaming.php b/app/Console/Commands/SyncSpeedGaming.php index 6d0fa1f..41286ce 100644 --- a/app/Console/Commands/SyncSpeedGaming.php +++ b/app/Console/Commands/SyncSpeedGaming.php @@ -42,7 +42,7 @@ class SyncSpeedGaming extends Command { $events = Event::where('external_schedule', 'LIKE', 'sg:%') ->where(function (Builder $query) { $query->whereNull('end'); - $query->orWhere('end', '<', now()); + $query->orWhere('end', '>', now()); }) ->get(); @@ -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,17 @@ 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 ($event->fix_timezone && !$episode->timezone_fix_override) { + $sg_zone = new \DateTimeZone('America/Detroit'); + $event_zone = new \DateTimeZone($event->fix_timezone); + // if speedgaming is in DST, it fucks up the timestamp + if (Carbon::createFromTimestamp($start->timestamp, $sg_zone)->dst && !Carbon::createFromTimestamp($start->timestamp, $event_zone)->dst) { + $start->add(1, 'hour'); + } else if (!Carbon::createFromTimestamp($start->timestamp, $sg_zone)->dst && Carbon::createFromTimestamp($start->timestamp, $event_zone)->dst) { + $start->sub(1, 'hour'); + } + } + if (!$episode->start || $start->ne($episode->start)) { $episode->start = $start; } $episode->estimate = $sgEntry['length'] * 60; @@ -113,7 +125,7 @@ class SyncSpeedGaming extends Command { $this->purgeChannels($episode, $sgEntry); $channelIds = []; foreach ($sgEntry['channels'] as $sgChannel) { - if ($sgChannel['initials'] == 'NONE') continue; + if ($sgChannel['initials'] == 'NONE' || $sgChannel['name'] == 'Undecided, Not SG') continue; try { $channel = $this->syncChannel($episode, $sgChannel); $channelIds[] = $channel->id; @@ -281,6 +293,9 @@ class SyncSpeedGaming extends Command { if ($channel) { return $channel; } + return $episode->channels() + ->where('ext_id', 'LIKE', 'sg:%') + ->first(); } private function getUserBySGPlayer($player) { @@ -302,10 +317,14 @@ class SyncSpeedGaming extends Command { } if (!empty($player['discordTag'])) { $tag = explode('#', $player['discordTag']); - $user = User::firstWhere([ - ['username', 'LIKE', $tag[0]], - ['discriminator', '=', $tag[1]], - ]); + $user = count($tag) < 2 || $tag[1] == '0' + ? User::firstWhere([ + ['username', 'LIKE', $tag[0]], + ]) + : User::firstWhere([ + ['username', 'LIKE', $tag[0]], + ['discriminator', '=', $tag[1]], + ]); if ($user) return $user; } return null;