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

diff --git a/app/Console/Commands/SyncSpeedGaming.php b/app/Console/Commands/SyncSpeedGaming.php
index b2ac7f1..95304c3 100644
--- a/app/Console/Commands/SyncSpeedGaming.php
+++ b/app/Console/Commands/SyncSpeedGaming.php
@@ -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/Chicago');
+			$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;