feat(*): handle edge cases and redirects

Author: IgnisDa

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "ryot"
-version = "6.1.5"
+version = "6.2.0"
 edition = "2021"
 repository = "https://github.com/IgnisDa/ryot"
 license = "GPL-3.0"

apps/backend/Cargo.toml

@@ -5888,8 +5888,10 @@ impl MiscellaneousService {
                 )
             })
             .join(JoinType::Join, genre::Relation::MetadataToGenre.def())
-            // fuck it. we ball. (extremely unsafe, guaranteed to fail if table names change)
-            .group_by(Expr::cust("genre.id, genre.name"))
+            .group_by(Expr::tuple([
+                Expr::col(genre::Column::Id).into(),
+                Expr::col(genre::Column::Name).into(),
+            ]))
             .order_by(Expr::col(Alias::new(num_items)), Order::Desc);
         let paginator = query
             .clone()

apps/backend/src/miscellaneous/resolver.rs

@@ -48,6 +48,7 @@ query MediaDetailsQuery($id: Int!) {
           id
           type
           title {
+            english
             userPreferred
           }
           coverImage {

apps/backend/src/providers/anilist/media_details.graphql

@@ -625,10 +625,15 @@ async fn media_details(client: &Client, id: &str, prefer_english: bool) -> Resul
         .unwrap()
         .into_iter()
         .flat_map(|r| {
-            r.unwrap()
-                .media_recommendation
-                .map(|data| PartialMetadataWithoutId {
-                    title: data.title.unwrap().user_preferred.unwrap(),
+            r.unwrap().media_recommendation.map(|data| {
+                let title = data.title.unwrap();
+                let title = if prefer_english {
+                    title.english.or(title.user_preferred).unwrap()
+                } else {
+                    title.user_preferred.unwrap()
+                };
+                PartialMetadataWithoutId {
+                    title,
                     identifier: data.id.to_string(),
                     source: MediaSource::Anilist,
                     lot: match data.type_.unwrap() {
@@ -637,7 +642,8 @@ async fn media_details(client: &Client, id: &str, prefer_english: bool) -> Resul
                         media_details_query::MediaType::Other(_) => unreachable!(),
                     },
                     image: data.cover_image.unwrap().extra_large,
-                })
+                }
+            })
         })
         .collect();
     let score = details.average_score.map(Decimal::from);

apps/backend/src/providers/anilist/mod.rs

@@ -1,14 +1,12 @@
 import { parseWithZod } from "@conform-to/zod";
 import { $path } from "@ignisda/remix-routes";
-import {
-	redirect,
-	unstable_composeUploadHandlers,
-	unstable_createMemoryUploadHandler,
-} from "@remix-run/node";
 import {
 	type CookieOptions,
 	createCookie,
 	createCookieSessionStorage,
+	redirect,
+	unstable_composeUploadHandlers,
+	unstable_createMemoryUploadHandler,
 } from "@remix-run/node";
 import {
 	type CoreDetails,
@@ -400,3 +398,12 @@ export const getUserDetails = async (request: Request) => {
 	);
 	return details as ApplicationUser;
 };
+
+export const extendResponseHeaders = (
+	responseHeaders: Headers,
+	headers: Headers,
+) => {
+	for (const [key, value] of headers.entries())
+		responseHeaders.append(key, value);
+	return responseHeaders;
+};

apps/frontend/app/lib/utilities.server.ts

@@ -29,6 +29,7 @@ import {
 	MetadataSpecificsSchema,
 	colorSchemeCookie,
 	createToastHeaders,
+	extendResponseHeaders,
 	getAuthorizationHeader,
 	getLogoutCookies,
 	gqlClient,
@@ -43,7 +44,8 @@ export const action = unstable_defineAction(async ({ request, response }) => {
 	const url = new URL(request.url);
 	const intent = url.searchParams.get("intent") as string;
 	invariant(intent, "No intent provided");
-	let redirectTo = formData.get(redirectToQueryParam);
+	const redirectToForm = formData.get(redirectToQueryParam);
+	let redirectTo = redirectToForm ? redirectToForm.toString() : undefined;
 	let returnData = {};
 	await match(intent)
 		.with("commitMedia", async () => {
@@ -109,7 +111,10 @@ export const action = unstable_defineAction(async ({ request, response }) => {
 		})
 		.with("logout", async () => {
 			redirectTo = $path("/auth");
-			response.headers = await getLogoutCookies();
+			response.headers = extendResponseHeaders(
+				response.headers,
+				await getLogoutCookies(),
+			);
 		})
 		.with("createReviewComment", async () => {
 			const submission = processSubmission(formData, reviewCommentSchema);
@@ -118,15 +123,18 @@ export const action = unstable_defineAction(async ({ request, response }) => {
 				{ input: submission },
 				await getAuthorizationHeader(request),
 			);
-			response.headers = await createToastHeaders({
-				message:
-					submission.incrementLikes || submission.decrementLikes
-						? "Score changed successfully"
-						: `Comment ${
-								submission.shouldDelete ? "deleted" : "posted"
-							} successfully`,
-				type: "success",
-			});
+			response.headers = extendResponseHeaders(
+				response.headers,
+				await createToastHeaders({
+					message:
+						submission.incrementLikes || submission.decrementLikes
+							? "Score changed successfully"
+							: `Comment ${
+									submission.shouldDelete ? "deleted" : "posted"
+								} successfully`,
+					type: "success",
+				}),
+			);
 		})
 		.with("addEntityToCollection", async () => {
 			const [submission, input] =
@@ -147,10 +155,13 @@ export const action = unstable_defineAction(async ({ request, response }) => {
 					await getAuthorizationHeader(request),
 				);
 			}
-			response.headers = await createToastHeaders({
-				message: "Media added to collection successfully",
-				type: "success",
-			});
+			response.headers = extendResponseHeaders(
+				response.headers,
+				await createToastHeaders({
+					message: "Media added to collection successfully",
+					type: "success",
+				}),
+			);
 		})
 		.with("removeEntityFromCollection", async () => {
 			const [submission, input] =
@@ -176,32 +187,34 @@ export const action = unstable_defineAction(async ({ request, response }) => {
 					{ reviewId: submission.reviewId },
 					await getAuthorizationHeader(request),
 				);
-				response.headers = await createToastHeaders({
-					message: "Review deleted successfully",
-					type: "success",
-				});
+				response.headers = extendResponseHeaders(
+					response.headers,
+					await createToastHeaders({
+						message: "Review deleted successfully",
+						type: "success",
+					}),
+				);
 			} else {
 				await gqlClient.request(
 					PostReviewDocument,
 					{ input: submission },
 					await getAuthorizationHeader(request),
 				);
-				response.headers = await createToastHeaders({
-					message: "Review submitted successfully",
-					type: "success",
-				});
+				response.headers = extendResponseHeaders(
+					response.headers,
+					await createToastHeaders({
+						message: "Review submitted successfully",
+						type: "success",
+					}),
+				);
 			}
 		})
 		.run();
 	if (redirectTo) {
 		response.headers.append("Location", redirectTo.toString());
 		response.status = 302;
 	}
-	// FIXME Once https://discord.com/channels/770287896669978684/1251219797098762290 is resolved
-	return Response.json(returnData, {
-		headers: response.headers,
-		status: response.status,
-	});
+	return Response.json(returnData);
 });
 
 const commitMediaSchema = z.object({

apps/frontend/app/routes/actions.tsx

@@ -43,5 +43,5 @@ export const loader = unstable_defineLoader(async ({ request }) => {
 			),
 		});
 	}
-	return { input };
+	return Response.json({ input });
 });

apps/frontend/app/routes/api.auth.tsx

@@ -17,8 +17,8 @@ export const loader = unstable_defineLoader(async ({ request, params }) => {
 			await getAuthorizationHeader(request),
 		),
 	]);
-	return {
+	return Response.json({
 		details: { images: exerciseDetails.attributes.images },
 		history: userExerciseDetails.history,
-	};
+	});
 });