Merge pull request #44 from coffeebank/hellohook/display-names

 hellohook: Add global nickname and server nickname variables

hellohook/hellohook.py

@@ -58,8 +58,13 @@ async def hellohookSender(self, webhook, userObj: discord.Member, greetMessage):
             greetMessageStr = greetMessageStr.replace("https://&&USERMENTION&&", str(userObj.mention))
         if "https://&&USERNAME&&" in greetMessageStr:
             greetMessageStr = greetMessageStr.replace("https://&&USERNAME&&", str(userObj.name))
+        # 2024: Will return #0, new Discord username system: https://support.discord.com/hc/en-us/articles/12620128861463-New-Usernames-Display-Names
         if "https://&&USERNAME1234&&" in greetMessageStr:
             greetMessageStr = greetMessageStr.replace("https://&&USERNAME1234&&", str(userObj.name)+"#"+str(userObj.discriminator))
+        if "https://&&GLOBALNAME&&" in greetMessageStr:
+            greetMessageStr = greetMessageStr.replace("https://&&GLOBALNAME&&", str(userObj.global_name))
+        if "https://&&DISPLAYNAME&&" in greetMessageStr:
+            greetMessageStr = greetMessageStr.replace("https://&&DISPLAYNAME&&", str(userObj.display_name))
         if "https://&&SERVERCOUNT&&" in greetMessageStr:
             greetMessageStr = greetMessageStr.replace("https://&&SERVERCOUNT&&", str(userObj.guild.member_count))
         if "https://&&SERVERCOUNTORD&&" in greetMessageStr: