From 809f093ca3d756eff0dd51b071c7de2aa47ec093 Mon Sep 17 00:00:00 2001
From: Sonic4999 <sonictbm@gmail.com>
Date: Sun, 5 Sep 2021 13:53:09 -0400
Subject: [PATCH 1/3] FIxed `userinfo` command not returning an avatar...

...if the avatar of the user specified is a default avatar
---
 examples/converters.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/converters.py b/examples/converters.py
index 54539201..0bf92b49 100644
--- a/examples/converters.py
+++ b/examples/converters.py
@@ -27,7 +27,7 @@ async def userinfo(ctx: commands.Context, user: discord.User):
     # and can do the following:
     user_id = user.id
     username = user.name
-    avatar = user.avatar.url
+    avatar = user.display_avatar.url
     await ctx.send(f'User found: {user_id} -- {username}\n{avatar}')
 
 @userinfo.error
-- 
2.47.2


From 8df08bc5ffa63c1a7b17bb13eed5ba362a20ed05 Mon Sep 17 00:00:00 2001
From: Sonic4999 <sonictbm@gmail.com>
Date: Sat, 11 Sep 2021 19:14:44 -0400
Subject: [PATCH 2/3] Quick merge conflict fix

---
 examples/converters.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/converters.py b/examples/converters.py
index 0bf92b49..4a23e116 100644
--- a/examples/converters.py
+++ b/examples/converters.py
@@ -28,7 +28,7 @@ async def userinfo(ctx: commands.Context, user: discord.User):
     user_id = user.id
     username = user.name
     avatar = user.display_avatar.url
-    await ctx.send(f'User found: {user_id} -- {username}\n{avatar}')
+    await ctx.send(f"User found: {user_id} -- {username}\n{avatar}")
 
 @userinfo.error
 async def userinfo_error(ctx: commands.Context, error: commands.CommandError):
-- 
2.47.2


From 634f4f9420a69b139982d3cb8bb896abcc6e7666 Mon Sep 17 00:00:00 2001
From: Lint Action <lint-action@samuelmeuli.com>
Date: Sat, 11 Sep 2021 23:16:17 +0000
Subject: [PATCH 3/3] Fix code style issues with Black

---
 examples/converters.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/examples/converters.py b/examples/converters.py
index d44266ea..a1b4a6c6 100644
--- a/examples/converters.py
+++ b/examples/converters.py
@@ -30,6 +30,7 @@ async def userinfo(ctx: commands.Context, user: discord.User):
     avatar = user.display_avatar.url
     await ctx.send(f"User found: {user_id} -- {username}\n{avatar}")
 
+
 @userinfo.error
 async def userinfo_error(ctx: commands.Context, error: commands.CommandError):
     # if the conversion above fails for any reason, it will raise `commands.BadArgument`
-- 
2.47.2