fix member count on web, fix base64 for images, fix dependencies

Author: iiPythonx

nightwatch/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "0.11.0"
+__version__ = "0.11.1"
 
 import re
 HEX_COLOR_REGEX = re.compile(r"^[A-Fa-f0-9]{6}$")

nightwatch/rics/routing/image_forward.py

@@ -28,7 +28,7 @@ class IllegalURL(Exception):
 @app.get("/api/fwd/{public_url:str}", response_model = None)
 async def forward_image(public_url: str) -> Response | JSONResponse:
     try:
-        new_url = f"https://{base64.b64decode(public_url, validate = True).decode('ascii').rstrip('/')}"
+        new_url = f"https://{base64.b64decode(public_url.replace('_', '/'), validate = True).decode('ascii').rstrip('/')}"
         if FORWARD_DOMAIN and FORWARD_DOMAIN in new_url:
             raise IllegalURL
 

nightwatch/web/js/nightwatch.js

@@ -114,7 +114,7 @@ const FILE_HANDLER = new FileHandler();
                     const image = dom.querySelector("img");
                     if (image) {
                         classlist += " padded";
-                        image.src = `http${connection.protocol}://${address}/api/fwd/${btoa(image.src.slice(8))}`;
+                        image.src = `http${connection.protocol}://${address}/api/fwd/${btoa(image.src.slice(8)).replace(/\//, "_")}`;
                         attachment = dom.body.innerHTML;
                     };
                 };
@@ -164,9 +164,12 @@ const FILE_HANDLER = new FileHandler();
             handle_member: (event_type, member) => {
                 const member_list = document.querySelector(".member-list");
                 const existing_member = document.querySelector(`[data-member = "${member.name}"]`);
+
+                const update = () => member_list.querySelector("p").innerText = `Members ─ ${member_list.querySelectorAll("& > span").length}`;
+
                 if (event_type === "leave") {
                     if (existing_member) existing_member.remove();
-                    return;
+                    return update();
                 }
                 if (existing_member) return;
 
@@ -175,9 +178,7 @@ const FILE_HANDLER = new FileHandler();
                 element.innerHTML = `→ <span style = "color: #${member.hex}">${member.name}</span>`;
                 element.setAttribute("data-member", member.name);
                 member_list.appendChild(element);
-
-                // Update member count
-                member_list.querySelector("p").innerText = `Members ─ ${member_list.querySelectorAll("& > span").length}`;
+                update();
             }
         }
     );

pyproject.toml

@@ -25,20 +25,20 @@ classifiers = [
 ]
 dependencies = [
     "emoji>=2.14.0",
-    "fastapi>=0.115.5",
     "nanoid>=2.0.0",
     "orjson>=3.10.11",
-    "python-multipart>=0.0.17",
     "readchar>=4.2.1",
     "requests>=2.32.3",
     "urwid>=2.6.16",
-    "uvicorn[standard]>=0.32.1",
     "websockets>=14.1",
 ]
 
 [project.optional-dependencies]
 serve = [
+    "fastapi>=0.115.5",
     "pydantic>=2.9.2",
+    "python-multipart>=0.0.17",
+    "uvicorn[standard]>=0.32.1",
 ]
 
 [project.urls]