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

Start crunching down on pylint warnings and errors

Browse Source
master
Tristan Gosselin-Hane 6 years ago
parent 2c0ae52fe5
commit 614e46a19d
No known key found for this signature in database
GPG Key ID: 0B7E55B60DCA15D5
2 changed files with 46 additions and 55 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. 8
      minecraft_discord_bridge/auth_server.py
  2. 89
      minecraft_discord_bridge/minecraft_discord_bridge.py

8
minecraft_discord_bridge/auth_server.py
Unescape View File

@ -30,8 +30,8 @@ class AuthProtocol(ServerProtocol):
connect_port = self.connect_port connect_port = self.connect_port
self.logger.info("[AUTH SERVER] {} ({}) connected to address {}:{}".format( self.logger.info("[AUTH SERVER] %s (%s) connected to address %s:%s",
display_name, uuid, ip_addr, connect_port)) display_name, uuid, ip_addr, connect_port)
try: try:
connection_token = ip_addr.split(".")[0] connection_token = ip_addr.split(".")[0]
session = database_session.get_session() session = database_session.get_session()
@ -50,8 +50,8 @@ class AuthProtocol(ServerProtocol):
if discord_account.minecraft_account_id is not None: if discord_account.minecraft_account_id is not None:
existing_account = session.query(MinecraftAccount).filter_by( existing_account = session.query(MinecraftAccount).filter_by(
id=discord_account.minecraft_account_id).first() id=discord_account.minecraft_account_id).first()
self.logger.info("unlinking existing {} account and replacing it with {}".format( self.logger.info("unlinking existing %s account and replacing it with %s",
existing_account.minecraft_uuid, str(uuid))) existing_account.minecraft_uuid, str(uuid))
session.delete(existing_account) session.delete(existing_account)
mc_account = MinecraftAccount(str(uuid), discord_account.id) mc_account = MinecraftAccount(str(uuid), discord_account.id)
discord_account.minecraft_account = mc_account discord_account.minecraft_account = mc_account

89
minecraft_discord_bridge/minecraft_discord_bridge.py
Unescape View File

