From 06856ae422ac96cec4907694bec4eecd2ad69383 Mon Sep 17 00:00:00 2001 From: stringsplit <77242831+nbitzz@users.noreply.github.com> Date: Fri, 24 May 2024 15:47:22 -0700 Subject: [PATCH] huhh --- src/server/lib/middleware.ts | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/src/server/lib/middleware.ts b/src/server/lib/middleware.ts index f02ce9f..ece4bb6 100644 --- a/src/server/lib/middleware.ts +++ b/src/server/lib/middleware.ts @@ -17,6 +17,14 @@ export const getAccount: RequestHandler = function (ctx, next) { return next() } +export function resolveTarget(actor: Accounts.Account, targetString: string) { + return targetString == "me" + ? actor + : targetString.startsWith("@") + ? Accounts.getFromUsername(targetString.slice(1)) + : Accounts.getFromId(targetString) +} + /** * @description use :user param to get a target for this route */ @@ -29,12 +37,7 @@ export const getTarget: RequestHandler = async (ctx, next) => { let actor = ctx.get("account") - let target = - ctx.req.param("user") == "me" - ? actor - : ctx.req.param("user").startsWith("@") - ? Accounts.getFromUsername(ctx.req.param("user").slice(1)) - : Accounts.getFromId(ctx.req.param("user")) + let target = resolveTarget(actor, ctx.req.param("user")) if (!target) return ServeError(ctx, 404, "account does not exist")