From a51529042ef8b25fb23c352b659bf75dfcbc6ae3 Mon Sep 17 00:00:00 2001
From: Omer Sabic <osabic2004@gmail.com>
Date: Wed, 29 May 2024 23:08:37 +0200
Subject: [PATCH] wtf I have no idea

---
 src/db/index.js    | 20 ++++++++++----------
 src/routes/blog.js | 13 ++++++++++---
 src/routes/me.js   |  2 +-
 3 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/src/db/index.js b/src/db/index.js
index 0fffc79..17d3b39 100644
--- a/src/db/index.js
+++ b/src/db/index.js
@@ -21,14 +21,14 @@ export const initDb = async () => {
     schema,
   });
 
-  await migrate(db, {
-    migrationsFolder: "./src/db/migrations",
-  })
-    .then(() => {
-      Logger.info("INIT", "Migrated database");
-    })
-    .catch((error) => {
-      Logger.error("INIT", `Failed to migrate database ${String(error)}`);
-      throw new Error(`Failed to migrate database ${String(error)}`);
-    });
+  // await migrate(db, {
+  //   migrationsFolder: "./src/db/migrations",
+  // })
+  //   .then(() => {
+  //     Logger.info("INIT", "Migrated database");
+  //   })
+  //   .catch((error) => {
+  //     Logger.error("INIT", `Failed to migrate database ${String(error)}`);
+  //     throw new Error(`Failed to migrate database ${String(error)}`);
+  //   });
 };
diff --git a/src/routes/blog.js b/src/routes/blog.js
index f29d6e3..5e4c5eb 100644
--- a/src/routes/blog.js
+++ b/src/routes/blog.js
@@ -44,12 +44,19 @@ export const blogRoutes = (fastify, _, done) => {
             let site;
             if (mine) {
                 if (!(await authMiddlewareFn(request, response))) return;
-                [site] = await db.select().from(sites).where(and(eq(sites.user_id, request.session.user_id)));
+                try {
+                    [site] = await db.select().from(sites).where(and(eq(sites.user_id, request.session.user_id)));
+                } catch (e) {
+                    console.log(e);
+                }
             }
             else {
                 let referer = new URL(request.headers.origin).host;
-                console.log(referer)
-                [site] = await db.select().from(sites).where(eq(sites.domain, referer)).limit(1);
+                try {
+                    [site] = await db.select().from(sites).where(or(eq(sites.domain, referer), eq(sites.subdomain_slug, referer.split(".")[0])));
+                } catch (e) {
+                    console.log(e);
+                }
             }
             if (!site) {
                 response.status(400).send({
diff --git a/src/routes/me.js b/src/routes/me.js
index 9556b4d..327e9b4 100644
--- a/src/routes/me.js
+++ b/src/routes/me.js
@@ -45,7 +45,7 @@ export const meRoutes = (fastify, _, done) => {
   fastify.get("/billing", async (request, response) => {
     try {
       const [user] = await db.select().from(users).where(eq(users.id, request.session.user_id));
-      const billing_session_url = await getBillingDashboard(user.stripe_id, env.FRONTEND_URL+"/app");
+      const billing_session_url = await getBillingDashboard(user.stripe_id, env.FRONTEND_URL);
 
       response.redirect(billing_session_url);
       return;