mirror of
https://github.com/monkeytypegame/monkeytype.git
synced 2026-01-08 16:34:45 +08:00
improved leaderboards - no longer checking if there is no need
This commit is contained in:
Miodec
parent
2633167f1d
commit
9d2a7b3277
1 changed files with 122 additions and 102 deletions
|
|
@ -2012,6 +2012,9 @@ class Leaderboard {
|
|||
logBoard() {
|
||||
console.log(this.board);
|
||||
}
|
||||
getMinWpm() {
|
||||
return this.board[this.board.length - 1].wpm;
|
||||
}
|
||||
removeDuplicates(insertedAt, uid) {
|
||||
//return true if a better result is found
|
||||
let found = false;
|
||||
|
|
@ -2042,29 +2045,52 @@ class Leaderboard {
|
|||
insert(a) {
|
||||
let insertedAt = -1;
|
||||
if (a.mode == this.mode && parseInt(a.mode2) === parseInt(this.mode2)) {
|
||||
this.board.forEach((b, index) => {
|
||||
if (insertedAt !== -1) return;
|
||||
if (a.wpm === b.wpm) {
|
||||
if (a.acc === b.acc) {
|
||||
if (a.timestamp < b.timestamp) {
|
||||
this.board.splice(index, 0, {
|
||||
uid: a.uid,
|
||||
name: a.name,
|
||||
wpm: parseFloat(a.wpm),
|
||||
raw: parseFloat(a.rawWpm),
|
||||
acc: parseFloat(a.acc),
|
||||
consistency: isNaN(parseInt(a.consistency))
|
||||
? "-"
|
||||
: parseInt(a.consistency),
|
||||
mode: a.mode,
|
||||
mode2: parseInt(a.mode2),
|
||||
timestamp: a.timestamp,
|
||||
hidden: a.hidden === undefined ? false : a.hidden,
|
||||
});
|
||||
insertedAt = index;
|
||||
if (
|
||||
this.board.length !== this.size ||
|
||||
(this.board.length === this.size && a.wpm > this.getMinWpm())
|
||||
) {
|
||||
this.board.forEach((b, index) => {
|
||||
if (insertedAt !== -1) return;
|
||||
if (a.wpm === b.wpm) {
|
||||
if (a.acc === b.acc) {
|
||||
if (a.timestamp < b.timestamp) {
|
||||
this.board.splice(index, 0, {
|
||||
uid: a.uid,
|
||||
name: a.name,
|
||||
wpm: parseFloat(a.wpm),
|
||||
raw: parseFloat(a.rawWpm),
|
||||
acc: parseFloat(a.acc),
|
||||
consistency: isNaN(parseInt(a.consistency))
|
||||
? "-"
|
||||
: parseInt(a.consistency),
|
||||
mode: a.mode,
|
||||
mode2: parseInt(a.mode2),
|
||||
timestamp: a.timestamp,
|
||||
hidden: a.hidden === undefined ? false : a.hidden,
|
||||
});
|
||||
insertedAt = index;
|
||||
}
|
||||
} else {
|
||||
if (a.acc > b.acc) {
|
||||
this.board.splice(index, 0, {
|
||||
uid: a.uid,
|
||||
name: a.name,
|
||||
wpm: parseFloat(a.wpm),
|
||||
raw: parseFloat(a.rawWpm),
|
||||
acc: parseFloat(a.acc),
|
||||
consistency: isNaN(parseInt(a.consistency))
|
||||
? "-"
|
||||
: parseInt(a.consistency),
|
||||
mode: a.mode,
|
||||
mode2: parseInt(a.mode2),
|
||||
timestamp: a.timestamp,
|
||||
hidden: a.hidden === undefined ? false : a.hidden,
|
||||
});
|
||||
insertedAt = index;
|
||||
}
|
||||
}
|
||||
} else {
|
||||
if (a.acc > b.acc) {
|
||||
if (a.wpm > b.wpm) {
|
||||
this.board.splice(index, 0, {
|
||||
uid: a.uid,
|
||||
name: a.name,
|
||||
|
|
@ -2082,65 +2108,51 @@ class Leaderboard {
|
|||
insertedAt = index;
|
||||
}
|
||||
}
|
||||
} else {
|
||||
if (a.wpm > b.wpm) {
|
||||
this.board.splice(index, 0, {
|
||||
uid: a.uid,
|
||||
name: a.name,
|
||||
wpm: parseFloat(a.wpm),
|
||||
raw: parseFloat(a.rawWpm),
|
||||
acc: parseFloat(a.acc),
|
||||
consistency: isNaN(parseInt(a.consistency))
|
||||
? "-"
|
||||
: parseInt(a.consistency),
|
||||
mode: a.mode,
|
||||
mode2: parseInt(a.mode2),
|
||||
timestamp: a.timestamp,
|
||||
hidden: a.hidden === undefined ? false : a.hidden,
|
||||
});
|
||||
insertedAt = index;
|
||||
});
|
||||
if (this.board.length < this.size && insertedAt === -1) {
|
||||
this.board.push({
|
||||
uid: a.uid,
|
||||
name: a.name,
|
||||
wpm: parseFloat(a.wpm),
|
||||
raw: parseFloat(a.rawWpm),
|
||||
acc: parseFloat(a.acc),
|
||||
consistency: isNaN(parseInt(a.consistency))
|
||||
? "-"
|
||||
: parseInt(a.consistency),
|
||||
mode: a.mode,
|
||||
mode2: parseInt(a.mode2),
|
||||
timestamp: a.timestamp,
|
||||
hidden: a.hidden === undefined ? false : a.hidden,
|
||||
});
|
||||
insertedAt = this.board.length - 1;
|
||||
}
|
||||
// console.log("before duplicate remove");
|
||||
// console.log(this.board);
|
||||
let newBest = false;
|
||||
let foundAt = null;
|
||||
if (insertedAt >= 0) {
|
||||
// if (this.removeDuplicates(insertedAt, a.uid)) {
|
||||
// insertedAt = -2;
|
||||
// }
|
||||
foundAt = this.removeDuplicates(insertedAt, a.uid);
|
||||
|
||||
if (foundAt >= insertedAt) {
|
||||
//new better result
|
||||
newBest = true;
|
||||
}
|
||||
}
|
||||
});
|
||||
if (this.board.length < this.size && insertedAt === -1) {
|
||||
this.board.push({
|
||||
uid: a.uid,
|
||||
name: a.name,
|
||||
wpm: parseFloat(a.wpm),
|
||||
raw: parseFloat(a.rawWpm),
|
||||
acc: parseFloat(a.acc),
|
||||
consistency: isNaN(parseInt(a.consistency))
|
||||
? "-"
|
||||
: parseInt(a.consistency),
|
||||
mode: a.mode,
|
||||
mode2: parseInt(a.mode2),
|
||||
timestamp: a.timestamp,
|
||||
hidden: a.hidden === undefined ? false : a.hidden,
|
||||
});
|
||||
insertedAt = this.board.length - 1;
|
||||
// console.log(this.board);
|
||||
this.clipBoard();
|
||||
return {
|
||||
insertedAt: insertedAt,
|
||||
newBest: newBest,
|
||||
foundAt: foundAt,
|
||||
};
|
||||
} else {
|
||||
return {
|
||||
insertedAt: -999,
|
||||
};
|
||||
}
|
||||
// console.log("before duplicate remove");
|
||||
// console.log(this.board);
|
||||
let newBest = false;
|
||||
let foundAt = null;
|
||||
if (insertedAt >= 0) {
|
||||
// if (this.removeDuplicates(insertedAt, a.uid)) {
|
||||
// insertedAt = -2;
|
||||
// }
|
||||
foundAt = this.removeDuplicates(insertedAt, a.uid);
|
||||
|
||||
if (foundAt >= insertedAt) {
|
||||
//new better result
|
||||
newBest = true;
|
||||
}
|
||||
}
|
||||
// console.log(this.board);
|
||||
this.clipBoard();
|
||||
return {
|
||||
insertedAt: insertedAt,
|
||||
newBest: newBest,
|
||||
foundAt: foundAt,
|
||||
};
|
||||
} else {
|
||||
return {
|
||||
insertedAt: -999,
|
||||
|
|
@ -2408,33 +2420,41 @@ async function checkLeaderboards(
|
|||
lbData = lbdoc.docs[0].data();
|
||||
}
|
||||
let boardInfo = lbData;
|
||||
let boardData = lbData.board;
|
||||
let lb = new Leaderboard(
|
||||
boardInfo.size,
|
||||
resultObj.mode,
|
||||
resultObj.mode2,
|
||||
boardInfo.type,
|
||||
boardData
|
||||
);
|
||||
let insertResult = lb.insert(resultObj);
|
||||
if (
|
||||
boardInfo.minWpm === undefined ||
|
||||
boardInfo.board.length !== boardInfo.size ||
|
||||
(boardInfo.minWpm !== undefined &&
|
||||
resultObj.wpm > boardInfo.minWpm &&
|
||||
boardInfo.board.length === boardInfo.size)
|
||||
) {
|
||||
let boardData = lbData.board;
|
||||
let lb = new Leaderboard(
|
||||
boardInfo.size,
|
||||
resultObj.mode,
|
||||
resultObj.mode2,
|
||||
boardInfo.type,
|
||||
boardData
|
||||
);
|
||||
let insertResult = lb.insert(resultObj);
|
||||
|
||||
if (insertResult.insertedAt >= 0) {
|
||||
//update the database here
|
||||
// console.log(
|
||||
// `leaderboard changed ${resultObj.mode} ${
|
||||
// resultObj.mode2
|
||||
// } ${type} - ${JSON.stringify(lb.board)}`
|
||||
// );
|
||||
t.update(db.collection("leaderboards").doc(docid), {
|
||||
size: lb.size,
|
||||
type: lb.type,
|
||||
board: lb.board,
|
||||
});
|
||||
if (insertResult.insertedAt >= 0) {
|
||||
t.update(db.collection("leaderboards").doc(docid), {
|
||||
size: lb.size,
|
||||
type: lb.type,
|
||||
board: lb.board,
|
||||
minWpm: lb.getMinWpm(),
|
||||
});
|
||||
}
|
||||
|
||||
return {
|
||||
insertedAt: insertResult,
|
||||
};
|
||||
} else {
|
||||
//not above leaderboard minwpm
|
||||
return {
|
||||
insertedAt: -999,
|
||||
};
|
||||
}
|
||||
|
||||
return {
|
||||
insertedAt: insertResult,
|
||||
};
|
||||
});
|
||||
} else {
|
||||
return {
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue