Bugfix: WillieTimer
This commit is contained in:
@@ -114,12 +114,12 @@ class WillieTimer(commands.Cog):
|
||||
if self.caller_name is not None:
|
||||
channel = self.bot.get_channel(id=self.channel_id)
|
||||
guild = channel.guild
|
||||
user = discord.utils.get(guild.member, name=self.caller_name)
|
||||
user = discord.utils.get(guild.members, name=self.caller_name)
|
||||
return user
|
||||
elif input_user is not None:
|
||||
channel = self.bot.get_channel(id=self.channel_id)
|
||||
guild = channel.guild
|
||||
user = discord.utils.get(guild.member, name=input_user)
|
||||
user = discord.utils.get(guild.members, name=input_user)
|
||||
return user
|
||||
|
||||
def get_random_420_phrase(self):
|
||||
@@ -155,12 +155,12 @@ class WillieTimer(commands.Cog):
|
||||
|
||||
def get_output_string(self):
|
||||
|
||||
willie_time_string = f"<@&{self.bot_get_user().id if self.caller_name is not None else ''}>, " \
|
||||
willie_time_string = f"<@&{self.bot_get_user().id}>, " if self.caller_name is not None else f'<@&{self.bot_get_role().id}>, ' \
|
||||
f"Willie wanted me to tell you:\n" \
|
||||
f"\"{self.get_random_420_phrase()}\"\n" \
|
||||
f"<@&{self.bot_get_role().id}>"
|
||||
|
||||
warm_up_string = f"<@&{str(self.bot_get_user().id + ' & ') if self.caller_name is not None else ''}>" \
|
||||
warm_up_string = f"<@&{str(self.bot_get_user().id)}> & " if self.caller_name is not None else '' \
|
||||
f"<@&{self.bot_get_role().id}>! Heads up! " \
|
||||
f"Willie's passing an early message along:\n" \
|
||||
f"\"{self.get_random_warm_up_phrase()}\""
|
||||
|
||||
Reference in New Issue
Block a user