From 9ce7416452c7175ebd9e81d2acc4dac84e59d6fc Mon Sep 17 00:00:00 2001
From: "Wissem." <wissem.badraoui@yahoo.com>
Date: Fri, 29 Dec 2023 14:08:02 +0100
Subject: [PATCH 1/3] Discord update

---
 src/Discord/Provider.php | 15 ++++++++-------
 src/Discord/README.md    | 21 ++++++++++++---------
 2 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/src/Discord/Provider.php b/src/Discord/Provider.php
index 25991de57..02aefe689 100644
--- a/src/Discord/Provider.php
+++ b/src/Discord/Provider.php
@@ -46,7 +46,7 @@ protected function getCodeFields($state = null)
     {
         $fields = parent::getCodeFields($state);
 
-        if (! $this->consent) {
+        if (!$this->consent) {
             $fields['prompt'] = 'none';
         }
 
@@ -82,7 +82,7 @@ protected function getUserByToken($token)
             'https://discord.com/api/users/@me',
             [
                 RequestOptions::HEADERS => [
-                    'Authorization' => 'Bearer '.$token,
+                    'Authorization' => 'Bearer ' . $token,
                 ],
             ]
         );
@@ -115,11 +115,12 @@ protected function formatAvatar(array $user)
     protected function mapUserToObject(array $user)
     {
         return (new User())->setRaw($user)->map([
-            'id'       => $user['id'],
-            'nickname' => $user['username'].($user['discriminator'] !== '0' ? '#'.$user['discriminator'] : ''),
-            'name'     => $user['username'],
-            'email'    => $user['email'] ?? null,
-            'avatar'   => $this->formatAvatar($user),
+            'id'            => $user['id'],
+            'username'      => $user['username'],
+            'discriminator' => $user['discriminator'],
+            'global_name'   => $user['global_name'],
+            'email'         => $user['email'] ?? null,
+            'avatar'        => $this->formatAvatar($user),
         ]);
     }
 
diff --git a/src/Discord/README.md b/src/Discord/README.md
index 048236b26..7c33c2857 100644
--- a/src/Discord/README.md
+++ b/src/Discord/README.md
@@ -11,11 +11,11 @@ Please see the [Base Installation Guide](https://socialiteproviders.com/usage/),
 ### Add configuration to `config/services.php`
 
 ```php
-'discord' => [    
-  'client_id' => env('DISCORD_CLIENT_ID'),  
-  'client_secret' => env('DISCORD_CLIENT_SECRET'),  
+'discord' => [
+  'client_id' => env('DISCORD_CLIENT_ID'),
+  'client_secret' => env('DISCORD_CLIENT_SECRET'),
   'redirect' => env('DISCORD_REDIRECT_URI'),
-  
+
   // optional
   'allow_gif_avatars' => (bool)env('DISCORD_AVATAR_GIF', true),
   'avatar_default_extension' => env('DISCORD_EXTENSION_DEFAULT', 'png'), // only pick from jpg, png, webp
@@ -47,8 +47,11 @@ return Socialite::driver('discord')->redirect();
 
 ### Returned User fields
 
-- ``id``
-- ``nickname``
-- ``name``
-- ``email``
-- ``avatar``
+You'll find all the information about the fields currently being returned on the [Discord Developer Portal - Users Resource](https://discord.com/developers/docs/resources/user).
+
+-   `id` : The user's id (snowflake).
+-   `username` : The user's username (name).
+-   `discriminator` : The user's Discord-tag (#0000).
+-   `global_name` : The user's display name, if it is set (Amazing Name).
+-   `email` : The user's email (name@example.com).
+-   `avatar` : The user's avatar URL.

From fd1778256b79252bf7c3244b4481766ecbc4e907 Mon Sep 17 00:00:00 2001
From: Wissem <32743705+WissemBad@users.noreply.github.com>
Date: Fri, 29 Dec 2023 14:22:56 +0100
Subject: [PATCH 2/3] Nickname restore

The nickname is back with the old syntax.
---
 src/Discord/Provider.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Discord/Provider.php b/src/Discord/Provider.php
index 02aefe689..8a097c728 100644
--- a/src/Discord/Provider.php
+++ b/src/Discord/Provider.php
@@ -116,8 +116,9 @@ protected function mapUserToObject(array $user)
     {
         return (new User())->setRaw($user)->map([
             'id'            => $user['id'],
+            'nickname'      => $user['username'].($user['discriminator'] !== '0' ? '#'.$user['discriminator'] : '')
             'username'      => $user['username'],
-            'discriminator' => $user['discriminator'],
+            'discriminator' => $user['discriminator'] ?? null,
             'global_name'   => $user['global_name'],
             'email'         => $user['email'] ?? null,
             'avatar'        => $this->formatAvatar($user),

From 46fca1651d16ec8821674b568c3ce56afde4bc16 Mon Sep 17 00:00:00 2001
From: Wissem <32743705+WissemBad@users.noreply.github.com>
Date: Fri, 29 Dec 2023 14:24:15 +0100
Subject: [PATCH 3/3] Update README.md

The nickname is back with the old syntax.
---
 src/Discord/README.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Discord/README.md b/src/Discord/README.md
index 7c33c2857..0fbfda083 100644
--- a/src/Discord/README.md
+++ b/src/Discord/README.md
@@ -50,8 +50,9 @@ return Socialite::driver('discord')->redirect();
 You'll find all the information about the fields currently being returned on the [Discord Developer Portal - Users Resource](https://discord.com/developers/docs/resources/user).
 
 -   `id` : The user's id (snowflake).
+-   `nickname` : The user's name with discriminator (name#0000).
 -   `username` : The user's username (name).
--   `discriminator` : The user's Discord-tag (#0000).
+-   `discriminator` : The user's Discord-tag (0000).
 -   `global_name` : The user's display name, if it is set (Amazing Name).
 -   `email` : The user's email (name@example.com).
 -   `avatar` : The user's avatar URL.