diff --git a/classes/functions/federation.ts b/classes/functions/federation.ts index 2596e8fb..81b7ba16 100644 --- a/classes/functions/federation.ts +++ b/classes/functions/federation.ts @@ -2,9 +2,6 @@ import type { Undo } from "@lysand-org/federation/types"; import { config } from "config-manager"; import type { User } from "~/packages/database-interface/user"; -export const localObjectUri = (id: string) => - new URL(`/objects/${id}`, config.http.base_url).toString(); - export const undoFederationRequest = (undoer: User, uri: string): Undo => { const id = crypto.randomUUID(); return { diff --git a/packages/database-interface/note.ts b/packages/database-interface/note.ts index 532140aa..247e53d5 100644 --- a/packages/database-interface/note.ts +++ b/packages/database-interface/note.ts @@ -1,4 +1,5 @@ import { idValidator } from "@/api"; +import { localObjectUri } from "@/constants"; import { proxyUrl } from "@/response"; import { sanitizedHtmlStrip } from "@/sanitization"; import { sentry } from "@/sentry"; @@ -29,7 +30,6 @@ import { type Application, applicationToApi, } from "~/classes/functions/application"; -import { localObjectUri } from "~/classes/functions/federation"; import { type StatusWithRelations, contentToHtml, @@ -230,7 +230,7 @@ export class Note extends BaseInterface { relationships: { where: (relationship, { eq, and }) => and( - eq(relationship.subjectId, Users.id), + eq(relationship.subjectId, this.data.authorId), eq(relationship.following, true), ), }, diff --git a/utils/constants.ts b/utils/constants.ts index b35c7da5..6fafefc1 100644 --- a/utils/constants.ts +++ b/utils/constants.ts @@ -2,3 +2,6 @@ import { config } from "config-manager"; export const oauthRedirectUri = (issuer: string) => new URL(`/oauth/sso/${issuer}/callback`, config.http.base_url).toString(); + +export const localObjectUri = (id: string) => + new URL(`/objects/${id}`, config.http.base_url).toString();