Fix callout share app

beabee-communityrm · Mar 15, 2024 · eb11fa1 · eb11fa1
1 parent 319b99a
commit eb11fa1
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/src/apps/share/app.ts b/src/apps/share/app.ts
@@ -18,11 +18,18 @@ app.set("views", __dirname + "/views");
 async function getCalloutShareSettings(
   uri: string
 ): Promise<JustPageSettings | undefined> {
-  const [slug, rest] = uri.substring("/callouts/".length).split("/", 1);
-  const locale = rest.split("?lang=")[1] || "default";
+  const parts = uri.substring("/callouts/".length).split("?");
+  const slug = parts[0].split("/")[0];
+  const locale =
+    parts[1]
+      ?.split("&")
+      .map((q) => q.split("="))
+      .find(([k]) => k === "lang")?.[1] || "default";
+
+  console.log("slug", slug, "locale", locale);
 
   const callout = await createQueryBuilder(Callout, "c")
-    .leftJoinAndSelect("c.variants", "v", "v.locale = :locale", { locale })
+    .innerJoinAndSelect("c.variants", "v", "v.name = :locale", { locale })
     .where("c.slug = :slug", { slug })
     .getOne();