Fix discord sync

Author: ilestis

app/Console/Commands/Users/RegenerateDiscordToken.php

@@ -46,7 +46,7 @@ public function handle()
     {
         // $userID = $this->argument('user');
 
-        $tokens = UserApp::select(['id', 'user_id', 'access_token', 'refresh_token', 'expires_at', 'updated_at'])
+        $tokens = UserApp::select(['id', 'user_id', 'access_token', 'refresh_token', 'expires_at', 'updated_at', 'settings'])
             ->with('user')
             ->where('app', '=', 'discord')
             ->where('expires_at', '<=', Carbon::now()->toDateString())

app/Services/DiscordService.php

@@ -20,9 +20,9 @@ class DiscordService
     /** @var UserApp|null */
     protected $app;
 
-    protected string $url = 'https://discord.com/api/v6/';
+    protected string $url = 'https://discord.com/api/v10/';
 
-    protected $me = false;
+    protected $me;
 
     protected array $logs = [];
 
@@ -81,7 +81,7 @@ public function addServer(): self
     public function me()
     {
         // Cache the response during a single process
-        if ($this->me !== false) {
+        if (isset($this->me)) {
             return $this->me;
         }
 
@@ -119,7 +119,7 @@ protected function saveUserApp($data): self
 
         // Get me for data
         $me = $this->me();
-        $this->app->settings = ['username' => $me->username, 'discriminator' => $me->discriminator];
+        $this->app->settings = ['username' => $me->username];
         $this->app->save();
 
         return $this;
@@ -136,7 +136,6 @@ public function refresh()
         if (! $this->app->expires_at->isPast()) {
             return $this;
         }
-
         $body = [
             'client_id' => config('discord.client_id'),
             'client_secret' => config('discord.client_secret'),
@@ -151,6 +150,9 @@ public function refresh()
         $log = 'Renewed user #' . $this->user->id . ' Discord auth token.';
         $this->logs[] = $log;
 
+        // Clear the cached Discord user
+        unset($this->me);
+
         return $this;
     }