Front: Unmount Blurhash on image load

front/src/api/api.ts

@@ -1170,9 +1170,6 @@ export default class API {
 		if (this.isDev()) {
 			return `${"/api"}${imageURL}`;
 		}
-		if (isSSR()) {
-			return `${this.SSR_API_URL}${imageURL}`;
-		}
 		return `${process.env.PUBLIC_SERVER_URL ?? "/api"}${imageURL}`;
 	}
 

front/src/components/illustration.tsx

@@ -101,7 +101,18 @@ const Illustration = (props: IllustrationProps) => {
 				/>
 			</Fade>
 			{blurhash && (
-				<Fade in={loadingState !== "errored"} unmountOnExit>
+				<Fade
+					in={
+						isSSR()
+							? loadingState !== "errored"
+							: loadingState !== "finished"
+					}
+					unmountOnExit
+					timeout={{
+						// Hack to avoid blurhash exiting before image is painted
+						exit: theme.transitions.duration.leavingScreen * 2,
+					}}
+				>
 					<Box
 						style={{
 							position: "absolute",

server/package.json

@@ -33,7 +33,6 @@
 		"@nestjs/schedule": "^2.1.0",
 		"@nestjs/swagger": "^6.2.1",
 		"@prisma/client": "^5.5.2",
-		"@taumechanica/stout": "^2.2.0",
 		"archiver": "^5.3.1",
 		"axios": "^0.27.2",
 		"bcrypt": "^5.1.0",

server/src/track/track.service.ts

@@ -34,7 +34,6 @@ import Slug from "src/slug/slug";
 import type { PaginationParameters } from "src/pagination/models/pagination-parameters";
 import Tracklist, { UnknownDiscIndexKey } from "./models/tracklist.model";
 import RepositoryService from "src/repository/repository.service";
-import { shuffle } from "@taumechanica/stout";
 import AlbumService from "src/album/album.service";
 import LibraryService from "src/library/library.service";
 import { Track, TrackWithRelations } from "src/prisma/models";
@@ -371,7 +370,10 @@ export default class TrackService extends RepositoryService<
 
 		tracklist.forEach((disc) => (playlist = playlist.concat(disc)));
 		if (random) {
-			shuffle(playlist);
+			return playlist
+				.map((value) => ({ value, sort: Math.random() }))
+				.sort((a, b) => a.sort - b.sort)
+				.map(({ value }) => value);
 		}
 		return playlist;
 	}

server/yarn.lock

@@ -1421,11 +1421,6 @@
   dependencies:
     defer-to-connect "^2.0.0"
 
-"@taumechanica/stout@^2.2.0":
-  version "2.4.0"
-  resolved "https://registry.npmjs.org/@taumechanica/stout/-/stout-2.4.0.tgz"
-  integrity sha512-1ugu5hsGaV1G9cP2N9ncfFVJPCSQHKFSwIC99Pb72pwtAff9CuQCgmKneXqP2F7btd09vAELWWGW/Qpci0aO5A==
-
 "@tokenizer/token@^0.3.0":
   version "0.3.0"
   resolved "https://registry.npmjs.org/@tokenizer/token/-/token-0.3.0.tgz"