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

Formatting fixes

Browse Source
master
Tristan Gosselin-Hane 6 years ago
parent b2cf991f5b
commit f4d6be681f
No known key found for this signature in database
GPG Key ID: D2282BE1CF7B78DA
1 changed files with 7 additions and 6 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. 13
      minecraft-discord-bridge/minecraft_discord_bridge.py

13
minecraft-discord-bridge/minecraft_discord_bridge.py
Unescape View File

@ -289,7 +289,7 @@ def main():
if ACCEPT_JOIN_EVENTS: if ACCEPT_JOIN_EVENTS:
webhook_payload = { webhook_payload = {
'username': username, 'username': username,
'avatar_url': "https://visage.surgeplay.com/face/160/{}".format(player_uuid), 'avatar_url': "https://visage.surgeplay.com/face/160/{}".format(player_uuid),
'content': '', 'content': '',
'embeds': [{'color': 65280, 'title': '**Joined the game**'}] 'embeds': [{'color': 65280, 'title': '**Joined the game**'}]
} }
@ -321,7 +321,7 @@ def main():
player_uuid = action.uuid player_uuid = action.uuid
webhook_payload = { webhook_payload = {
'username': username, 'username': username,
'avatar_url': "https://visage.surgeplay.com/face/160/{}".format(player_uuid), 'avatar_url': "https://visage.surgeplay.com/face/160/{}".format(player_uuid),
'content': '', 'content': '',
'embeds': [{'color': 16711680, 'title': '**Left the game**'}] 'embeds': [{'color': 16711680, 'title': '**Left the game**'}]
} }
@ -369,7 +369,7 @@ def main():
message = escape_markdown(remove_emoji(original_message.strip().replace("@", "@\N{zero width space}"))) message = escape_markdown(remove_emoji(original_message.strip().replace("@", "@\N{zero width space}")))
webhook_payload = { webhook_payload = {
'username': username, 'username': username,
'avatar_url': "https://visage.surgeplay.com/face/160/{}".format(player_uuid), 'avatar_url': "https://visage.surgeplay.com/face/160/{}".format(player_uuid),
'content': '{}'.format(message) 'content': '{}'.format(message)
} }
for webhook in WEBHOOKS: for webhook in WEBHOOKS:
@ -667,7 +667,8 @@ def main():
PREVIOUS_MESSAGE = message_to_send PREVIOUS_MESSAGE = message_to_send
NEXT_MESSAGE_TIME = datetime.now(timezone.utc) + timedelta(seconds=config.message_delay) NEXT_MESSAGE_TIME = datetime.now(timezone.utc) + timedelta(seconds=config.message_delay)
log.info("Outgoing message from discord: Username: {} Message: {}".format(minecraft_username, message_to_send)) log.info("Outgoing message from discord: Username: {} Message: {}".format(
minecraft_username, message_to_send))
for channel in channels: for channel in channels:
webhooks = await discord_bot.get_channel(channel.channel_id).webhooks() webhooks = await discord_bot.get_channel(channel.channel_id).webhooks()
@ -689,8 +690,8 @@ def main():
if not dm_channel: if not dm_channel:
await message.author.create_dm() await message.author.create_dm()
send_channel = message.author.dm_channel send_channel = message.author.dm_channel
msg = "Unable to send chat message: there is no Minecraft account linked to this discord account," \ msg = "Unable to send chat message: there is no Minecraft account linked to this discord " \
"please run `mc!register`." "account, please run `mc!register`."
await send_channel.send(msg) await send_channel.send(msg)
except discord.errors.Forbidden: except discord.errors.Forbidden:
if isinstance(message.author, discord.abc.User): if isinstance(message.author, discord.abc.User):

Write Preview
Loading…
Cancel
Save