@ -5,33 +5,30 @@ from __future__ import print_function
import sys import sys
import re import re
from enum import Enum from enum import Enum
import requests
import json import json
import time import time
import logging import logging
import random import random
import string import string
import uuid import uuid
import asyncio
from threading import Thread from threading import Thread
from .config import Configuration
from . import DiscordChannel, AccountLinkToken, DiscordAccount
from . import database_session
from datetime import datetime, timedelta, timezone from datetime import datetime, timedelta, timezone
from . import elasticsearch_logger as el
import requests
from minecraft import authentication from minecraft import authentication
from minecraft.exceptions import YggdrasilError from minecraft.exceptions import YggdrasilError
from minecraft.networking.connection import Connection from minecraft.networking.connection import Connection
from minecraft.networking.packets import clientbound, serverbound from minecraft.networking.packets import clientbound, serverbound
import discord import discord
import asyncio
from mcstatus import MinecraftServer from mcstatus import MinecraftServer
from bidict import bidict from bidict import bidict
from . import database_session
from . import elasticsearch_logger as el
from .config import Configuration
from .database import DiscordChannel, AccountLinkToken, DiscordAccount
log = logging.getLogger("bridge") log = logging.getLogger("bridge")
SESSION_TOKEN = "" SESSION_TOKEN = ""
@ -47,10 +44,10 @@ TAB_HEADER = ""
TAB_FOOTER = "" TAB_FOOTER = ""
def mc_uuid_to_username(uuid): def mc_uuid_to_username(mc_uuid):
if uuid not in UUID_CACHE: if mc_uuid not in UUID_CACHE:
try: try:
short_uuid = uuid.replace("-", "") short_uuid = mc_uuid.replace("-", "")
mojang_response = requests.get("https://api.mojang.com/user/profiles/{}/names".format(short_uuid)).json() mojang_response = requests.get("https://api.mojang.com/user/profiles/{}/names".format(short_uuid)).json()
if len(mojang_response) > 1: if len(mojang_response) > 1:
# Multiple name changes # Multiple name changes
@ -58,13 +55,13 @@ def mc_uuid_to_username(uuid):
else: else:
# Only one name # Only one name
player_username = mojang_response[0]["name"] player_username = mojang_response[0]["name"]
UUID_CACHE[uuid] = player_username UUID_CACHE[mc_uuid] = player_username
return player_username return player_username
except Exception as e: except requests.RequestException as e:
log.error(e, exc_info=True) log.error(e, exc_info=True)
log.error("Failed to lookup {}'s username using the Mojang API.".format(uuid)) log.error("Failed to lookup %s's username using the Mojang API.", mc_uuid)
else: else:
return UUID_CACHE[uuid] return UUID_CACHE[mc_uuid]
def mc_username_to_uuid(username): def mc_username_to_uuid(username):
@ -76,7 +73,7 @@ def mc_username_to_uuid(username):
UUID_CACHE.inv[username] = str(long_uuid) UUID_CACHE.inv[username] = str(long_uuid)
return player_uuid return player_uuid
except requests.RequestException: except requests.RequestException:
log.error("Failed to lookup {}'s UUID using the Mojang API.".format(username)) log.error("Failed to lookup %s's username using the Mojang API.", username)
else: else:
return UUID_CACHE.inv[username] return UUID_CACHE.inv[username]
@ -93,7 +90,7 @@ def get_discord_help_string():
# https://stackoverflow.com/questions/33404752/removing-emojis-from-a-string-in-python # https://stackoverflow.com/questions/33404752/removing-emojis-from-a-string-in-python
def remove_emoji(string): def remove_emoji(dirty_string):
emoji_pattern = re.compile( emoji_pattern = re.compile(
"[" "["
u"\U0001F600-\U0001F64F" # emoticons u"\U0001F600-\U0001F64F" # emoticons
@ -104,22 +101,22 @@ def remove_emoji(string):
# u"\U00002702-\U000027B0" # u"\U00002702-\U000027B0"
# u"\U000024C2-\U0001F251" # u"\U000024C2-\U0001F251"
"]+", flags=re.UNICODE) "]+", flags=re.UNICODE)
return emoji_pattern.sub(r'', string) return emoji_pattern.sub(r'', dirty_string)
def escape_markdown(string): def escape_markdown(md_string):
# Absolutely needs to go first or it will replace our escaping slashes! # Absolutely needs to go first or it will replace our escaping slashes!
string = string.replace("\\", "\\\\") escaped_string = md_string.replace("\\", "\\\\")
string = string.replace("_", "\\_") escaped_string = escaped_string.replace("_", "\\_")
string = string.replace("*", "\\*") escaped_string = escaped_string.replace("*", "\\*")
return string return escaped_string
def strip_colour(string): def strip_colour(dirty_string):
colour_pattern = re.compile( colour_pattern = re.compile(
u"\U000000A7" # selection symbol u"\U000000A7" # selection symbol
".", flags=re.UNICODE) ".", flags=re.UNICODE)
return colour_pattern.sub(r'', string) return colour_pattern.sub(r'', dirty_string)
def setup_logging(level): def setup_logging(level):
@ -144,7 +141,7 @@ def run_auth_server(port):
factory = AuthFactory() factory = AuthFactory()
# Listen # Listen
log.info("Starting authentication server on port {}".format(port)) log.info("Starting authentication server on port %d", port)
factory.listen("", port) factory.listen("", port)
try: try:
@ -197,7 +194,7 @@ def main():
handle_disconnect() handle_disconnect()
def minecraft_handle_exception(exception, exc_info): def minecraft_handle_exception(exception, exc_info):
log.error("A minecraft exception occured! {}:".format(exception), exc_info=exc_info) log.error("A minecraft exception occured! %s:", exception, exc_info=exc_info)
handle_disconnect() handle_disconnect()
def is_server_online(): def is_server_online():
@ -232,7 +229,7 @@ def main():
log.info(e) log.info(e)
sys.exit() sys.exit()
BOT_USERNAME = auth_token.profile.name BOT_USERNAME = auth_token.profile.name
log.info("Logged in as %s..." % auth_token.profile.name) log.info("Logged in as %s...", auth_token.profile.name)
while not is_server_online(): while not is_server_online():
log.info('Not connecting to server because it appears to be offline.') log.info('Not connecting to server because it appears to be offline.')
time.sleep(15) time.sleep(15)
@ -264,8 +261,8 @@ def main():
def handle_player_list_header_and_footer_update(header_footer_packet): def handle_player_list_header_and_footer_update(header_footer_packet):
global TAB_FOOTER, TAB_HEADER global TAB_FOOTER, TAB_HEADER
log.debug("Got Tablist H/F Update: header={}".format(header_footer_packet.header)) log.debug("Got Tablist H/F Update: header=%s", header_footer_packet.header)
log.debug("Got Tablist H/F Update: footer={}".format(header_footer_packet.footer)) log.debug("Got Tablist H/F Update: footer=%s", header_footer_packet.footer)
TAB_HEADER = json.loads(header_footer_packet.header)["text"] TAB_HEADER = json.loads(header_footer_packet.header)["text"]
TAB_FOOTER = json.loads(header_footer_packet.footer)["text"] TAB_FOOTER = json.loads(header_footer_packet.footer)["text"]
@ -275,7 +272,7 @@ def main():
for action in tab_list_packet.actions: for action in tab_list_packet.actions:
if isinstance(action, clientbound.play.PlayerListItemPacket.AddPlayerAction): if isinstance(action, clientbound.play.PlayerListItemPacket.AddPlayerAction):
log.debug( log.debug(
"Processing AddPlayerAction tab list packet, name: {}, uuid: {}".format(action.name, action.uuid)) "Processing AddPlayerAction tab list packet, name: %s, uuid: %s", action.name, action.uuid)
username = action.name username = action.name
player_uuid = action.uuid player_uuid = action.uuid
if action.name not in PLAYER_LIST.inv: if action.name not in PLAYER_LIST.inv:
@ -316,7 +313,7 @@ def main():
if config.es_enabled: if config.es_enabled:
el.log_connection(uuid=action.uuid, reason=el.ConnectionReason.SEEN) el.log_connection(uuid=action.uuid, reason=el.ConnectionReason.SEEN)
if isinstance(action, clientbound.play.PlayerListItemPacket.RemovePlayerAction): if isinstance(action, clientbound.play.PlayerListItemPacket.RemovePlayerAction):
log.debug("Processing RemovePlayerAction tab list packet, uuid: {}".format(action.uuid)) log.debug("Processing RemovePlayerAction tab list packet, uuid: %s", action.uuid)
username = mc_uuid_to_username(action.uuid) username = mc_uuid_to_username(action.uuid)
player_uuid = action.uuid player_uuid = action.uuid
webhook_payload = { webhook_payload = {
@ -364,8 +361,8 @@ def main():
message_unformatted=chat_string) message_unformatted=chat_string)
el.log_raw_message(type=ChatType(chat_packet.position).name, message=chat_packet.json_data) el.log_raw_message(type=ChatType(chat_packet.position).name, message=chat_packet.json_data)
return return
log.info("Incoming message from minecraft: Username: {} Message: {}".format(username, original_message)) log.info("Incoming message from minecraft: Username: %s Message: %s", username, original_message)
log.debug("msg: {}".format(repr(original_message))) log.debug("msg: %s", repr(original_message))
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,
@ -393,7 +390,7 @@ def main():
@discord_bot.event @discord_bot.event
async def on_ready(): async def on_ready():
log.info("Discord bot logged in as {} ({})".format(discord_bot.user.name, discord_bot.user.id)) log.info("Discord bot logged in as %s (%s)", discord_bot.user.name, discord_bot.user.id)
global WEBHOOKS global WEBHOOKS
WEBHOOKS = [] WEBHOOKS = []
session = database_session.get_session() session = database_session.get_session()
@ -408,7 +405,7 @@ def main():
if webhook.name == "_minecraft" and webhook.user == discord_bot.user: if webhook.name == "_minecraft" and webhook.user == discord_bot.user:
WEBHOOKS.append(webhook.url) WEBHOOKS.append(webhook.url)
found = True found = True
log.debug("Found webhook {} in channel {}".format(webhook.name, discord_channel.name)) log.debug("Found webhook %s in channel %s", webhook.name, discord_channel.name)
if not found: if not found:
# Create the hook # Create the hook
await discord_channel.create_webhook(name="_minecraft") await discord_channel.create_webhook(name="_minecraft")
@ -439,7 +436,6 @@ def main():
error_msg = await message.channel.send(msg) error_msg = await message.channel.send(msg)
await asyncio.sleep(3) await asyncio.sleep(3)
await error_msg.delete() await error_msg.delete()
finally:
return return
elif message.content.startswith("mc!register"): elif message.content.startswith("mc!register"):
@ -476,7 +472,6 @@ def main():
error_msg = await message.channel.send(msg) error_msg = await message.channel.send(msg)
await asyncio.sleep(3) await asyncio.sleep(3)
await error_msg.delete() await error_msg.delete()
finally:
return return
# Global Commands # Global Commands
@ -500,7 +495,6 @@ def main():
error_msg = await message.channel.send(msg) error_msg = await message.channel.send(msg)
await asyncio.sleep(3) await asyncio.sleep(3)
await error_msg.delete() await error_msg.delete()
finally:
return 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()
@ -585,7 +579,6 @@ def main():
error_msg = await message.channel.send(msg) error_msg = await message.channel.send(msg)
await asyncio.sleep(3) await asyncio.sleep(3)
await error_msg.delete() await error_msg.delete()
finally:
return return
elif message.content.startswith("mc!"): elif message.content.startswith("mc!"):
@ -606,7 +599,6 @@ def main():
error_msg = await message.channel.send(msg) error_msg = await message.channel.send(msg)
await asyncio.sleep(3) await asyncio.sleep(3)
await error_msg.delete() await error_msg.delete()
finally:
return return
elif not message.author.bot: elif not message.author.bot:
@ -635,7 +627,7 @@ def main():
if total_len > 256: if total_len > 256:
message_to_send = message_to_send[:(256 - padding)] message_to_send = message_to_send[:(256 - padding)]
message_to_discord = message_to_discord[:(256 - padding)] message_to_discord = message_to_discord[:(256 - padding)]
elif len(message_to_send) <= 0: elif not message_to_send:
return return
session = database_session.get_session() session = database_session.get_session()
@ -661,14 +653,13 @@ def main():
error_msg = await message.channel.send(msg) error_msg = await message.channel.send(msg)
await asyncio.sleep(3) await asyncio.sleep(3)
await error_msg.delete() await error_msg.delete()
finally:
return return
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( log.info("Outgoing message from discord: Username: %s Message: %s",
minecraft_username, message_to_send)) 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()
@ -699,10 +690,10 @@ def main():
error_msg = await message.channel.send(msg) error_msg = await message.channel.send(msg)
await asyncio.sleep(3) await asyncio.sleep(3)
await error_msg.delete() await error_msg.delete()
return
finally: finally:
session.close() session.close()
del session del session
return
else: else:
session.close() session.close()
del session del session

Write Preview
Loading…
Cancel
Save