versia-pub/server
2
0
Fork 0
mirror of https://github.com/versia-pub/server.git synced 2025-12-06 16:38:19 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix(federation): 🐛 Make WebFinger always search for local users

Browse source
This commit is contained in:
Jesse Wierzbinski 2024-07-20 00:18:44 +02:00
parent b5b8831073
commit 23d091f7ce
No known key found for this signature in database
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
server/api/well-known/webfinger/index.ts
View file

@ -13,7 +13,7 @@ import {
FederationRequester, FederationRequester,
type ResponseError, type ResponseError,
} from "@lysand-org/federation/requester"; } from "@lysand-org/federation/requester";
import { eq } from "drizzle-orm"; import { and, eq, isNull } from "drizzle-orm";
import { lookup } from "mime-types"; import { lookup } from "mime-types";
import { z } from "zod"; import { z } from "zod";
import { Users } from "~/drizzle/schema"; import { Users } from "~/drizzle/schema";
@ -66,9 +66,12 @@ export default (app: Hono) =>
const isUuid = requestedUser.split("@")[0].match(idValidator); const isUuid = requestedUser.split("@")[0].match(idValidator);
const user = await User.fromSql( const user = await User.fromSql(
eq( and(
isUuid ? Users.id : Users.username, eq(
requestedUser.split("@")[0], isUuid ? Users.id : Users.username,
requestedUser.split("@")[0],
),
isNull(Users.instanceId),
), ),
); );