From 073f8d9e8042c90f638af57b6e7edab11f432b9a Mon Sep 17 00:00:00 2001 From: MeowcaTheoRange Date: Wed, 24 Apr 2024 20:42:30 -0500 Subject: [PATCH] stuff --- src/app/jams/admin/page.tsx | 20 ++++++++++++------- .../api/content/[content]/judgements/route.ts | 2 +- src/app/jams/api/content/route.ts | 2 +- src/app/jams/api/jams/[jam]/content/route.ts | 2 +- src/app/jams/api/jams/route.ts | 2 +- .../jams/api/users/[user]/content/route.ts | 2 +- src/app/jams/api/users/[user]/jams/route.ts | 2 +- .../jams/api/users/[user]/judgements/route.ts | 2 +- src/app/jams/api/users/route.ts | 2 +- src/app/jams/content/[content]/page.tsx | 2 +- src/app/jams/jam/[jam]/page.tsx | 11 +++++++++- src/app/jams/oauth/code/route.ts | 4 +++- src/app/jams/oauth/login/route.ts | 4 +++- src/app/jams/page.tsx | 2 +- src/app/jams/user/[user]/page.tsx | 6 +++--- 15 files changed, 42 insertions(+), 23 deletions(-) diff --git a/src/app/jams/admin/page.tsx b/src/app/jams/admin/page.tsx index dd66de5..0fa553b 100644 --- a/src/app/jams/admin/page.tsx +++ b/src/app/jams/admin/page.tsx @@ -44,7 +44,8 @@ export default async function Home({ .selectFrom('users') .where('users.joined', '<=', curPage) .limit(20) - .orderBy('users.joined', 'asc') + .orderBy('users.admin', 'desc') + .orderBy('users.joined', 'desc') .selectAll() .execute() as unknown[] as JSONUserTable[]; @@ -55,7 +56,7 @@ export default async function Home({ .execute(); return ( - +

cool admin panel !!! :3

contact me@abtmtr.link for help

@@ -70,19 +71,25 @@ export default async function Home({ .selectFrom('jams') .where('jams.author_id', '=', user.id) .select('id') - .orderBy('jams.created', 'asc') + .orderBy('jams.created', 'desc') .execute(); let content = await db .selectFrom('content') .where('content.author_id', '=', user.id) .select('id') - .orderBy('content.submitted', 'asc') + .orderBy('content.submitted', 'desc') .execute(); let judgements = await db .selectFrom('judgements') .where('judgements.author_id', '=', user.id) .select('id') - .orderBy('judgements.published', 'asc') + .orderBy('judgements.published', 'desc') + .execute(); + let tokens = await db + .selectFrom('tokens') + .where('tokens.owner', '=', user.id) + .select('id') + .orderBy('tokens.created', 'desc') .execute(); return (
{user.username}@{user.instance}

{user.url}

{user.banned ? <>BANNED - : <>}{user.admin ? <>ADMIN - : <>}Joined {new Date(parseInt(user.joined)).toDateString()}

-

{jams.length} jam{jams.length != 1 && "s"}, {content.length} submission{content.length != 1 && "s"}, {judgements.length} judgement{judgements.length != 1 && "s"}

+

{jams.length} jam{jams.length != 1 && "s"}, {content.length} submission{content.length != 1 && "s"}, {judgements.length} judgement{judgements.length != 1 && "s"}, {tokens.length} token{tokens.length != 1 && "s"}

Edit user - Delete user

); })} @@ -114,7 +121,6 @@ export default async function Home({ }}>

{app.instance_domain}

Client ID: {app.client_id}

-

Client Secret: {app.client_secret}

Redirect URI: {app.redirect_uri}

Scopes: read

); diff --git a/src/app/jams/api/content/[content]/judgements/route.ts b/src/app/jams/api/content/[content]/judgements/route.ts index adbcadc..7b85c75 100644 --- a/src/app/jams/api/content/[content]/judgements/route.ts +++ b/src/app/jams/api/content/[content]/judgements/route.ts @@ -24,7 +24,7 @@ export async function GET(request: NextRequest, {params}: {params: {content: str .where('judgements.content_id', '=', id) .where('judgements.published', '<', until) .limit(20) - .orderBy('judgements.published', 'asc') + .orderBy('judgements.published', 'desc') .selectAll() .execute(); diff --git a/src/app/jams/api/content/route.ts b/src/app/jams/api/content/route.ts index 005958f..902ad65 100644 --- a/src/app/jams/api/content/route.ts +++ b/src/app/jams/api/content/route.ts @@ -9,7 +9,7 @@ export async function GET(request: NextRequest) { .selectFrom('content') .where('content.submitted', '<', until) .limit(20) - .orderBy('content.submitted', 'asc') + .orderBy('content.submitted', 'desc') .selectAll() .execute(); diff --git a/src/app/jams/api/jams/[jam]/content/route.ts b/src/app/jams/api/jams/[jam]/content/route.ts index 3017ee0..6ac807f 100644 --- a/src/app/jams/api/jams/[jam]/content/route.ts +++ b/src/app/jams/api/jams/[jam]/content/route.ts @@ -23,7 +23,7 @@ export async function GET(request: NextRequest, {params}: {params: {jam: string} .selectFrom('content') .where('content.submitted', '<', until) .limit(20) - .orderBy('content.submitted', 'asc') + .orderBy('content.submitted', 'desc') .selectAll() .execute(); diff --git a/src/app/jams/api/jams/route.ts b/src/app/jams/api/jams/route.ts index 670b5ca..246ae9b 100644 --- a/src/app/jams/api/jams/route.ts +++ b/src/app/jams/api/jams/route.ts @@ -9,7 +9,7 @@ export async function GET(request: NextRequest) { .selectFrom('jams') .where('jams.created', '<', until) .limit(20) - .orderBy('jams.created', 'asc') + .orderBy('jams.created', 'desc') .selectAll() .execute(); diff --git a/src/app/jams/api/users/[user]/content/route.ts b/src/app/jams/api/users/[user]/content/route.ts index 0b2ee38..935f15c 100644 --- a/src/app/jams/api/users/[user]/content/route.ts +++ b/src/app/jams/api/users/[user]/content/route.ts @@ -23,7 +23,7 @@ export async function GET(request: NextRequest, {params}: {params: {user: string .selectFrom('content') .where('content.submitted', '<', until) .limit(20) - .orderBy('content.submitted', 'asc') + .orderBy('content.submitted', 'desc') .selectAll() .execute(); diff --git a/src/app/jams/api/users/[user]/jams/route.ts b/src/app/jams/api/users/[user]/jams/route.ts index 033b15f..8de62df 100644 --- a/src/app/jams/api/users/[user]/jams/route.ts +++ b/src/app/jams/api/users/[user]/jams/route.ts @@ -22,7 +22,7 @@ export async function GET(request: NextRequest, {params}: { params: {user: strin .where('jams.created', '<', until) .where('jams.author_id', '=', id) .limit(20) - .orderBy('jams.created', 'asc') + .orderBy('jams.created', 'desc') .selectAll() .execute(); diff --git a/src/app/jams/api/users/[user]/judgements/route.ts b/src/app/jams/api/users/[user]/judgements/route.ts index 32d0980..42d8332 100644 --- a/src/app/jams/api/users/[user]/judgements/route.ts +++ b/src/app/jams/api/users/[user]/judgements/route.ts @@ -24,7 +24,7 @@ export async function GET(request: NextRequest, {params}: {params: {user: string .where('judgements.author_id', '=', id) .where('judgements.published', '<', until) .limit(20) - .orderBy('judgements.published', 'asc') + .orderBy('judgements.published', 'desc') .selectAll() .execute(); diff --git a/src/app/jams/api/users/route.ts b/src/app/jams/api/users/route.ts index b3f4ef3..7ea8b41 100644 --- a/src/app/jams/api/users/route.ts +++ b/src/app/jams/api/users/route.ts @@ -7,7 +7,7 @@ export async function GET(request: NextRequest) { .selectFrom('users') .where('users.joined', '<', until) .limit(20) - .orderBy('users.joined', 'asc') + .orderBy('users.joined', 'desc') .selectAll() .execute(); diff --git a/src/app/jams/content/[content]/page.tsx b/src/app/jams/content/[content]/page.tsx index 54360bd..c950a82 100644 --- a/src/app/jams/content/[content]/page.tsx +++ b/src/app/jams/content/[content]/page.tsx @@ -77,7 +77,7 @@ export default async function Home({ .where('judgements.content_id', '=', content.id) .where('judgements.published', '<=', curPage) .limit(20) - .orderBy('judgements.published', 'asc') + .orderBy('judgements.published', 'desc') .selectAll() .execute() as unknown[] as JSONJudgementTable[]; diff --git a/src/app/jams/jam/[jam]/page.tsx b/src/app/jams/jam/[jam]/page.tsx index 2b7678e..2ce2d12 100644 --- a/src/app/jams/jam/[jam]/page.tsx +++ b/src/app/jams/jam/[jam]/page.tsx @@ -69,7 +69,7 @@ export default async function Home({ .where('content.jam_id', '=', jam.id) .where('content.submitted', '<=', curPage) .limit(20) - .orderBy('content.submitted', 'asc') + .orderBy('content.submitted', 'desc') .selectAll() .execute() as unknown[] as JSONContentTable[]; @@ -81,6 +81,15 @@ export default async function Home({

{started ? "Started" : "Starts"} {new Date(parseInt(jam.date_start)).toDateString()} - {ended ? "Ended" : "Ends"} {new Date(parseInt(jam.date_end)).toDateString()}

Hosted by {`${jamOwner.username}@${jamOwner.instance}`}

{jam.description}

+ +

Log in with the Fediverse

+

If you'd like to participate in this jam, feel free to log in!

+
+ + +
+

Tested on Mastodon, GoToSocial, Pleroma, and Misskey

+

You have the ability to modify this Jam.

 diff --git a/src/app/jams/oauth/code/route.ts b/src/app/jams/oauth/code/route.ts index 8a73fe4..66f056d 100644 --- a/src/app/jams/oauth/code/route.ts +++ b/src/app/jams/oauth/code/route.ts @@ -115,6 +115,8 @@ export async function GET(request: NextRequest) { } } - cookieStore.set("token", currentToken.id); + cookieStore.set("token", currentToken.id, { + expires: Date.now() + 604800000 + }); return Response.redirect(new URL('/jams', request.url)); } \ No newline at end of file diff --git a/src/app/jams/oauth/login/route.ts b/src/app/jams/oauth/login/route.ts index 01c7081..404abee 100644 --- a/src/app/jams/oauth/login/route.ts +++ b/src/app/jams/oauth/login/route.ts @@ -47,6 +47,8 @@ export async function GET(request: NextRequest) { } } - cookieStore.set("instance", instance); + cookieStore.set("instance", instance, { + expires: Date.now() + 604800000 + }); return Response.redirect(`https://${instance}/oauth/authorize?response_type=code&client_id=${existingInstanceApp.client_id}&redirect_uri=${existingInstanceApp.redirect_uri}&scope=read`); } \ No newline at end of file diff --git a/src/app/jams/page.tsx b/src/app/jams/page.tsx index 96bda34..fa859ce 100644 --- a/src/app/jams/page.tsx +++ b/src/app/jams/page.tsx @@ -41,7 +41,7 @@ export default async function Home({ .selectFrom('jams') .where('jams.created', '<=', curPage) .limit(20) - .orderBy('jams.created', 'asc') + .orderBy('jams.created', 'desc') .selectAll() .execute() as unknown[] as JSONJamTable[]; diff --git a/src/app/jams/user/[user]/page.tsx b/src/app/jams/user/[user]/page.tsx index e8e30f4..465fabf 100644 --- a/src/app/jams/user/[user]/page.tsx +++ b/src/app/jams/user/[user]/page.tsx @@ -59,7 +59,7 @@ export default async function Home({ .where('content.author_id', '=', user.id) .where('content.submitted', '<=', curPage) .limit(20) - .orderBy('content.submitted', 'asc') + .orderBy('content.submitted', 'desc') .selectAll() .execute() as unknown[] as JSONContentTable[]; @@ -68,7 +68,7 @@ export default async function Home({ .where('jams.author_id', '=', user.id) .where('jams.created', '<=', curPage) .limit(20) - .orderBy('jams.created', 'asc') + .orderBy('jams.created', 'desc') .selectAll() .execute() as unknown[] as JSONJamTable[]; @@ -77,7 +77,7 @@ export default async function Home({ .where('judgements.author_id', '=', user.id) .where('judgements.published', '<=', curPage) .limit(20) - .orderBy('judgements.published', 'asc') + .orderBy('judgements.published', 'desc') .selectAll() .execute() as unknown[] as JSONJudgementTable[];