Leahnaya/nxapi
1
0
Fork 0
mirror of https://github.com/samuelthomas2774/nxapi.git synced 2026-10-26 03:21:50 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use coral result object directly

Browse Source
This commit is contained in:
Samuel Elliott
2022-09-07 17:28:27 +01:00
parent 9112a5a02b
commit 5b93c63c23
19 changed files with 70 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/cli/util/discord-activity.ts
View File

@@ -152,10 +152,10 @@ async function getPresenceFromCoral(argv: ArgumentsCamelCase<Arguments>) {
const friends = await nso.getFriendList();
const webservices = await nso.getWebServices();
const activeevent = await nso.getActiveEvent();
const user = 'expires_at' in data ? (await nso.getCurrentUser()).result : data.nsoAccount.user;
const user = 'expires_at' in data ? await nso.getCurrentUser() : data.nsoAccount.user;
if (argv.friendNsaid) {
const friend = friends.result.friends.find(f => f.nsaId === argv.friendNsaid);
const friend = friends.friends.find(f => f.nsaId === argv.friendNsaid);
if (!friend) {
throw new Error('User "' + argv.friendNsaid + '" is not friends with this user');
@@ -164,7 +164,7 @@ async function getPresenceFromCoral(argv: ArgumentsCamelCase<Arguments>) {
return [friend.presence, friend] as const;
} else {
return [user.presence, user, user.links.friendCode,
'id' in activeevent.result ? activeevent.result : undefined] as const;
'id' in activeevent ? activeevent : undefined] as const;
}
}