Fix build errors and testing errors

database/entities/Attachment.ts

@@ -61,7 +61,7 @@ export const getUrl = (name: string, config: ConfigType) => {
 	// eslint-disable-next-line @typescript-eslint/no-unsafe-enum-comparison
 	if (config.media.backend === MediaBackendType.LOCAL) {
 		return `${config.http.base_url}/media/${name}`;
-		// eslint-disable-next-line @typescript-eslint/no-unsafe-enum-comparison
+		// eslint-disable-next-line @typescript-eslint/no-unsafe-enum-comparison, @typescript-eslint/no-unnecessary-condition
 	} else if (config.media.backend === MediaBackendType.S3) {
 		return `${config.s3.public_url}/${name}`;
 	}

database/entities/Queue.ts

@@ -1,10 +1,5 @@
 // import { Worker } from "bullmq";
-import { client /* federationQueue */ } from "~database/datasource";
-import {
-	statusAndUserRelations,
-	statusToLysand,
-	type StatusWithRelations,
-} from "./Status";
+import { statusToLysand, type StatusWithRelations } from "./Status";
 import type { User } from "@prisma/client";
 import { ConfigManager } from "config-manager";
 
@@ -157,7 +152,7 @@ export const federateStatusTo = async (
 	);
 
 	// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
-	const userInbox = new URL((user.endpoints as any).inbox);
+	const userInbox = new URL(user.endpoints.inbox);
 
 	const date = new Date();
 

database/entities/Status.ts

@@ -1,11 +1,6 @@
 /* eslint-disable @typescript-eslint/no-unsafe-member-access */
 import type { UserWithRelations } from "./User";
-import {
-	fetchRemoteUser,
-	parseMentionsUris,
-	userRelations,
-	userToAPI,
-} from "./User";
+import { fetchRemoteUser, parseMentionsUris, userToAPI } from "./User";
 import { client } from "~database/datasource";
 import type { LysandPublication, Note } from "~types/lysand/Object";
 import { htmlToText } from "html-to-text";
@@ -29,104 +24,10 @@ import linkifyStr from "linkify-string";
 import linkifyHtml from "linkify-html";
 import { addStausToMeilisearch } from "@meilisearch";
 import { ConfigManager } from "config-manager";
+import { statusAndUserRelations, userRelations } from "./relations";
 
 const config = await new ConfigManager({}).getConfig();
 
-export const statusAndUserRelations: Prisma.StatusInclude = {
-	author: {
-		include: userRelations,
-	},
-	application: true,
-	emojis: true,
-	inReplyToPost: {
-		include: {
-			author: {
-				include: userRelations,
-			},
-			application: true,
-			emojis: true,
-			inReplyToPost: {
-				include: {
-					author: true,
-				},
-			},
-			instance: true,
-			mentions: true,
-			pinnedBy: true,
-			_count: {
-				select: {
-					replies: true,
-				},
-			},
-		},
-	},
-	reblogs: true,
-	attachments: true,
-	instance: true,
-	mentions: {
-		include: userRelations,
-	},
-	pinnedBy: true,
-	_count: {
-		select: {
-			replies: true,
-			likes: true,
-			reblogs: true,
-		},
-	},
-	reblog: {
-		include: {
-			author: {
-				include: userRelations,
-			},
-			application: true,
-			emojis: true,
-			inReplyToPost: {
-				include: {
-					author: true,
-				},
-			},
-			instance: true,
-			mentions: {
-				include: userRelations,
-			},
-			pinnedBy: true,
-			_count: {
-				select: {
-					replies: true,
-				},
-			},
-		},
-	},
-	quotingPost: {
-		include: {
-			author: {
-				include: userRelations,
-			},
-			application: true,
-			emojis: true,
-			inReplyToPost: {
-				include: {
-					author: true,
-				},
-			},
-			instance: true,
-			mentions: true,
-			pinnedBy: true,
-			_count: {
-				select: {
-					replies: true,
-				},
-			},
-		},
-	},
-	likes: {
-		include: {
-			liker: true,
-		},
-	},
-};
-
 const statusRelations = Prisma.validator<Prisma.StatusDefaultArgs>()({
 	include: statusAndUserRelations,
 });

database/entities/User.ts

@@ -9,6 +9,8 @@ import { addInstanceIfNotExists } from "./Instance";
 import type { APISource } from "~types/entities/source";
 import { addUserToMeilisearch } from "@meilisearch";
 import { ConfigManager, type ConfigType } from "config-manager";
+import { userRelations } from "./relations";
+import { MediaBackendType } from "~packages/media-manager";
 
 const configManager = new ConfigManager({});
 const config = await configManager.getConfig();
@@ -23,21 +25,6 @@ export interface AuthData {
  * Stores local and remote users
  */
 
-export const userRelations: Prisma.UserInclude = {
-	emojis: true,
-	instance: true,
-	likes: true,
-	relationships: true,
-	relationshipSubjects: true,
-	pinnedNotes: true,
-	_count: {
-		select: {
-			statuses: true,
-			likes: true,
-		},
-	},
-};
-
 const userRelations2 = Prisma.validator<Prisma.UserDefaultArgs>()({
 	include: userRelations,
 });
@@ -51,9 +38,10 @@ export type UserWithRelations = Prisma.UserGetPayload<typeof userRelations2>;
  */
 export const getAvatarUrl = (user: User, config: ConfigType) => {
 	if (!user.avatar) return config.defaults.avatar;
-	if (config.media.backend === "local") {
+	if (config.media.backend === MediaBackendType.LOCAL) {
 		return `${config.http.base_url}/media/${user.avatar}`;
-	} else if (config.media.backend === "s3") {
+		// eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
+	} else if (config.media.backend === MediaBackendType.S3) {
 		return `${config.s3.public_url}/${user.avatar}`;
 	}
 	return "";
@@ -66,9 +54,10 @@ export const getAvatarUrl = (user: User, config: ConfigType) => {
  */
 export const getHeaderUrl = (user: User, config: ConfigType) => {
 	if (!user.header) return config.defaults.header;
-	if (config.media.backend === "local") {
+	if (config.media.backend === MediaBackendType.LOCAL) {
 		return `${config.http.base_url}/media/${user.header}`;
-	} else if (config.media.backend === "s3") {
+		// eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
+	} else if (config.media.backend === MediaBackendType.S3) {
 		return `${config.s3.public_url}/${user.header}`;
 	}
 	return "";
@@ -366,7 +355,7 @@ export const userToAPI = (
 		bot: user.isBot,
 		source:
 			isOwnAccount && user.source
-				? (user.source as any as APISource)
+				? (user.source as APISource)
 				: undefined,
 		// TODO: Add static avatar and header
 		avatar_static: "",

database/entities/relations.ts

@@ -0,0 +1,111 @@
+import type { Prisma } from "@prisma/client";
+
+export const userRelations: Prisma.UserInclude = {
+	emojis: true,
+	instance: true,
+	likes: true,
+	relationships: true,
+	relationshipSubjects: true,
+	pinnedNotes: true,
+	_count: {
+		select: {
+			statuses: true,
+			likes: true,
+		},
+	},
+};
+
+export const statusAndUserRelations: Prisma.StatusInclude = {
+	author: {
+		include: userRelations,
+	},
+	application: true,
+	emojis: true,
+	inReplyToPost: {
+		include: {
+			author: {
+				include: userRelations,
+			},
+			application: true,
+			emojis: true,
+			inReplyToPost: {
+				include: {
+					author: true,
+				},
+			},
+			instance: true,
+			mentions: true,
+			pinnedBy: true,
+			_count: {
+				select: {
+					replies: true,
+				},
+			},
+		},
+	},
+	reblogs: true,
+	attachments: true,
+	instance: true,
+	mentions: {
+		include: userRelations,
+	},
+	pinnedBy: true,
+	_count: {
+		select: {
+			replies: true,
+			likes: true,
+			reblogs: true,
+		},
+	},
+	reblog: {
+		include: {
+			author: {
+				include: userRelations,
+			},
+			application: true,
+			emojis: true,
+			inReplyToPost: {
+				include: {
+					author: true,
+				},
+			},
+			instance: true,
+			mentions: {
+				include: userRelations,
+			},
+			pinnedBy: true,
+			_count: {
+				select: {
+					replies: true,
+				},
+			},
+		},
+	},
+	quotingPost: {
+		include: {
+			author: {
+				include: userRelations,
+			},
+			application: true,
+			emojis: true,
+			inReplyToPost: {
+				include: {
+					author: true,
+				},
+			},
+			instance: true,
+			mentions: true,
+			pinnedBy: true,
+			_count: {
+				select: {
+					replies: true,
+				},
+			},
+		},
+	},
+	likes: {
+		include: {
+			liker: true,
+		},
+	},
+};