X-Git-Url: https://git.localhorst.tv/?a=blobdiff_plain;f=app%2FConsole%2FCommands%2FSyncSpeedGaming.php;h=41286ce95f2971ece8ce61877f9540214dd9a6e8;hb=f18af7cfb219ab9c07635ea8bbae80f2a9cee78e;hp=b2ac7f1b315fd94f2bcd15d571f9bcc958323959;hpb=15aa14e6a7fade13a2dd5c135b8da62c5e65d150;p=alttp.git

diff --git a/app/Console/Commands/SyncSpeedGaming.php b/app/Console/Commands/SyncSpeedGaming.php
index b2ac7f1..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();
 
@@ -104,9 +104,15 @@ 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 speedgaming is in DST, it fucks up the timestamp
-		if (Carbon::now(new \DateTimeZone('America/Chicago'))->dst) {
-			$start->add(1, 'hour');
+		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;
@@ -119,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;
@@ -311,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;