X-Git-Url: https://git.localhorst.tv/?a=blobdiff_plain;f=app%2FConsole%2FCommands%2FSyncSpeedGaming.php;h=1b4c80e9a3ea1c83153eb2a61f40e5ca0e11a800;hb=HEAD;hp=43afaa1b647f571e631818999385c0d7ec6d3c31;hpb=90e0d999150ba3eee7f23af7b82ab9280a193d08;p=alttp.git diff --git a/app/Console/Commands/SyncSpeedGaming.php b/app/Console/Commands/SyncSpeedGaming.php index 43afaa1..1b4c80e 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(); @@ -207,7 +207,7 @@ class SyncSpeedGaming extends Command { } $channel->short_name = $sgChannel['initials']; $channel->title = $sgChannel['name']; - $channel->stream_link = 'https://twitch.tv/'.strtolower($sgChannel['name']); + $channel->stream_link = 'https://twitch.tv/'.strtolower($sgChannel['slug']); $channel->languages = [$sgChannel['language']]; $channel->save(); return $channel; @@ -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;