Merge branch 'fix-account-not-found' into 'main'

Fix user not found in accountLookupController

Closes #102

See merge request soapbox-pub/ditto!213
This commit is contained in:
Alex Gleason 2024-05-03 14:23:27 +00:00
commit 67aa31b748
1 changed files with 8 additions and 2 deletions

View File

@ -17,6 +17,7 @@ import { accountFromPubkey, renderAccount } from '@/views/mastodon/accounts.ts';
import { renderRelationship } from '@/views/mastodon/relationships.ts';
import { renderStatus } from '@/views/mastodon/statuses.ts';
import { hydrateEvents } from '@/storages/hydrate.ts';
import { bech32ToPubkey } from '@/utils.ts';
const usernameSchema = z
.string().min(1).max(30)
@ -76,8 +77,13 @@ const accountLookupController: AppController = async (c) => {
if (event) {
return c.json(await renderAccount(event));
}
return c.json({ error: 'Could not find user.' }, 404);
try {
const pubkey = bech32ToPubkey(decodeURIComponent(acct)) as string;
return c.json(await accountFromPubkey(pubkey));
} catch (e) {
console.log(e);
return c.json({ error: 'Could not find user.' }, 404);
}
};
const accountSearchController: AppController = async (c) => {