diff --git a/apps/www/src/app/to/[username]/page.tsx b/apps/www/src/app/(user)/to/[username]/page.tsx
similarity index 76%
rename from apps/www/src/app/to/[username]/page.tsx
rename to apps/www/src/app/(user)/to/[username]/page.tsx
index 18d2ae49..dced0d18 100644
--- a/apps/www/src/app/to/[username]/page.tsx
+++ b/apps/www/src/app/(user)/to/[username]/page.tsx
@@ -1,14 +1,13 @@
-import { cache } from "react";
import dynamic from "next/dynamic";
import { redirect } from "next/navigation";
import { BadgeCheck, Lock, MessageCircleOff } from "lucide-react";
-import getClient from "@/lib/gql/rsc";
import { getSession } from "@/lib/auth";
-import { USER_BY_USERNAME_QUERY } from "./queries";
+import { getUserByUsername } from "../../queries";
import { ShareButton } from "@/app/components/share-button";
import { Card, CardHeader } from "@umamin/ui/components/card";
+const AdContainer = dynamic(() => import("@umamin/ui/ad"));
const ChatForm = dynamic(() => import("./components/form"));
const UnauthenticatedDialog = dynamic(
() => import("./components/unauthenticated"),
@@ -52,20 +51,12 @@ export async function generateMetadata({
};
}
-const getUser = cache(async (username: string) => {
- const result = await getClient().query(USER_BY_USERNAME_QUERY, {
- username,
- });
-
- return result.data?.userByUsername;
-});
-
export default async function SendMessage({
params,
}: {
params: { username: string };
}) {
- const user = await getUser(params.username);
+ const user = await getUserByUsername(params.username);
if (!user) {
redirect("/404");
@@ -74,7 +65,10 @@ export default async function SendMessage({
const { session } = await getSession();
return (
-
+
+ {/* v2-send-to */}
+
+
@@ -93,16 +87,6 @@ export default async function SendMessage({
- {/*
- @{user.username}
- */}
-
umamin
@@ -112,16 +96,12 @@ export default async function SendMessage({
+
- Messages are automatically encrypted
+ Advanced Encryption Standard
- {/* v2-send-to
-
- */}
-
);
diff --git a/apps/www/src/app/user/[username]/loading.tsx b/apps/www/src/app/(user)/user/[username]/loading.tsx
similarity index 100%
rename from apps/www/src/app/user/[username]/loading.tsx
rename to apps/www/src/app/(user)/user/[username]/loading.tsx
diff --git a/apps/www/src/app/user/[username]/page.tsx b/apps/www/src/app/(user)/user/[username]/page.tsx
similarity index 77%
rename from apps/www/src/app/user/[username]/page.tsx
rename to apps/www/src/app/(user)/user/[username]/page.tsx
index 25a17351..b2ff2988 100644
--- a/apps/www/src/app/user/[username]/page.tsx
+++ b/apps/www/src/app/(user)/user/[username]/page.tsx
@@ -1,32 +1,15 @@
import Link from "next/link";
-import { cache } from "react";
-import { graphql } from "gql.tada";
import dynamic from "next/dynamic";
import { redirect } from "next/navigation";
import { MessageSquareMore, UserPlus } from "lucide-react";
-import getClient from "@/lib/gql/rsc";
import { cn } from "@umamin/ui/lib/utils";
+import { getUserByUsername } from "../../queries";
import { UserCard } from "@/app/components/user-card";
import { Button, buttonVariants } from "@umamin/ui/components/button";
const AdContainer = dynamic(() => import("@umamin/ui/ad"), { ssr: false });
-const USER_BY_USERNAME_QUERY = graphql(`
- query UserByUsername($username: String!) {
- userByUsername(username: $username) {
- __typename
- id
- bio
- username
- displayName
- imageUrl
- createdAt
- quietMode
- }
- }
-`);
-
export async function generateMetadata({
params,
}: {
@@ -68,20 +51,12 @@ export async function generateMetadata({
};
}
-const getUser = cache(async (username: string) => {
- const result = await getClient().query(USER_BY_USERNAME_QUERY, {
- username,
- });
-
- return result.data?.userByUsername;
-});
-
export default async function Page({
params,
}: {
params: { username: string };
}) {
- const user = await getUser(params.username);
+ const user = await getUserByUsername(params.username);
if (!user) {
redirect("/404");
diff --git a/apps/www/src/app/api/graphql/route.ts b/apps/www/src/app/api/graphql/route.ts
index 8ffa8377..6efa7f35 100644
--- a/apps/www/src/app/api/graphql/route.ts
+++ b/apps/www/src/app/api/graphql/route.ts
@@ -1,10 +1,11 @@
import { cookies } from "next/headers";
import { createYoga } from "graphql-yoga";
import { getSession, lucia } from "@/lib/auth";
-import { useAPQ } from "@graphql-yoga/plugin-apq";
import { gqlSchema, initContextCache } from "@umamin/gql";
+import persistedOperations from "@/persisted-operations.json";
import { useResponseCache } from "@graphql-yoga/plugin-response-cache";
import { useCSRFPrevention } from "@graphql-yoga/plugin-csrf-prevention";
+import { usePersistedOperations } from "@graphql-yoga/plugin-persisted-operations";
import { useDisableIntrospection } from "@graphql-yoga/plugin-disable-introspection";
const { handleRequest } = createYoga({
@@ -44,15 +45,48 @@ const { handleRequest } = createYoga({
},
ttl: 30_000,
ttlPerSchemaCoordinate: {
- "Query.notes": 180_000,
- "Query.notesFromCursor": 180_000,
- "Query.userByUsername": 300_000,
+ "Query.notes": 120_000,
+ "Query.notesFromCursor": 120_000,
+ "Query.userByUsername": 120_000,
},
}),
useDisableIntrospection({
isDisabled: () => process.env.NODE_ENV === "production",
}),
- useAPQ(),
+ usePersistedOperations({
+ allowArbitraryOperations: process.env.NODE_ENV === "development",
+ customErrors: {
+ notFound: {
+ message: "Operation is not found",
+ extensions: {
+ http: {
+ status: 404,
+ },
+ },
+ },
+ keyNotFound: {
+ message: "Key is not found",
+ extensions: {
+ http: {
+ status: 404,
+ },
+ },
+ },
+ persistedQueryOnly: {
+ message: "Operation is not allowed",
+ extensions: {
+ http: {
+ status: 403,
+ },
+ },
+ },
+ },
+ skipDocumentValidation: true,
+ async getPersistedOperation(key: string) {
+ // @ts-ignore
+ return persistedOperations[key];
+ },
+ }),
],
});
diff --git a/apps/www/src/app/components/chat-list.tsx b/apps/www/src/app/components/chat-list.tsx
index b0e78eab..8df8a8cb 100644
--- a/apps/www/src/app/components/chat-list.tsx
+++ b/apps/www/src/app/components/chat-list.tsx
@@ -34,7 +34,7 @@ export const ChatList = ({ imageUrl, question, reply, response }: Props) => {
)}
{response && (
-
+
diff --git a/apps/www/src/app/components/navbar.tsx b/apps/www/src/app/components/navbar.tsx
index 668b9afd..bd1482ee 100644
--- a/apps/www/src/app/components/navbar.tsx
+++ b/apps/www/src/app/components/navbar.tsx
@@ -24,7 +24,7 @@ export async function Navbar() {
: "v2.0.0";
return (
-