MrUnknownDE/VRCX
1
0
Fork 0
mirror of https://github.com/MrUnknownDE/VRCX.git synced 2026-04-22 00:03:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

Lint

Browse Source
This commit is contained in:
Natsumi
2022-02-11 12:31:10 +13:00
parent d7e737dd75
commit ec78e88f32
2 changed files with 19 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
html/src/app.js
View File

@@ -5983,7 +5983,7 @@ speechSynthesis.getVoices();
username: loginParmas.username, username: loginParmas.username,
password: loginParmas.password password: loginParmas.password
}) })
.catch((err2) => { .catch(() => {
this.loginForm.loading = false; this.loginForm.loading = false;
API.logout(); API.logout();
}) })
@@ -9703,7 +9703,8 @@ speechSynthesis.getVoices();
appId = '846232616054030376'; appId = '846232616054030376';
bigIcon = 'vr_dancing'; bigIcon = 'vr_dancing';
} else if ( } else if (
L.worldId === 'wrld_52bdcdab-11cd-4325-9655-0fb120846945') { L.worldId === 'wrld_52bdcdab-11cd-4325-9655-0fb120846945'
) {
appId = '939473404808007731'; appId = '939473404808007731';
bigIcon = 'zuwa_zuwa_dance'; bigIcon = 'zuwa_zuwa_dance';
} }
@@ -12678,13 +12679,15 @@ speechSynthesis.getVoices();
if (this.lastLocation.playerList.has(D.ref.displayName)) { if (this.lastLocation.playerList.has(D.ref.displayName)) {
inCurrentWorld = true; inCurrentWorld = true;
} }
database.getUserStats(D.ref, inCurrentWorld).then((ref1) => { database
if (ref1.userId === D.id) { .getUserStats(D.ref, inCurrentWorld)
D.lastSeen = ref1.created_at; .then((ref1) => {
D.joinCount = ref1.joinCount; if (ref1.userId === D.id) {
D.timeSpent = ref1.timeSpent; D.lastSeen = ref1.created_at;
} D.joinCount = ref1.joinCount;
}); D.timeSpent = ref1.timeSpent;
}
});
} }
return args; return args;
}); });
@@ -15998,7 +16001,7 @@ speechSynthesis.getVoices();
if (this.lastLocation.playerList.has(ctx.ref.displayName)) { if (this.lastLocation.playerList.has(ctx.ref.displayName)) {
inCurrentWorld = true; inCurrentWorld = true;
} }
this.getUserStats(ctx.ref); this.getUserStats(ctx.ref, inCurrentWorld);
ctx.ref.$friendNum = ctx.no; ctx.ref.$friendNum = ctx.no;
results.push(ctx.ref); results.push(ctx.ref);
} }
@@ -16007,10 +16010,11 @@ speechSynthesis.getVoices();
$app.methods.getUserStats = async function (ctx) { $app.methods.getUserStats = async function (ctx) {
var ref = await database.getUserStats(ctx); var ref = await database.getUserStats(ctx);
// eslint-disable-next-line require-atomic-updates /* eslint-disable require-atomic-updates */
ctx.$joinCount = ref.joinCount; ctx.$joinCount = ref.joinCount;
ctx.$lastSeen = ref.created_at; ctx.$lastSeen = ref.created_at;
ctx.$timeSpent = ref.timeSpent; ctx.$timeSpent = ref.timeSpent;
/* eslint-enable require-atomic-updates */
}; };
$app.watch.friendsListSearch = $app.methods.friendsListSearchChange; $app.watch.friendsListSearch = $app.methods.friendsListSearchChange;
@@ -19000,7 +19004,7 @@ speechSynthesis.getVoices();
hour: 'numeric', hour: 'numeric',
minute: 'numeric', minute: 'numeric',
second: 'numeric', second: 'numeric',
hourCycle: (hour12 ? 'h12' : 'h23') hourCycle: hour12 ? 'h12' : 'h23'
}); });
} else if (format === 'short') { } else if (format === 'short') {
return dt return dt
@@ -19009,7 +19013,7 @@ speechSynthesis.getVoices();
day: '2-digit', day: '2-digit',
hour: 'numeric', hour: 'numeric',
minute: 'numeric', minute: 'numeric',
hourCycle: (hour12 ? 'h12' : 'h23') hourCycle: hour12 ? 'h12' : 'h23'
}) })
.replace(' AM', 'am') .replace(' AM', 'am')
.replace(' PM', 'pm') .replace(' PM', 'pm')

4
html/src/vr.js
View File

@@ -329,7 +329,7 @@ Vue.component('marquee-text', MarqueeText);
year: 'numeric', year: 'numeric',
hour: 'numeric', hour: 'numeric',
minute: 'numeric', minute: 'numeric',
hourCycle: (this.config.dtHour12 ? 'h12' : 'h23') hourCycle: this.config.dtHour12 ? 'h12' : 'h23'
}) })
.replace(' AM', ' am') .replace(' AM', ' am')
.replace(' PM', ' pm') .replace(' PM', ' pm')
@@ -612,7 +612,7 @@ Vue.component('marquee-text', MarqueeText);
.toLocaleTimeString($app.currentCulture, { .toLocaleTimeString($app.currentCulture, {
hour: '2-digit', hour: '2-digit',
minute: 'numeric', minute: 'numeric',
hourCycle: ($app.config.dtHour12 ? 'h12' : 'h23') hourCycle: $app.config.dtHour12 ? 'h12' : 'h23'
}) })
.replace(' am', '') .replace(' am', '')
.replace(' pm', ''); .replace(' pm', '');