Fix imports and other mistakes

mautrix_telegram/web/provisioning/__init__.py

@@ -17,6 +17,7 @@
 from aiohttp import web
 import logging
 
+from ...user import User
 from ..common import AuthAPI
 
 
@@ -24,7 +25,7 @@ class ProvisioningAPI(AuthAPI):
     log = logging.getLogger("mau.web.provisioning")
 
     def __init__(self, loop):
-        super(AuthAPI, self).__init__(loop)
+        super().__init__(loop)
 
         self.app = web.Application(loop=loop)
 

mautrix_telegram/web/public/__init__.py

@@ -27,16 +27,16 @@ class PublicBridgeWebsite(AuthAPI):
     log = logging.getLogger("mau.web.public")
 
     def __init__(self, loop):
-        super(AuthAPI, self).__init__(loop)
+        super().__init__(loop)
 
         self.login = Template(
-            pkg_resources.resource_string("mautrix_telegram", "public/login.html.mako"))
+            pkg_resources.resource_string("mautrix_telegram", "web/public/login.html.mako"))
 
         self.app = web.Application(loop=loop)
         self.app.router.add_route("GET", "/login", self.get_login)
         self.app.router.add_route("POST", "/login", self.post_login)
-        self.app.router.add_static("/",
-                                   pkg_resources.resource_filename("mautrix_telegram", "public/"))
+        self.app.router.add_static("/", pkg_resources.resource_filename("mautrix_telegram",
+                                                                        "web/public/"))
 
     async def get_login(self, request):
         state = "token" if request.rel_url.query.get("mode", "") == "bot" else "request"