From b694b14065582c980b90cf2ab95ac380248f218b Mon Sep 17 00:00:00 2001
From: Flummi <git@srv.fail>
Date: Mon, 17 Mar 2025 09:04:11 +0100
Subject: [PATCH] idk

---
 dist/index.js  |  2 +-
 dist/router.js | 10 +++++-----
 src/index.ts   |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/dist/index.js b/dist/index.js
index 1fd469f..9a44404 100644
--- a/dist/index.js
+++ b/dist/index.js
@@ -124,7 +124,7 @@ export default class Flummpress {
             res.reply({ code, type: "text/html", body });
         };
         res.redirect = (target, code = 302) => {
-            res.writeHead(code, { Location: target });
+            res.writeHead(code, { Location: encodeURI(target) });
             res.end();
         };
         return res;
diff --git a/dist/router.js b/dist/router.js
index d34371a..bf037ad 100644
--- a/dist/router.js
+++ b/dist/router.js
@@ -13,7 +13,6 @@ import Tpl from "./template.js";
 export default class Router {
     constructor() {
         this.routes = [];
-        this.routes;
         this.mimes = new Map();
     }
     importRoutesFromPath(p_1) {
@@ -71,6 +70,7 @@ export default class Router {
     }
     use(obj) {
         if (obj instanceof Router) {
+            this.routes = Object.assign(Object.assign({}, this.routes), obj.routes);
             this.sortRoutes();
         }
         if (obj instanceof Tpl) {
@@ -102,12 +102,12 @@ export default class Router {
         return this;
     }
     registerRoute(path, method, handler) {
-        const existingRoute = this.routes.find(route => typeof route.path === "string"
+        const route = this.routes.find(route => typeof route.path === "string"
             ? route.path === path
             : route.path instanceof RegExp && path instanceof RegExp && route.path.toString() === path.toString());
-        if (existingRoute) {
-            existingRoute.methods[method] = [
-                ...(existingRoute.methods[method] || []),
+        if (route) {
+            route.methods[method] = [
+                ...(route.methods[method] || []),
                 ...handler
             ];
         }
diff --git a/src/index.ts b/src/index.ts
index 6343e45..37bd22b 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -198,7 +198,7 @@ export default class Flummpress {
     };
 
     res.redirect = (target, code = 302) => {
-      res.writeHead(code, { Location: target });
+      res.writeHead(code, { Location: encodeURI(target) });
       res.end();
     };