fix: share feature

src/lib/shareConversation.ts

@@ -1,14 +1,16 @@
 import { base } from "$app/paths";
 import { ERROR_MESSAGES, error } from "$lib/stores/errors";
 import { share } from "./utils/share";
-import { page } from "$app/stores";
-import { get } from "svelte/store";
-import { getShareUrl } from "./utils/getShareUrl";
+import { page } from "$app/state";
+
 export async function shareConversation(id: string, title: string) {
 	try {
 		if (id.length === 7) {
-			const url = get(page).url;
-			await share(getShareUrl(url, id), title, true);
+			const shareUrl = `${
+				page.data.publicConfig.PUBLIC_SHARE_PREFIX ||
+				`${page.data.publicConfig.PUBLIC_ORIGIN || page.url.origin}${base}`
+			}/r/${id}`;
+			await share(shareUrl, title, true);
 		} else {
 			const res = await fetch(`${base}/conversation/${id}/share`, {
 				method: "POST",
@@ -23,8 +25,14 @@ export async function shareConversation(id: string, title: string) {
 				return;
 			}
 
-			const { url } = await res.json();
-			await share(url, title, true);
+			const { shareId } = await res.json();
+
+			const shareUrl = `${
+				page.data.publicConfig.PUBLIC_SHARE_PREFIX ||
+				`${page.data.publicConfig.PUBLIC_ORIGIN || page.url.origin}${base}`
+			}/r/${shareId}`;
+
+			await share(shareUrl, title, true);
 		}
 	} catch (err) {
 		error.set(ERROR_MESSAGES.default);

src/lib/utils/getShareUrl.ts

@@ -1,9 +0,0 @@
-import { base } from "$app/paths";
-import { page } from "$app/state";
-
-export function getShareUrl(url: URL, shareId: string): string {
-	return `${
-		page.data.publicConfig.PUBLIC_SHARE_PREFIX ||
-		`${page.data.publicConfig.PUBLIC_ORIGIN || url.origin}${base}`
-	}/r/${shareId}`;
-}

src/routes/conversation/[id]/share/+server.ts

@@ -1,13 +1,12 @@
 import { authCondition } from "$lib/server/auth";
 import { collections } from "$lib/server/database";
 import type { SharedConversation } from "$lib/types/SharedConversation";
-import { getShareUrl } from "$lib/utils/getShareUrl";
 import { hashConv } from "$lib/utils/hashConv";
 import { error } from "@sveltejs/kit";
 import { ObjectId } from "mongodb";
 import { nanoid } from "nanoid";
 
-export async function POST({ params, url, locals }) {
+export async function POST({ params, locals }) {
 	const conversation = await collections.conversations.findOne({
 		_id: new ObjectId(params.id),
 		...authCondition(locals),
@@ -24,7 +23,7 @@ export async function POST({ params, url, locals }) {
 	if (existingShare) {
 		return new Response(
 			JSON.stringify({
-				url: getShareUrl(url, existingShare._id),
+				shareId: existingShare._id,
 			}),
 			{ headers: { "Content-Type": "application/json" } }
 		);
@@ -65,7 +64,7 @@ export async function POST({ params, url, locals }) {
 
 	return new Response(
 		JSON.stringify({
-			url: getShareUrl(url, shared._id),
+			shareId: shared._id,
 		}),
 		{ headers: { "Content-Type": "application/json" } }
 	);