cynic
/
minecraft-discord-bridge
mirror of https://github.com/kurisufriend/minecraft-discord-bridge
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Handle discord permission errors when users have DMs disabled

Browse Source
feature/embed-uploads
Tristan Gosselin-Hane 7 years ago
parent 937866234d
commit 23977145c8
1 changed files with 92 additions and 52 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 144
      webhook-bridge.py

144
webhook-bridge.py
Unescape View File

@ -285,42 +285,59 @@ def main():
# PM Commands # PM Commands
if message.content.startswith("mc!help"): if message.content.startswith("mc!help"):
send_channel = message.channel try:
if isinstance(message.channel, discord.abc.GuildChannel): send_channel = message.channel
await message.delete() if isinstance(message.channel, discord.abc.GuildChannel):
dm_channel = message.author.dm_channel await message.delete()
if not dm_channel: dm_channel = message.author.dm_channel
await message.author.create_dm() if not dm_channel:
await message.author.create_dm()
send_channel = message.author.dm_channel send_channel = message.author.dm_channel
msg = get_discord_help_string() msg = get_discord_help_string()
await send_channel.send(msg) await send_channel.send(msg)
return except discord.errors.Forbidden:
if isinstance(message.author, discord.abc.User):
msg = "{}, please allow private messages from this bot.".format(message.author.mention)
error_msg = await message.channel.send(msg)
await asyncio.sleep(3)
await error_msg.delete()
finally:
return
elif message.content.startswith("mc!register"): elif message.content.startswith("mc!register"):
send_channel = message.channel try:
if isinstance(message.channel, discord.abc.GuildChannel): # TODO: Catch the Forbidden error in a smart way before running application logic
await message.delete() send_channel = message.channel
dm_channel = message.author.dm_channel if isinstance(message.channel, discord.abc.GuildChannel):
if not dm_channel: await message.delete()
await message.author.create_dm() dm_channel = message.author.dm_channel
if not dm_channel:
await message.author.create_dm()
send_channel = message.author.dm_channel send_channel = message.author.dm_channel
session = database_session.get_session() session = database_session.get_session()
discord_account = session.query(DiscordAccount).filter_by(discord_id=message.author.id).first()
if not discord_account:
new_discord_account = DiscordAccount(message.author.id)
session.add(new_discord_account)
session.commit()
discord_account = session.query(DiscordAccount).filter_by(discord_id=message.author.id).first() discord_account = session.query(DiscordAccount).filter_by(discord_id=message.author.id).first()
if not discord_account:
new_token = generate_random_auth_token(16) new_discord_account = DiscordAccount(message.author.id)
account_link_token = AccountLinkToken(message.author.id, new_token) session.add(new_discord_account)
discord_account.link_token = account_link_token session.commit()
session.add(account_link_token) discord_account = session.query(DiscordAccount).filter_by(discord_id=message.author.id).first()
session.commit()
msg = "Please connect your minecraft account to `{}.{}:{}` in order to link it to this bridge!".format(new_token, config.auth_dns, config.auth_port) new_token = generate_random_auth_token(16)
session.close() account_link_token = AccountLinkToken(message.author.id, new_token)
await send_channel.send(msg) discord_account.link_token = account_link_token
return session.add(account_link_token)
session.commit()
msg = "Please connect your minecraft account to `{}.{}:{}` in order to link it to this bridge!".format(new_token, config.auth_dns, config.auth_port)
session.close()
await send_channel.send(msg)
except discord.errors.Forbidden:
if isinstance(message.author, discord.abc.User):
msg = "{}, please allow private messages from this bot.".format(message.author.mention)
error_msg = await message.channel.send(msg)
await asyncio.sleep(3)
await error_msg.delete()
finally:
return
# Global Commands # Global Commands
elif message.content.startswith("mc!chathere"): elif message.content.startswith("mc!chathere"):
@ -330,13 +347,21 @@ def main():
return return
if message.author.id not in config.admin_users: if message.author.id not in config.admin_users:
await message.delete() await message.delete()
dm_channel = message.author.dm_channel try:
if not dm_channel:
await message.author.create_dm()
dm_channel = message.author.dm_channel dm_channel = message.author.dm_channel
msg = "Sorry, you do not have permission to execute that command!" if not dm_channel:
await dm_channel.send(msg) await message.author.create_dm()
return dm_channel = message.author.dm_channel
msg = "Sorry, you do not have permission to execute that command!"
await dm_channel.send(msg)
except discord.errors.Forbidden:
if isinstance(message.author, discord.abc.User):
msg = "{}, please allow private messages from this bot.".format(message.author.mention)
error_msg = await message.channel.send(msg)
await asyncio.sleep(3)
await error_msg.delete()
finally:
return
session = database_session.get_session() session = database_session.get_session()
channels = session.query(DiscordChannel).filter_by(channel_id=this_channel).all() channels = session.query(DiscordChannel).filter_by(channel_id=this_channel).all()
if not channels: if not channels:
@ -359,15 +384,22 @@ def main():
return return
if message.author.id not in config.admin_users: if message.author.id not in config.admin_users:
await message.delete() await message.delete()
dm_channel = message.author.dm_channel try:
if not dm_channel:
await message.author.create_dm()
dm_channel = message.author.dm_channel dm_channel = message.author.dm_channel
msg = "Sorry, you do not have permission to execute that command!" if not dm_channel:
await dm_channel.send(msg) await message.author.create_dm()
return dm_channel = message.author.dm_channel
msg = "Sorry, you do not have permission to execute that command!"
await dm_channel.send(msg)
except discord.errors.Forbidden:
if isinstance(message.author, discord.abc.User):
msg = "{}, please allow private messages from this bot.".format(message.author.mention)
error_msg = await message.channel.send(msg)
await asyncio.sleep(3)
await error_msg.delete()
finally:
return
session = database_session.get_session() session = database_session.get_session()
channels = session.query(DiscordChannel).all()
deleted = session.query(DiscordChannel).filter_by(channel_id=this_channel).delete() deleted = session.query(DiscordChannel).filter_by(channel_id=this_channel).delete()
session.commit() session.commit()
session.close() session.close()
@ -383,15 +415,23 @@ def main():
elif message.content.startswith("mc!"): elif message.content.startswith("mc!"):
# Catch-all # Catch-all
send_channel = message.channel send_channel = message.channel
if isinstance(message.channel, discord.abc.GuildChannel): try:
await message.delete() if isinstance(message.channel, discord.abc.GuildChannel):
dm_channel = message.author.dm_channel await message.delete()
if not dm_channel: dm_channel = message.author.dm_channel
await message.author.create_dm() if not dm_channel:
await message.author.create_dm()
send_channel = message.author.dm_channel send_channel = message.author.dm_channel
msg = "Unknown command, type `mc!help` for a list of commands." msg = "Unknown command, type `mc!help` for a list of commands."
await send_channel.send(msg) await send_channel.send(msg)
return except discord.errors.Forbidden:
if isinstance(message.author, discord.abc.User):
msg = "{}, please allow private messages from this bot.".format(message.author.mention)
error_msg = await message.channel.send(msg)
await asyncio.sleep(3)
await error_msg.delete()
finally:
return
elif not message.author.bot: elif not message.author.bot:
session = database_session.get_session() session = database_session.get_session()

Write Preview
Loading…
Cancel
Save