discord discriminator stuff round 2

[alttp.git] / app / Console / Commands / SyncSpeedGaming.php

diff --git a/app/Console/Commands/SyncSpeedGaming.php b/app/Console/Commands/SyncSpeedGaming.php
index 610968e631f6fc0d66b49978ce817c018b8b108d..d7f9a63653d9a9b25f7f610861ecdddcc82dfe5c 100644 (file)
--- a/app/Console/Commands/SyncSpeedGaming.php
+++ b/app/Console/Commands/SyncSpeedGaming.php
@@ -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;