Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

impr: consider numbers in pb #4946

Merged
merged 14 commits into from
Feb 22, 2024
Merged

impr: consider numbers in pb #4946

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
55e5a48
impr: consider numbers in pb
Jan 19, 2024
31104db
Merge branch 'master' into master
notreallystatic Jan 19, 2024
a585d03
impr: update pb in UI while considering numbers as well.
Feb 7, 2024
2b25f8e
merge master
Miodec Feb 22, 2024
d10eabd
Merge branch 'master' into master
Miodec Feb 22, 2024
38e2d3f
pretty
Miodec Feb 22, 2024
0a9accc
use nullish coalescing
Miodec Feb 22, 2024
60950a4
pb tables width
Miodec Feb 22, 2024
1f1cdb9
added a quick test
Miodec Feb 22, 2024
a4cb1ac
checking fields which can be undefined
Miodec Feb 22, 2024
109e3c0
nullish coalescing
Miodec Feb 22, 2024
f9c3067
test
Miodec Feb 22, 2024
dc54762
optional chain
Miodec Feb 22, 2024
8bf57bb
better expect
Miodec Feb 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions backend/src/types/types.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,6 +258,7 @@ declare namespace MonkeyTypes {
lazyMode: boolean;
language: string;
punctuation: boolean;
numbers?: boolean;
raw: number;
wpm: number;
timestamp: number;
Expand Down
22 changes: 17 additions & 5 deletions backend/src/utils/pb.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,8 @@ function matchesPersonalBest(
result.difficulty === undefined ||
result.language === undefined ||
result.punctuation === undefined ||
result.lazyMode === undefined
result.lazyMode === undefined ||
result.numbers === undefined
) {
throw new Error("Missing result data (matchesPersonalBest)");
}
Expand All @@ -83,8 +84,15 @@ function matchesPersonalBest(
const samePunctuation = result.punctuation === personalBest.punctuation;
const sameDifficulty = result.difficulty === personalBest.difficulty;
const sameLanguage = result.language === personalBest.language;

return sameLazyMode && samePunctuation && sameDifficulty && sameLanguage;
const sameNumbers = result.numbers === !!personalBest.numbers;

return (
sameLazyMode &&
samePunctuation &&
sameDifficulty &&
sameLanguage &&
sameNumbers
);
}

function updatePersonalBest(
Expand All @@ -103,7 +111,8 @@ function updatePersonalBest(
result.acc === undefined ||
result.consistency === undefined ||
result.rawWpm === undefined ||
result.wpm === undefined
result.wpm === undefined ||
result.numbers === undefined
) {
throw new Error("Missing result data (updatePersonalBest)");
}
Expand All @@ -116,6 +125,7 @@ function updatePersonalBest(
personalBest.consistency = result.consistency;
personalBest.raw = result.rawWpm;
personalBest.wpm = result.wpm;
personalBest.numbers = result.numbers;
personalBest.timestamp = Date.now();

return true;
Expand All @@ -130,7 +140,8 @@ function buildPersonalBest(result: Result): MonkeyTypes.PersonalBest {
result.acc === undefined ||
result.consistency === undefined ||
result.rawWpm === undefined ||
result.wpm === undefined
result.wpm === undefined ||
result.numbers === undefined
) {
throw new Error("Missing result data (buildPersonalBest)");
}
Expand All @@ -143,6 +154,7 @@ function buildPersonalBest(result: Result): MonkeyTypes.PersonalBest {
punctuation: result.punctuation,
raw: result.rawWpm,
wpm: result.wpm,
numbers: result.numbers,
timestamp: Date.now(),
};
}
Expand Down
3 changes: 3 additions & 0 deletions frontend/src/ts/db.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -600,6 +600,7 @@ export async function saveLocalPB<M extends MonkeyTypes.Mode>(
mode: M,
mode2: MonkeyTypes.Mode2<M>,
punctuation: boolean,
numbers: boolean,
language: string,
difficulty: MonkeyTypes.Difficulty,
lazyMode: boolean,
Expand Down Expand Up @@ -636,6 +637,7 @@ export async function saveLocalPB<M extends MonkeyTypes.Mode>(
).forEach((pb) => {
if (
pb.punctuation === punctuation &&
!!pb.numbers === numbers &&
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I dont think !! is necessary here

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I checked that the older personal-bests in a given mode won't have the numbers field. That's why I added this. Btw, I am also adding support for pace-caret and tags, so still working on that. Could you tell if I am missing anything else as well?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah yeah, youre right. All though maybe i would prefer (pb.numbers ?? false) === number

pb.difficulty === difficulty &&
pb.language === language &&
(pb.lazyMode === lazyMode ||
Expand Down Expand Up @@ -666,6 +668,7 @@ export async function saveLocalPB<M extends MonkeyTypes.Mode>(
raw,
timestamp: Date.now(),
consistency,
numbers,
});
}
}
Expand Down
1 change: 1 addition & 0 deletions frontend/src/ts/popups/pb-tables-popup.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ function update(mode: MonkeyTypes.Mode): void {
<td>${pb.difficulty}</td>
<td>${pb.language ? pb.language.replace(/_/g, " ") : "-"}</td>
<td>${pb.punctuation ? '<i class="fas fa-check"></i>' : ""}</td>
<td>${pb.numbers ? '<i class="fas fa-check"></i>' : ""}</td>
<td>${pb.lazyMode ? '<i class="fas fa-check"></i>' : ""}</td>
<td>${dateText}</td>
</tr>
Expand Down
1 change: 1 addition & 0 deletions frontend/src/ts/test/test-logic.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1304,6 +1304,7 @@ async function saveResult(
Config.mode,
completedEvent.mode2,
Config.punctuation,
Config.numbers,
Config.language,
Config.difficulty,
Config.lazyMode,
Expand Down
1 change: 1 addition & 0 deletions frontend/src/ts/types/types.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -329,6 +329,7 @@ declare namespace MonkeyTypes {
raw: number;
wpm: number;
timestamp: number;
numbers?: boolean;
}

interface PersonalBests {
Expand Down
1 change: 1 addition & 0 deletions frontend/static/html/popups.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,6 +256,7 @@
<td>difficulty</td>
<td>language</td>
<td>punctuation</td>
<td>numbers</td>
<td>lazy mode</td>
<td>date</td>
</tr>
Expand Down
Loading