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

diff --git a/app/Console/Commands/SyncSpeedGaming.php b/app/Console/Commands/SyncSpeedGaming.php
index 95304c3..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();
 
@@ -105,7 +105,7 @@ class SyncSpeedGaming extends Command {
 		$episode->title = $sgEntry['match1']['title'];
 		$start = Carbon::createFromFormat('Y-m-d\TH:i:sP', $sgEntry['when']);
 		if ($event->fix_timezone && !$episode->timezone_fix_override) {
-			$sg_zone = new \DateTimeZone('America/Chicago');
+			$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) {
@@ -125,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;
@@ -317,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;