From 3aadf0c2a9352a2709598b68efd1c9fc0b67d68b Mon Sep 17 00:00:00 2001
From: Antoine Mazeas <antoine@karthanis.net>
Date: Thu, 9 Jan 2020 14:32:38 +0100
Subject: [PATCH] Swap urllib for yarl; make use of process.env

Signed-off-by: Antoine Mazeas <antoine@karthanis.net>
---
 maubot/management/frontend/src/pages/Main.js | 2 +-
 maubot/server.py                             | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/maubot/management/frontend/src/pages/Main.js b/maubot/management/frontend/src/pages/Main.js
index 3434fe1..dd5a9aa 100644
--- a/maubot/management/frontend/src/pages/Main.js
+++ b/maubot/management/frontend/src/pages/Main.js
@@ -42,7 +42,7 @@ class Main extends Component {
 
     async getBasePath() {
         try {
-            const resp = await fetch("./paths.json", {
+            const resp = await fetch(process.env.PUBLIC_URL + "/paths.json", {
                 headers: { "Content-Type": "application/json" }
             })
             const apiPathJson = await resp.json()
diff --git a/maubot/server.py b/maubot/server.py
index 423a954..efb0a13 100644
--- a/maubot/server.py
+++ b/maubot/server.py
@@ -17,7 +17,7 @@ from typing import Tuple, Dict
 import logging
 import asyncio
 import json
-from urllib.parse import urlparse
+from yarl import URL
 
 from aiohttp import web, hdrs
 from aiohttp.abc import AbstractAccessLogger
@@ -136,9 +136,8 @@ class MaubotServer:
         public_url = self.config["server.public_url"]
         base_path = self.config["server.base_path"]
         public_url_path = ""
-        if public_url != "":
-            url_parts = urlparse(public_url)
-            public_url_path = url_parts.path.rstrip("/")
+        if public_url:
+            public_url_path = URL(public_url).path.rstrip("/")
 
         # assemble with base_path
         api_path = f"{public_url_path}{base_path}"