Update to discordpy 1.0
This commit is contained in:
@@ -33,18 +33,18 @@ async def on_message(message):
|
||||
'''
|
||||
if content.startswith('!ghostball'):
|
||||
if play_dao.is_active_play():
|
||||
await bot.send_message(message.channel, "Um, I think there's already an active play. Could you close that one first, please?")
|
||||
await message.channel.send("There's already an active play. Could you close that one first, please?")
|
||||
else:
|
||||
play_object = {PLAY_ID : uuid.uuid4(), CREATION_DATE : datetime.datetime.now()}
|
||||
play_dao.insert(play_object)
|
||||
|
||||
await bot.send_message(message.channel, "@everyone, pitch is in! Send me your guesses with a !guess command.")
|
||||
await message.channel.send( "@flappyball, pitch is in! Send me your guesses with a !guess command.")
|
||||
|
||||
if content.startswith("!guess"):
|
||||
guess_value = __parse_guess__(content)
|
||||
|
||||
if not play_dao.is_active_play():
|
||||
await bot.send_message(message.channel, "Hey, there's no active play! Start one up first with !ghostball.")
|
||||
await message.channel.send( "Hey, there's no active play! Start one up first with !ghostball.")
|
||||
else:
|
||||
play = play_dao.get_active_play()
|
||||
guess_object = {PLAY_ID: play['play_id'],
|
||||
@@ -53,30 +53,30 @@ async def on_message(message):
|
||||
MEMBER_NAME: str(message.author.name)}
|
||||
|
||||
if guess_dao.insert(guess_object):
|
||||
await bot.add_reaction(message, emoji="\N{THUMBS UP SIGN}")
|
||||
await message.add_reaction(emoji="\N{THUMBS UP SIGN}")
|
||||
|
||||
# Closes off the active play to be ready for the next set
|
||||
if content.startswith('!resolve'):
|
||||
# try:
|
||||
pitch_value, swing_value = __parse_resolve_play__(content)
|
||||
if pitch_value is None or swing_value is None:
|
||||
await bot.send_message(message.channel, "Hey " + "<@" + str(message.author.id) + ">, I'm not sure what you meant. "
|
||||
pitch_value = __parse_resolve_play__(content)
|
||||
if pitch_value is None:
|
||||
await message.channel.send( "Hey " + "<@" + str(message.author.id) + ">, I'm not sure what you meant. "
|
||||
"You need real, numeric, values for this command to work. "
|
||||
"Use !resolve <pitch number> <swing_number> and try again.")
|
||||
|
||||
# Check if we have an active play
|
||||
if not play_dao.is_active_play():
|
||||
await bot.send_message(message.channel, "You confused me. There's no active play so I have nothing to close!")
|
||||
await message.channel.send( "You confused me. There's no active play so I have nothing to close!")
|
||||
else:
|
||||
play = play_dao.resolve_play(pitch_value, swing_value)
|
||||
play = play_dao.resolve_play(pitch_value)
|
||||
guess_dao.set_differences(pitch_value, play['play_id'])
|
||||
|
||||
await bot.send_message(message.channel,
|
||||
await message.channel.send(
|
||||
"You got it boss. Closed this play, no further guesses allowed!")
|
||||
|
||||
# Likely due to too few parameters but could be any number of things
|
||||
# except :
|
||||
# await bot.send_message(message.channel, "Hey " + "<@" + str(message.author.id) + ">, you confused me with that message. "
|
||||
# await message.channel.send( "Hey " + "<@" + str(message.author.id) + ">, you confused me with that message. "
|
||||
# "To close an active pitch, the proper command is !resolve <pitch number> <swing_number>. "
|
||||
# "Use that format and try again, ok?")
|
||||
|
||||
@@ -90,18 +90,18 @@ async def on_message(message):
|
||||
for i, value in enumerate(values):
|
||||
string_to_send += str(i + 1) + ': ' + value['member_name'] + ', ' + value['difference'] + '\n'
|
||||
|
||||
await bot.send_message(message.channel, string_to_send)
|
||||
await message.channel.send( string_to_send)
|
||||
|
||||
elif leaderboard_config.should_sort_by_best_average():
|
||||
pass
|
||||
else:
|
||||
await bot.send_message(message.channel, "I don't understand that leaderboard command, sorry! I know it's a little confusing, so send me"
|
||||
await message.channel.send( "I don't understand that leaderboard command, sorry! I know it's a little confusing, so send me"
|
||||
" a !help message if you want the full rundown for how to make this work!")
|
||||
|
||||
if content.startswith('!help'):
|
||||
help_message = __get_help_message__()
|
||||
recipient = await bot.get_user_info(message.author.id)
|
||||
await bot.send_message(recipient, help_message)
|
||||
recipient = await bot.fetch_user(message.author.id)
|
||||
await recipient.send(help_message)
|
||||
|
||||
def __get_help_message__():
|
||||
# Start message with person who asked for help
|
||||
@@ -110,9 +110,9 @@ def __get_help_message__():
|
||||
"I will give you a thumbs up if everything worked!\n" \
|
||||
"!ghostball --- Starts a new play. I'll let you know if this didn't work for some reason!\n" \
|
||||
"!help --- You just asked for this. If you ask for it again, I'll repeat myself.\n" \
|
||||
"!resolve <PITCH_NUMBER> <SWING NUMBER>--- Uses the pitch number and real swing number " \
|
||||
"!resolve <PITCH_NUMBER> --- Uses the pitch number and real swing number " \
|
||||
"to figure out who was closest and ends the active play.\n" \
|
||||
"<HELP MESSAGE NEEDS DOCUMENTATION FOR LEADERBOARD COMMAND>\n"
|
||||
"<HELP MESSAGE NEEDS DOCUMENTATION FOR LEADERBOARD COMMAND! PING KALI IF YOU'RE ANGRY!>\n"
|
||||
|
||||
return help_message
|
||||
|
||||
@@ -130,7 +130,7 @@ def __parse_guess__(message_content):
|
||||
def __parse_resolve_play__(message_content):
|
||||
pieces = message_content.split(' ')
|
||||
try:
|
||||
return pieces[1], pieces[2]
|
||||
return pieces[1]
|
||||
except TypeError:
|
||||
return None
|
||||
|
||||
@@ -141,6 +141,7 @@ if __name__ == '__main__':
|
||||
|
||||
configs = Configs(file_path)
|
||||
databaseSession = DatabaseSession()
|
||||
|
||||
play_dao = PlayDAO()
|
||||
guess_dao = GuessDAO()
|
||||
bot.run(token)
|
Reference in New Issue
Block a user