8000 Merge pull request #42 from pseudoforceyt/master · coffeebank/coffee-cogs@f5da231 · GitHub
[go: up one dir, main page]
Skip to content

Commit f5da231

Browse files
coffeebankcoffeebank
authored
Merge pull request #42 from pseudoforceyt/master
[Hellohook] Add global nickname and server nickname variables
2 parents fb3ca44 + fb8589b commit f5da231

File tree

1 file changed

+7
-2
lines changed

1 file changed

+7
-2
lines changed

‎hellohook/hellohook.py‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,12 +58,17 @@ async def hellohookSender(self, webhook, userObj: discord.Member, greetMessage):
5858
greetMessageStr = greetMessageStr.replace("https://&&USERMENTION&&", str(userObj.mention))
5959
if "https://&&USERNAME&&" in greetMessageStr:
6060
greetMessageStr = greetMessageStr.replace("https://&&USERNAME&&", str(userObj.name))
61-
if "https://&&USERNAME1234&&" in greetMessageStr:
62-
greetMessageStr = greetMessageStr.replace("https://&&USERNAME1234&&", str(userObj.name)+"#"+str(userObj.discriminator))
61+
if "https://&&GLOBALNAME&&" in greetMessageStr:
62+
greetMessageStr = greetMessageStr.replace("https://&&GLOBALNAME&&", str(userObj.global_name))
63+
if "https://&&NICKNAME&&" in greetMessageStr:
64+
greetMessageStr = greetMessageStr.replace("https://&&NICKNAME&&", str(userObj.display_name))
6365
if "https://&&SERVERCOUNT&&" in greetMessageStr:
6466
greetMessageStr = greetMessageStr.replace("https://&&SERVERCOUNT&&", str(userObj.guild.member_count))
6567
if "https://&&SERVERCOUNTORD&&" in greetMessageStr:
6668
greetMessageStr = greetMessageStr.replace("https://&&SERVERCOUNTORD&&", str(self.ordinalize_num(userObj.guild.member_count)))
69+
# Legacy Discriminator System based Username, does not fetch the user's old discriminator:
70+
# if "https://&&USERNAME1234&&" in greetMessageStr:
71+
# greetMessageStr = greetMessageStr.replace("https://&&USERNAME1234&&", str(userObj.name)+"#"+str(userObj.discriminator))
6772
greetMessageJson = json.loads(str(greetMessageStr))
6873
# Patch fix: send() got an unexpected keyword argument 'attachments'
6974
if greetMessageJson.get("attachments", False) is not False:

0 commit comments

Comments
 (0)
0