mirror of
https://github.com/kirameki-cafe/Yumi.git
synced 2026-09-13 18:59:19 +00:00
No longer crash if unable to login to VRChat
This commit is contained in:
@@ -29,6 +29,7 @@ interface Cache {
|
||||
class VRChatAPI {
|
||||
public client: VRChatAPIs | null;
|
||||
public configuration: VRChat.Configuration | null;
|
||||
private ready = false;
|
||||
private cache: Cache;
|
||||
private useragent: string | null = null;
|
||||
|
||||
@@ -66,8 +67,18 @@ class VRChatAPI {
|
||||
};
|
||||
|
||||
Logger.info('Logging in to VRChat');
|
||||
let res = await this.client.AuthenticationApi.getCurrentUser();
|
||||
|
||||
let res;
|
||||
try {
|
||||
res = await this.client.AuthenticationApi.getCurrentUser();
|
||||
} catch (err: any) {
|
||||
if (err.response?.status === 401) {
|
||||
Logger.error('Unable to log in to VRChat, check your credentials');
|
||||
return;
|
||||
} else throw err;
|
||||
}
|
||||
|
||||
this.ready = true;
|
||||
Logger.info('Logged in to VRChat as ' + res.data.displayName);
|
||||
|
||||
setInterval(() => {
|
||||
@@ -86,6 +97,10 @@ class VRChatAPI {
|
||||
}, VRC_CACHE_DURATION);
|
||||
}
|
||||
|
||||
public isReady(): boolean {
|
||||
return this.ready;
|
||||
}
|
||||
|
||||
public async getCachedUserById(id: string) {
|
||||
if (typeof this.cache.Users[id] !== 'undefined') {
|
||||
Logger.debug('[VRChat] [Cache] Cache hit for user ' + id);
|
||||
|
||||
Reference in New Issue
Block a user