fix backend when it comes to images

Author: iiPythonx

nightwatch/__init__.py

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

nightwatch/rics/__init__.py

@@ -162,6 +162,10 @@ async def connect_endpoint(
     while websocket.application_state == WebSocketState.CONNECTED:
         match await client.receive():
             case {"type": "message", "data": {"message": message}}:
+                if not message.strip():
+                    await client.send({"type": "problem", "data": {"message": "You cannot send a blank message."}})
+                    continue
+
                 await app.state.broadcast({"type": "message", "data": {"user": client.serialize(), "message": message}})
 
             case {"type": "user-list", "data": _}:
@@ -182,7 +186,6 @@ async def connect_endpoint(
 # Handle image forwarding
 SESSION = Session()
 PROXY_SIZE_LIMIT = 10 * (1024 ** 2)
-PROXY_ALLOWED_SUFFIX = ["avif", "avifs", "apng", "png", "jpeg", "jpg", "jfif", "webp", "ico", "gif", "svg"]
 
 @app.get("/api/fwd/{public_url:str}", response_model = None)
 async def forward_image(public_url: str) -> Response | JSONResponse:
@@ -192,13 +195,6 @@ async def forward_image(public_url: str) -> Response | JSONResponse:
     except (binascii.Error, UnicodeDecodeError):
         return JSONResponse({"code": 400, "message": "Failed to contact the specified URI."}, status_code = 400)
 
-    filename = new_url.split("?")[0].split("/")[-1]
-    if "." not in filename:
-        return JSONResponse({"code": 400, "message": "Specified URI does not have an extension."}, status_code = 400)
-
-    if filename.split(".")[-1] not in PROXY_ALLOWED_SUFFIX:
-        return JSONResponse({"code": 400, "message": "Specified URI has an unsupported extension."}, status_code = 400)
-
     try:
         data = b""
         with SESSION.get(new_url, stream = True) as response:
@@ -213,7 +209,7 @@ async def forward_image(public_url: str) -> Response | JSONResponse:
                 response.status_code,
                 {
                     k: v
-                    for k, v in response.headers.items() if k in ["Content-Type", "Content-Length", "Cache-Control"]
+                    for k, v in response.headers.items() if k in ["Content-Type", "Cache-Control"]
                 }
             )
 

nightwatch/web/css/main.css

@@ -103,6 +103,10 @@ input:hover {
     padding-top: 5px;
     padding-bottom: 5px;
 }
+.message-content.has-image > span > a {
+    display: flex;
+    align-items: center;
+}
 .message-content > a > img {
     max-width: 500px;
 }

nightwatch/web/js/nightwatch.js

@@ -9,6 +9,7 @@ const leftmark_rules = [
     { regex: /__(.*?)__/g, replace: "<u>$1</u>" },
     { regex: /~~(.*?)~~/g, replace: "<s>$1</s>" },
     { regex: /\*(.*?)\*/g, replace: "<em>$1</em>" },
+    { regex: /\!\[(.*?)\]\((.*?)\)/g, replace: `<a href = "$2" target = "_blank"><img alt = "$1" src = "$2"></a>` },
     { regex: /\[(.*?)\]\((.*?)\)/g, replace: `<a href = "$2" target = "_blank" rel = "noreferrer">$1</a>` }
 ];
 
@@ -86,21 +87,29 @@ const NOTIFICATION_SFX = new Audio("/audio/notification.mp3");
                 // Construct text/attachment
                 let attachment = message.message, classlist = "message-content";
                 if (attachment.toLowerCase().match(/^https:\/\/[\w\d./-]+.(?:avifs?|a?png|jpe?g|jfif|webp|ico|gif|svg)(?:\?.+)?$/)) {
-                    const url = `http${connection.protocol}://${address}/api/fwd/${btoa(attachment.slice(8))}`;
-                    attachment = `<a href = "${url}" target = "_blank"><img src = "${url}"></a>`;
-                    classlist += " has-image";
-                } else {
-
-                    // Clean attachment for the love of god
-                    const cleaned = attachment.replace(/&/g, "&amp;")
-                                    .replace(/</g, "&lt;")
-                                    .replace(/>/g, "&gt;")
-                                    .replace(/"/g, "&quot;")
-                                    .replace(/"/g, "&#039;");
-                    
-                    // Apply leftmark
-                    attachment = leftmark(cleaned);
-                    if (cleaned !== attachment) attachment = `<span>${attachment}</span>`;
+                    attachment = `![untitled](${attachment})`;
+                }
+
+                // Clean attachment for the love of god
+                const cleaned = attachment.replace(/&/g, "&amp;")
+                                .replace(/</g, "&lt;")
+                                .replace(/>/g, "&gt;")
+                                .replace(/"/g, "&quot;")
+                                .replace(/"/g, "&#039;");
+                
+                // Apply leftmark
+                attachment = leftmark(cleaned);
+                if (cleaned !== attachment) {
+                    attachment = `<span>${attachment}</span>`;
+                    const dom = new DOMParser().parseFromString(attachment, "text/html");
+
+                    // Handle image adjusting
+                    const image = dom.querySelector("img");
+                    if (image) {
+                        classlist += " has-image";
+                        image.src = `http${connection.protocol}://${address}/api/fwd/${btoa(image.src.slice(8))}`;
+                        attachment = dom.body.innerHTML;
+                    };
                 };
 
                 // Construct message