X-Git-Url: https://git.localhorst.tv/?a=blobdiff_plain;ds=sidebyside;f=app%2FConsole%2FCommands%2FSyncSpeedGaming.php;h=c2fa36820af063ed59cc6f62482f4e2e129ae49e;hb=1555e7984ae682c7c7cddb5026275317742eaef3;hp=d75da5078bfea496aea043793149395154959b61;hpb=e2af94795e9d8e8a2eb8c272201b4e54ebb130f0;p=alttp.git

diff --git a/app/Console/Commands/SyncSpeedGaming.php b/app/Console/Commands/SyncSpeedGaming.php
index d75da50..c2fa368 100644
--- a/app/Console/Commands/SyncSpeedGaming.php
+++ b/app/Console/Commands/SyncSpeedGaming.php
@@ -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();
@@ -176,10 +178,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 +283,9 @@ class SyncSpeedGaming extends Command {
 		if ($channel) {
 			return $channel;
 		}
+		return $episode->channels()
+		  ->where('ext_id', 'LIKE', 'sg:%')
+		  ->first();
 	}
 
 	private function getUserBySGPlayer($player) {
@@ -301,7 +309,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;
 		}