From e67dc07473fc08e8e609eafe096e1e03cc901fc0 Mon Sep 17 00:00:00 2001 From: Jesse Wierzbinski Date: Sun, 14 Apr 2024 01:22:47 -1000 Subject: [PATCH] Fix errors flagged by Biome --- database/entities/Status.ts | 2 +- database/entities/User.ts | 2 +- server/api/api/v1/accounts/lookup/index.ts | 2 +- server/api/api/v2/search/index.ts | 2 +- server/api/users/[uuid]/inbox/index.ts | 2 +- utils/loggers.ts | 7 ++++--- 6 files changed, 9 insertions(+), 8 deletions(-) diff --git a/database/entities/Status.ts b/database/entities/Status.ts index 2043738b..4558a27f 100644 --- a/database/entities/Status.ts +++ b/database/entities/Status.ts @@ -1,3 +1,4 @@ +import { dualLogger } from "@loggers"; import { sanitizeHtml } from "@sanitization"; import { config } from "config-manager"; import { @@ -35,7 +36,6 @@ import { statusToMentions, user, } from "~drizzle/schema"; -import { dualLogger } from "@loggers"; import { LogLevel } from "~packages/log-manager"; import type { Note } from "~types/lysand/Object"; import type { Attachment as APIAttachment } from "~types/mastodon/attachment"; diff --git a/database/entities/User.ts b/database/entities/User.ts index 34619033..0ef7436a 100644 --- a/database/entities/User.ts +++ b/database/entities/User.ts @@ -1,4 +1,5 @@ import { getBestContentType, urlToContentFormat } from "@content_types"; +import { dualLogger } from "@loggers"; import { addUserToMeilisearch } from "@meilisearch"; import { type Config, config } from "config-manager"; import { type InferSelectModel, and, eq, sql } from "drizzle-orm"; @@ -12,7 +13,6 @@ import { relationship, user, } from "~drizzle/schema"; -import { dualLogger } from "@loggers"; import { LogLevel } from "~packages/log-manager"; import type { Account as APIAccount } from "~types/mastodon/account"; import type { Source as APISource } from "~types/mastodon/source"; diff --git a/server/api/api/v1/accounts/lookup/index.ts b/server/api/api/v1/accounts/lookup/index.ts index 87b137d7..53850b8a 100644 --- a/server/api/api/v1/accounts/lookup/index.ts +++ b/server/api/api/v1/accounts/lookup/index.ts @@ -1,4 +1,5 @@ import { apiRoute, applyConfig } from "@api"; +import { dualLogger } from "@loggers"; import { errorResponse, jsonResponse } from "@response"; import { anyOf, @@ -17,7 +18,6 @@ import { resolveWebFinger, userToAPI, } from "~database/entities/User"; -import { dualLogger } from "@loggers"; import { LogLevel } from "~packages/log-manager"; export const meta = applyConfig({ diff --git a/server/api/api/v2/search/index.ts b/server/api/api/v2/search/index.ts index 65f1d919..124f5b59 100644 --- a/server/api/api/v2/search/index.ts +++ b/server/api/api/v2/search/index.ts @@ -1,4 +1,5 @@ import { apiRoute, applyConfig } from "@api"; +import { dualLogger } from "@loggers"; import { MeiliIndexType, meilisearch } from "@meilisearch"; import { errorResponse, jsonResponse } from "@response"; import { and, eq, sql } from "drizzle-orm"; @@ -12,7 +13,6 @@ import { } from "~database/entities/User"; import { db } from "~drizzle/db"; import { instance, user } from "~drizzle/schema"; -import { dualLogger } from "@loggers"; import { LogLevel } from "~packages/log-manager"; export const meta = applyConfig({ diff --git a/server/api/users/[uuid]/inbox/index.ts b/server/api/users/[uuid]/inbox/index.ts index 2f9d1c06..832d078f 100644 --- a/server/api/users/[uuid]/inbox/index.ts +++ b/server/api/users/[uuid]/inbox/index.ts @@ -1,4 +1,5 @@ import { apiRoute, applyConfig } from "@api"; +import { dualLogger } from "@loggers"; import { errorResponse, response } from "@response"; import { eq } from "drizzle-orm"; import type * as Lysand from "lysand-types"; @@ -11,7 +12,6 @@ import { } from "~database/entities/User"; import { db } from "~drizzle/db"; import { notification, relationship } from "~drizzle/schema"; -import { dualLogger } from "@loggers"; import { LogLevel } from "~packages/log-manager"; export const meta = applyConfig({ diff --git a/utils/loggers.ts b/utils/loggers.ts index e7e420a9..af76f102 100644 --- a/utils/loggers.ts +++ b/utils/loggers.ts @@ -1,16 +1,17 @@ -import { LogManager, MultiLogManager } from "log-manager"; import { config } from "config-manager"; +import { LogManager, MultiLogManager } from "log-manager"; const noColors = process.env.NO_COLORS === "true"; const noFancyDates = process.env.NO_FANCY_DATES === "true"; const requests_log = Bun.file(config.logging.storage.requests); +const isEntry = true; export const logger = new LogManager( - true ? requests_log : Bun.file("/dev/null"), + isEntry ? requests_log : Bun.file("/dev/null"), ); export const consoleLogger = new LogManager( - true ? Bun.stdout : Bun.file("/dev/null"), + isEntry ? Bun.stdout : Bun.file("/dev/null"), !noColors, !noFancyDates, );