Fix build errors and testing errors

server/api/api/v1/accounts/[id]/followers.ts

@@ -1,8 +1,9 @@
 /* eslint-disable @typescript-eslint/no-unsafe-member-access */
 import { errorResponse, jsonResponse } from "@response";
-import { userRelations, userToAPI } from "~database/entities/User";
+import { userToAPI } from "~database/entities/User";
 import { apiRoute, applyConfig } from "@api";
 import { client } from "~database/datasource";
+import { userRelations } from "~database/entities/relations";
 
 export const meta = applyConfig({
 	allowedMethods: ["GET"],

server/api/api/v1/accounts/[id]/following.ts

@@ -1,8 +1,9 @@
 /* eslint-disable @typescript-eslint/no-unsafe-member-access */
 import { errorResponse, jsonResponse } from "@response";
-import { userRelations, userToAPI } from "~database/entities/User";
+import { userToAPI } from "~database/entities/User";
 import { apiRoute, applyConfig } from "@api";
 import { client } from "~database/datasource";
+import { userRelations } from "~database/entities/relations";
 
 export const meta = applyConfig({
 	allowedMethods: ["GET"],

server/api/api/v1/accounts/[id]/index.ts

@@ -1,8 +1,9 @@
 import { errorResponse, jsonResponse } from "@response";
 import type { UserWithRelations } from "~database/entities/User";
-import { userRelations, userToAPI } from "~database/entities/User";
+import { userToAPI } from "~database/entities/User";
 import { apiRoute, applyConfig } from "@api";
 import { client } from "~database/datasource";
+import { userRelations } from "~database/entities/relations";
 
 export const meta = applyConfig({
 	allowedMethods: ["GET"],

server/api/api/v1/accounts/[id]/statuses.ts

@@ -1,9 +1,12 @@
 /* eslint-disable @typescript-eslint/no-unsafe-member-access */
 import { errorResponse, jsonResponse } from "@response";
-import { statusAndUserRelations, statusToAPI } from "~database/entities/Status";
-import { userRelations } from "~database/entities/User";
+import { statusToAPI } from "~database/entities/Status";
 import { apiRoute, applyConfig } from "@api";
 import { client } from "~database/datasource";
+import {
+	userRelations,
+	statusAndUserRelations,
+} from "~database/entities/relations";
 
 export const meta = applyConfig({
 	allowedMethods: ["GET"],

server/api/api/v1/accounts/familiar_followers/index.ts

@@ -1,7 +1,8 @@
 import { errorResponse, jsonResponse } from "@response";
-import { userRelations, userToAPI } from "~database/entities/User";
+import { userToAPI } from "~database/entities/User";
 import { apiRoute, applyConfig } from "@api";
 import { client } from "~database/datasource";
+import { userRelations } from "~database/entities/relations";
 
 export const meta = applyConfig({
 	allowedMethods: ["GET"],

server/api/api/v1/accounts/search/index.ts

@@ -1,7 +1,8 @@
 import { errorResponse, jsonResponse } from "@response";
-import { userRelations, userToAPI } from "~database/entities/User";
+import { userToAPI } from "~database/entities/User";
 import { apiRoute, applyConfig } from "@api";
 import { client } from "~database/datasource";
+import { userRelations } from "~database/entities/relations";
 
 export const meta = applyConfig({
 	allowedMethods: ["GET"],

server/api/api/v1/accounts/update_credentials/index.ts

@@ -1,5 +1,5 @@
 import { errorResponse, jsonResponse } from "@response";
-import { userRelations, userToAPI } from "~database/entities/User";
+import { userToAPI } from "~database/entities/User";
 import { apiRoute, applyConfig } from "@api";
 import { sanitize } from "isomorphic-dompurify";
 import { sanitizeHtml } from "@sanitization";
@@ -13,6 +13,7 @@ import type { MediaBackend } from "media-manager";
 import { LocalMediaBackend } from "~packages/media-manager/backends/local";
 import { S3MediaBackend } from "~packages/media-manager/backends/s3";
 import { getUrl } from "~database/entities/Attachment";
+import { userRelations } from "~database/entities/relations";
 
 export const meta = applyConfig({
 	allowedMethods: ["PATCH"],

server/api/api/v1/blocks/index.ts

@@ -1,7 +1,8 @@
 import { errorResponse, jsonResponse } from "@response";
-import { userRelations, userToAPI } from "~database/entities/User";
+import { userToAPI } from "~database/entities/User";
 import { apiRoute, applyConfig } from "@api";
 import { client } from "~database/datasource";
+import { userRelations } from "~database/entities/relations";
 
 export const meta = applyConfig({
 	allowedMethods: ["GET"],

server/api/api/v1/favourites/index.ts

@@ -1,7 +1,8 @@
 import { errorResponse, jsonResponse } from "@response";
 import { apiRoute, applyConfig } from "@api";
 import { client } from "~database/datasource";
-import { statusAndUserRelations, statusToAPI } from "~database/entities/Status";
+import { statusAndUserRelations } from "~database/entities/relations";
+import { statusToAPI } from "~database/entities/Status";
 
 export const meta = applyConfig({
 	allowedMethods: ["GET"],

server/api/api/v1/follow_requests/[account_id]/authorize.ts

@@ -1,11 +1,11 @@
 import { errorResponse, jsonResponse } from "@response";
-import { userRelations } from "~database/entities/User";
 import { apiRoute, applyConfig } from "@api";
 import { client } from "~database/datasource";
 import {
 	checkForBidirectionalRelationships,
 	relationshipToAPI,
 } from "~database/entities/Relationship";
+import { userRelations } from "~database/entities/relations";
 
 export const meta = applyConfig({
 	allowedMethods: ["POST"],

server/api/api/v1/follow_requests/[account_id]/reject.ts

@@ -1,11 +1,11 @@
 import { errorResponse, jsonResponse } from "@response";
-import { userRelations } from "~database/entities/User";
 import { apiRoute, applyConfig } from "@api";
 import { client } from "~database/datasource";
 import {
 	checkForBidirectionalRelationships,
 	relationshipToAPI,
 } from "~database/entities/Relationship";
+import { userRelations } from "~database/entities/relations";
 
 export const meta = applyConfig({
 	allowedMethods: ["POST"],

server/api/api/v1/follow_requests/index.ts

@@ -1,7 +1,8 @@
 import { errorResponse, jsonResponse } from "@response";
-import { userRelations, userToAPI } from "~database/entities/User";
+import { userToAPI } from "~database/entities/User";
 import { apiRoute, applyConfig } from "@api";
 import { client } from "~database/datasource";
+import { userRelations } from "~database/entities/relations";
 
 export const meta = applyConfig({
 	allowedMethods: ["GET"],

server/api/api/v1/instance/index.ts

@@ -1,9 +1,10 @@
 import { apiRoute, applyConfig } from "@api";
 import { jsonResponse } from "@response";
 import { client } from "~database/datasource";
-import { userRelations, userToAPI } from "~database/entities/User";
+import { userToAPI } from "~database/entities/User";
 import type { APIInstance } from "~types/entities/instance";
 import manifest from "~package.json";
+import { userRelations } from "~database/entities/relations";
 
 export const meta = applyConfig({
 	allowedMethods: ["GET"],

server/api/api/v1/mutes/index.ts

@@ -1,7 +1,8 @@
 import { errorResponse, jsonResponse } from "@response";
-import { userRelations, userToAPI } from "~database/entities/User";
+import { userToAPI } from "~database/entities/User";
 import { apiRoute, applyConfig } from "@api";
 import { client } from "~database/datasource";
+import { userRelations } from "~database/entities/relations";
 
 export const meta = applyConfig({
 	allowedMethods: ["GET"],

server/api/api/v1/notifications/index.ts

@@ -1,9 +1,11 @@
 import { errorResponse, jsonResponse } from "@response";
-import { userRelations } from "~database/entities/User";
 import { apiRoute, applyConfig } from "@api";
 import { client } from "~database/datasource";
-import { statusAndUserRelations } from "~database/entities/Status";
 import { notificationToAPI } from "~database/entities/Notification";
+import {
+	userRelations,
+	statusAndUserRelations,
+} from "~database/entities/relations";
 
 export const meta = applyConfig({
 	allowedMethods: ["GET"],

server/api/api/v1/profile/avatar.ts

@@ -1,7 +1,8 @@
 import { apiRoute, applyConfig } from "@api";
 import { errorResponse, jsonResponse } from "@response";
 import { client } from "~database/datasource";
-import { userRelations, userToAPI } from "~database/entities/User";
+import { userToAPI } from "~database/entities/User";
+import { userRelations } from "~database/entities/relations";
 
 export const meta = applyConfig({
 	allowedMethods: ["DELETE"],

server/api/api/v1/profile/header.ts

@@ -1,7 +1,8 @@
 import { apiRoute, applyConfig } from "@api";
 import { errorResponse, jsonResponse } from "@response";
 import { client } from "~database/datasource";
-import { userRelations, userToAPI } from "~database/entities/User";
+import { userToAPI } from "~database/entities/User";
+import { userRelations } from "~database/entities/relations";
 
 export const meta = applyConfig({
 	allowedMethods: ["DELETE"],

server/api/api/v1/statuses/[id]/context.ts

@@ -4,9 +4,9 @@ import { client } from "~database/datasource";
 import {
 	getAncestors,
 	getDescendants,
-	statusAndUserRelations,
 	statusToAPI,
 } from "~database/entities/Status";
+import { statusAndUserRelations } from "~database/entities/relations";
 
 export const meta = applyConfig({
 	allowedMethods: ["GET"],

server/api/api/v1/statuses/[id]/favourite.ts

@@ -3,11 +3,8 @@ import { apiRoute, applyConfig } from "@api";
 import { errorResponse, jsonResponse } from "@response";
 import { client } from "~database/datasource";
 import { createLike } from "~database/entities/Like";
-import {
-	isViewableByUser,
-	statusAndUserRelations,
-	statusToAPI,
-} from "~database/entities/Status";
+import { isViewableByUser, statusToAPI } from "~database/entities/Status";
+import { statusAndUserRelations } from "~database/entities/relations";
 import type { APIStatus } from "~types/entities/status";
 
 export const meta = applyConfig({

server/api/api/v1/statuses/[id]/favourited_by.ts

@@ -1,11 +1,12 @@
 import { apiRoute, applyConfig } from "@api";
 import { errorResponse, jsonResponse } from "@response";
 import { client } from "~database/datasource";
+import { isViewableByUser } from "~database/entities/Status";
+import { userToAPI } from "~database/entities/User";
 import {
-	isViewableByUser,
 	statusAndUserRelations,
-} from "~database/entities/Status";
-import { userRelations, userToAPI } from "~database/entities/User";
+	userRelations,
+} from "~database/entities/relations";
 
 export const meta = applyConfig({
 	allowedMethods: ["GET"],

server/api/api/v1/statuses/[id]/index.ts

@@ -6,9 +6,9 @@ import { client } from "~database/datasource";
 import {
 	editStatus,
 	isViewableByUser,
-	statusAndUserRelations,
 	statusToAPI,
 } from "~database/entities/Status";
+import { statusAndUserRelations } from "~database/entities/relations";
 
 export const meta = applyConfig({
 	allowedMethods: ["GET", "DELETE", "PUT"],

server/api/api/v1/statuses/[id]/pin.ts

@@ -2,7 +2,8 @@
 import { apiRoute, applyConfig } from "@api";
 import { errorResponse, jsonResponse } from "@response";
 import { client } from "~database/datasource";
-import { statusAndUserRelations, statusToAPI } from "~database/entities/Status";
+import { statusToAPI } from "~database/entities/Status";
+import { statusAndUserRelations } from "~database/entities/relations";
 
 export const meta = applyConfig({
 	allowedMethods: ["POST"],

server/api/api/v1/statuses/[id]/reblog.ts

@@ -2,12 +2,9 @@
 import { apiRoute, applyConfig } from "@api";
 import { errorResponse, jsonResponse } from "@response";
 import { client } from "~database/datasource";
-import {
-	isViewableByUser,
-	statusAndUserRelations,
-	statusToAPI,
-} from "~database/entities/Status";
+import { isViewableByUser, statusToAPI } from "~database/entities/Status";
 import { type UserWithRelations } from "~database/entities/User";
+import { statusAndUserRelations } from "~database/entities/relations";
 
 export const meta = applyConfig({
 	allowedMethods: ["POST"],

server/api/api/v1/statuses/[id]/reblogged_by.ts

@@ -1,11 +1,12 @@
 import { apiRoute, applyConfig } from "@api";
 import { errorResponse, jsonResponse } from "@response";
 import { client } from "~database/datasource";
+import { isViewableByUser } from "~database/entities/Status";
+import { userToAPI } from "~database/entities/User";
 import {
-	isViewableByUser,
 	statusAndUserRelations,
-} from "~database/entities/Status";
-import { userRelations, userToAPI } from "~database/entities/User";
+	userRelations,
+} from "~database/entities/relations";
 
 export const meta = applyConfig({
 	allowedMethods: ["GET"],

server/api/api/v1/statuses/[id]/source.ts

@@ -1,10 +1,8 @@
 import { apiRoute, applyConfig } from "@api";
 import { errorResponse } from "@response";
 import { client } from "~database/datasource";
-import {
-	isViewableByUser,
-	statusAndUserRelations,
-} from "~database/entities/Status";
+import { isViewableByUser } from "~database/entities/Status";
+import { statusAndUserRelations } from "~database/entities/relations";
 
 export const meta = applyConfig({
 	allowedMethods: ["GET"],

server/api/api/v1/statuses/[id]/unfavourite.ts

@@ -3,11 +3,8 @@ import { apiRoute, applyConfig } from "@api";
 import { errorResponse, jsonResponse } from "@response";
 import { client } from "~database/datasource";
 import { deleteLike } from "~database/entities/Like";
-import {
-	isViewableByUser,
-	statusAndUserRelations,
-	statusToAPI,
-} from "~database/entities/Status";
+import { isViewableByUser, statusToAPI } from "~database/entities/Status";
+import { statusAndUserRelations } from "~database/entities/relations";
 import type { APIStatus } from "~types/entities/status";
 
 export const meta = applyConfig({

server/api/api/v1/statuses/[id]/unpin.ts

@@ -1,7 +1,8 @@
 import { apiRoute, applyConfig } from "@api";
 import { errorResponse, jsonResponse } from "@response";
 import { client } from "~database/datasource";
-import { statusAndUserRelations, statusToAPI } from "~database/entities/Status";
+import { statusToAPI } from "~database/entities/Status";
+import { statusAndUserRelations } from "~database/entities/relations";
 
 export const meta = applyConfig({
 	allowedMethods: ["POST"],

server/api/api/v1/statuses/[id]/unreblog.ts

@@ -1,11 +1,8 @@
 import { apiRoute, applyConfig } from "@api";
 import { errorResponse, jsonResponse } from "@response";
 import { client } from "~database/datasource";
-import {
-	isViewableByUser,
-	statusAndUserRelations,
-	statusToAPI,
-} from "~database/entities/Status";
+import { isViewableByUser, statusToAPI } from "~database/entities/Status";
+import { statusAndUserRelations } from "~database/entities/relations";
 import type { APIStatus } from "~types/entities/status";
 
 export const meta = applyConfig({

server/api/api/v1/statuses/index.ts

@@ -5,12 +5,9 @@ import { parse } from "marked";
 import { client } from "~database/datasource";
 import { getFromToken } from "~database/entities/Application";
 import type { StatusWithRelations } from "~database/entities/Status";
-import {
-	createNewStatus,
-	statusAndUserRelations,
-	statusToAPI,
-} from "~database/entities/Status";
+import { createNewStatus, statusToAPI } from "~database/entities/Status";
 import type { UserWithRelations } from "~database/entities/User";
+import { statusAndUserRelations } from "~database/entities/relations";
 
 export const meta = applyConfig({
 	allowedMethods: ["POST"],

server/api/api/v1/timelines/home.ts

@@ -1,7 +1,8 @@
 import { apiRoute, applyConfig } from "@api";
 import { errorResponse, jsonResponse } from "@response";
 import { client } from "~database/datasource";
-import { statusAndUserRelations, statusToAPI } from "~database/entities/Status";
+import { statusToAPI } from "~database/entities/Status";
+import { statusAndUserRelations } from "~database/entities/relations";
 
 export const meta = applyConfig({
 	allowedMethods: ["GET"],

server/api/api/v1/timelines/public.ts

@@ -1,7 +1,8 @@
 import { apiRoute, applyConfig } from "@api";
 import { errorResponse, jsonResponse } from "@response";
 import { client } from "~database/datasource";
-import { statusAndUserRelations, statusToAPI } from "~database/entities/Status";
+import { statusToAPI } from "~database/entities/Status";
+import { statusAndUserRelations } from "~database/entities/relations";
 
 export const meta = applyConfig({
 	allowedMethods: ["GET"],

server/api/api/v2/search/index.ts

@@ -2,8 +2,12 @@ import { apiRoute, applyConfig } from "@api";
 import { MeiliIndexType, meilisearch } from "@meilisearch";
 import { errorResponse, jsonResponse } from "@response";
 import { client } from "~database/datasource";
-import { statusAndUserRelations, statusToAPI } from "~database/entities/Status";
-import { userRelations, userToAPI } from "~database/entities/User";
+import { statusToAPI } from "~database/entities/Status";
+import { userToAPI } from "~database/entities/User";
+import {
+	statusAndUserRelations,
+	userRelations,
+} from "~database/entities/relations";
 
 export const meta = applyConfig({
 	allowedMethods: ["GET"],

server/api/auth/login/index.ts

@@ -2,7 +2,7 @@ import { apiRoute, applyConfig } from "@api";
 import { randomBytes } from "crypto";
 import { client } from "~database/datasource";
 import { TokenType } from "~database/entities/Token";
-import { userRelations } from "~database/entities/User";
+import { userRelations } from "~database/entities/relations";
 
 export const meta = applyConfig({
 	allowedMethods: ["POST"],

server/api/auth/redirect/index.ts

@@ -1,6 +1,6 @@
 import { apiRoute, applyConfig } from "@api";
 import { client } from "~database/datasource";
-import { userRelations } from "~database/entities/User";
+import { userRelations } from "~database/entities/relations";
 
 export const meta = applyConfig({
 	allowedMethods: ["POST"],

server/api/users/[uuid]/inbox/index.ts

@@ -6,12 +6,12 @@ import { client } from "~database/datasource";
 import { parseEmojis } from "~database/entities/Emoji";
 import { createLike, deleteLike } from "~database/entities/Like";
 import { createFromObject } from "~database/entities/Object";
+import { createNewStatus, fetchFromRemote } from "~database/entities/Status";
+import { parseMentionsUris } from "~database/entities/User";
 import {
-	createNewStatus,
-	fetchFromRemote,
+	userRelations,
 	statusAndUserRelations,
-} from "~database/entities/Status";
-import { parseMentionsUris, userRelations } from "~database/entities/User";
+} from "~database/entities/relations";
 import type {
 	Announce,
 	Like,

server/api/users/[uuid]/index.ts

@@ -1,7 +1,8 @@
 import { apiRoute, applyConfig } from "@api";
 import { errorResponse, jsonResponse } from "@response";
 import { client } from "~database/datasource";
-import { userRelations, userToLysand } from "~database/entities/User";
+import { userToLysand } from "~database/entities/User";
+import { userRelations } from "~database/entities/relations";
 
 export const meta = applyConfig({
 	allowedMethods: ["POST"],

server/api/users/[uuid]/outbox/index.ts

@@ -1,10 +1,8 @@
 import { jsonResponse } from "@response";
 import { apiRoute, applyConfig } from "@api";
-import {
-	statusAndUserRelations,
-	statusToLysand,
-} from "~database/entities/Status";
+import { statusToLysand } from "~database/entities/Status";
 import { client } from "~database/datasource";
+import { statusAndUserRelations } from "~database/entities/relations";
 
 export const meta = applyConfig({
 	allowedMethods: ["GET"],