From 4916559995128b6ad620f8e2e9ce808c2d09f2c3 Mon Sep 17 00:00:00 2001
From: chr <chr@cybre.space>
Date: Sun, 29 Mar 2020 19:07:25 -0700
Subject: [PATCH] peg line length at 80 and reformat

---
 ServerWrapper_v0.1.0.py | 42 +++++++++++++++++++++++++----------------
 pyproject.toml          |  3 +++
 2 files changed, 29 insertions(+), 16 deletions(-)
 create mode 100644 pyproject.toml

diff --git a/ServerWrapper_v0.1.0.py b/ServerWrapper_v0.1.0.py
index 7754962..9547978 100644
--- a/ServerWrapper_v0.1.0.py
+++ b/ServerWrapper_v0.1.0.py
@@ -21,9 +21,9 @@ from urllib.parse import urlparse
 from matrix_client.api import MatrixHttpApi
 import PIL
 import requests
-from flask import Flask, jsonify, request
+import flask
 
-app = Flask(__name__)
+app = flask.Flask(__name__)
 minecraft = None
 roomsync = set()
 
@@ -199,18 +199,23 @@ class MinecraftWrapper(socket_util):
 
     def cli_poll(self):
         prog = re.compile("\[.*\] \[(.*)\] \[(.*)\]: <(.*)> (.*)")
-        EXAMPLE = (
-            "[07:36:28] [Server thread/INFO] [minecraft/DedicatedServer]: <khr_> test"
-        )
+        EXAMPLE = "[07:36:28] [Server thread/INFO] [minecraft/DedicatedServer]: <khr_> test"
         for line in self.exe_mc():
             self.logger.info(line.rstrip("\n"))
             result = prog.search(line)
             if result:
                 self.logger.info(
-                    "user: " + result.group(3) + " msg: " + result.group(4).rstrip("\n")
+                    "user: "
+                    + result.group(3)
+                    + " msg: "
+                    + result.group(4).rstrip("\n")
                 )
                 self.msglist.insert(
-                    0, {"user": result.group(3), "msg": result.group(4).rstrip("\n")}
+                    0,
+                    {
+                        "user": result.group(3),
+                        "msg": result.group(4).rstrip("\n"),
+                    },
                 )
 
 
@@ -234,7 +239,9 @@ class MinecraftServerBridge(socket_util):
         # socket and other init
         super().__init__(minecraft_bind_host, minecraft_bind_port)
         LOG.info("Calling Matrix Api")
-        self.api = MatrixHttpApi("http://localhost:8008", token=appservice_token)
+        self.api = MatrixHttpApi(
+            "http://localhost:8008", token=appservice_token
+        )
         self.avatar_update_log = {}
         LOG.info("Finished Init")
 
@@ -327,7 +334,8 @@ class MinecraftServerBridge(socket_util):
                 LOG.info("Checking if we need to update avatar...")
                 if (
                     msg["user"] not in self.avatar_update_log.keys()
-                    or abs(self.avatar_update_log[msg["user"]] - time.time()) > 180
+                    or abs(self.avatar_update_log[msg["user"]] - time.time())
+                    > 180
                 ):
                     self.avatar_update_log[msg["user"]] = time.time()
                     avatar_url = self.get_mc_skin(msg["user"], user_id)
@@ -408,9 +416,9 @@ class MinecraftServerBridge(socket_util):
             # POST /_matrix/media/r0/upload
             LOG.debug("Returning updated avatar")
             LOG.debug(image_buffer_head)
-            return self.api.media_upload(image_buffer_head.getvalue(), "image/png")[
-                "content_uri"
-            ]
+            return self.api.media_upload(
+                image_buffer_head.getvalue(), "image/png"
+            )["content_uri"]
         else:
             return None
 
@@ -421,7 +429,7 @@ USER_RE = re.compile("(?<=\@).*(?=\:)")
 @app.route("/transactions/<transaction>", methods=["PUT"])
 def on_receive_events(transaction):
     LOG.info("got event")
-    events = request.get_json()["events"]
+    events = flask.request.get_json()["events"]
     for event in events:
         LOG.info("User: %s Room: %s" % (event["user_id"], event["room_id"]))
         LOG.info("Event Type: %s" % event["type"])
@@ -437,13 +445,13 @@ def on_receive_events(transaction):
             m_cont = event["content"]["body"]
             # minecraft.msglist.insert(0, "/tellraw @a {\"text\":\"<" + m_user + "> " + m_cont + "\",\"insertion\":\"/tellraw @p %s\"}")
 
-    return jsonify({})
+    return flask.jsonify({})
 
 
 @app.route("/rooms/<room>", methods=["GET"])
 def on_room(room):
     LOG.info("returning: " + str(room))
-    return jsonify({})
+    return flask.jsonify({})
 
 
 BRIDGE_CFG_SKELETON = {
@@ -500,7 +508,9 @@ def main():
         config = make_config("wrapper.json", server=False)
         ip_addr_info = socket.gethostbyname_ex(config["server_name"])
         minecraft = MinecraftWrapper(
-            args.command, host=ip_addr_info[2][0], port=config["wrapper_mcdata_port"],
+            args.command,
+            host=ip_addr_info[2][0],
+            port=config["wrapper_mcdata_port"],
         )
     else:
         LOG.info("Running Minecraft Matrix Bridge Mode")
diff --git a/pyproject.toml b/pyproject.toml
new file mode 100644
index 0000000..7902e9b
--- /dev/null
+++ b/pyproject.toml
@@ -0,0 +1,3 @@
+[tool.black]
+line-length = 80
+target-version = ['py36']