monkeytypegame/monkeytype
1
1
Fork 0
mirror of https://github.com/monkeytypegame/monkeytype.git synced 2025-12-27 02:21:27 +08:00
Code Issues Projects Releases Packages Wiki Activity

use new resolve type

Browse source
This commit is contained in:
Miodec 2025-12-21 16:44:00 +01:00
parent 477ba7a811
commit 38e1e27f58
2 changed files with 10 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
frontend/src/ts/tribe/tribe-results.ts
View file

@ -263,19 +263,15 @@ function updateUser(page: string, userId: string): void {
let otherText = "-";
const resolve = userResult.resolve;
if (resolve.afk) {
otherText = "afk";
} else if (resolve.repeated) {
otherText = "repeated";
} else if (resolve.failed && !configInfinite) {
if ("valid" in resolve && !resolve.valid) {
otherText = `invalid(${resolve.invalidReason})`;
} else if ("failed" in resolve && resolve.failed) {
otherText = `failed(${resolve.failedReason})`;
} else if (resolve.saved === false) {
} else if ("saved" in resolve && !resolve.saved) {
otherText = `save failed(${resolve.saveFailedMessage})`;
} else if (resolve.valid === false) {
otherText = `invalid`;
} else if (configInfinite) {
otherText = `${Math.round(userResult.testDuration)}s`;
} else if (resolve.saved && resolve.isPb) {
} else if ("saved" in resolve && resolve.saved && resolve.isPb) {
otherText = "new pb";
}
userEl.find(`.other .text`).text(otherText);

12
frontend/src/ts/tribe/tribe.ts
View file

@ -697,16 +697,14 @@ TribeSocket.in.room.userResult((data) => {
const resolve = data.result?.resolve;
if (
resolve === undefined ||
resolve?.afk ||
resolve?.repeated ||
resolve?.valid === false ||
resolve?.saved === false ||
resolve?.failed === true
("valid" in resolve && !resolve.valid) ||
("saved" in resolve && !resolve.saved) ||
("failed" in resolve && resolve.failed)
) {
//todo only one
let color: ColorName | undefined = undefined;
if (resolve?.failed === true) {
if (resolve === undefined || ("failed" in resolve && resolve.failed)) {
color = "colorfulError";
}
@ -716,7 +714,7 @@ TribeSocket.in.room.userResult((data) => {
if (!TribeConfig.isConfigInfinite(room.config)) {
TribeResults.fadeUser("result", data.userId);
}
if (resolve?.afk) {
if (resolve === undefined || ("valid" in resolve && !resolve.valid)) {
TribeCarets.destroy(data.userId);
}
} else {