diff options
| -rw-r--r-- | build/index.js | 16 | ||||
| -rw-r--r-- | build/mojang.js | 1 | ||||
| -rw-r--r-- | src/index.ts | 26 | ||||
| -rw-r--r-- | src/mojang.ts | 1 |
4 files changed, 27 insertions, 17 deletions
diff --git a/build/index.js b/build/index.js index 577c1ac..736b137 100644 --- a/build/index.js +++ b/build/index.js @@ -64,11 +64,15 @@ app.get('/', async (req, res) => { }); app.get('/player/:user', async (req, res) => { try { - res.json(await hypixel_1.fetchUser({ user: req.params.user }, [req.query.basic === 'true' ? undefined : 'profiles', 'player'], req.query.customization === 'true')); + const user = await hypixel_1.fetchUser({ user: req.params.user }, [req.query.basic === 'true' ? undefined : 'profiles', 'player'], req.query.customization === 'true'); + if (user) + res.json(user); + else + res.status(404).json({ error: true }); } catch (err) { console.error(err); - res.json({ 'error': true }); + res.json({ error: true }); } }); app.get('/discord/:id', async (req, res) => { @@ -82,11 +86,15 @@ app.get('/discord/:id', async (req, res) => { }); app.get('/player/:user/:profile', async (req, res) => { try { - res.json(await hypixel_1.fetchMemberProfile(req.params.user, req.params.profile, req.query.customization === 'true')); + const profile = await hypixel_1.fetchMemberProfile(req.params.user, req.params.profile, req.query.customization === 'true'); + if (profile) + res.json(profile); + else + res.status(404).json({ error: true }); } catch (err) { console.error(err); - res.json({ 'error': true }); + res.json({ error: true }); } }); app.get('/player/:user/:profile/leaderboards', async (req, res) => { diff --git a/build/mojang.js b/build/mojang.js index e5b6ee6..3ad8d5e 100644 --- a/build/mojang.js +++ b/build/mojang.js @@ -88,7 +88,6 @@ async function profileFromUsernameAlternative(username) { catch { return { uuid: null, username: null }; } - console.log('aight ashcon returned', data); return { uuid: util_1.undashUuid(data.uuid), username: data.username diff --git a/src/index.ts b/src/index.ts index 489ef52..4f4ad00 100644 --- a/src/index.ts +++ b/src/index.ts @@ -46,16 +46,18 @@ app.get('/', async(req, res) => { app.get('/player/:user', async(req, res) => { try { - res.json( - await fetchUser( - { user: req.params.user }, - [req.query.basic as string === 'true' ? undefined : 'profiles', 'player'], - req.query.customization as string === 'true' - ) + const user = await fetchUser( + { user: req.params.user }, + [req.query.basic as string === 'true' ? undefined : 'profiles', 'player'], + req.query.customization as string === 'true' ) + if (user) + res.json(user) + else + res.status(404).json({ error: true }) } catch (err) { console.error(err) - res.json({ 'error': true }) + res.json({ error: true }) } }) @@ -72,12 +74,14 @@ app.get('/discord/:id', async(req, res) => { app.get('/player/:user/:profile', async(req, res) => { try { - res.json( - await fetchMemberProfile(req.params.user, req.params.profile, req.query.customization as string === 'true') - ) + const profile = await fetchMemberProfile(req.params.user, req.params.profile, req.query.customization as string === 'true') + if (profile) + res.json(profile) + else + res.status(404).json({ error: true }) } catch (err) { console.error(err) - res.json({ 'error': true }) + res.json({ error: true }) } }) diff --git a/src/mojang.ts b/src/mojang.ts index 2560c77..055809a 100644 --- a/src/mojang.ts +++ b/src/mojang.ts @@ -105,7 +105,6 @@ export async function profileFromUsernameAlternative(username: string): Promise< } catch { return { uuid: null, username: null } } - console.log('aight ashcon returned', data) return { uuid: undashUuid(data.uuid), username: data.username |