monkeytypegame/monkeytype
1
1
Fork 0
mirror of https://github.com/monkeytypegame/monkeytype.git synced 2025-10-18 11:36:13 +08:00
Code Issues Projects Releases Packages Wiki Activity

added some errors, fixed issue with doc id

Browse source
This commit is contained in:
Jack 2020-07-04 13:08:25 +01:00
parent 54a11611d8
commit ec31fedec4
1 changed files with 57 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

104
functions/index.js
View file

@ -174,55 +174,27 @@ exports.checkIfNeedsToChangeName = functions.https.onCall(
} else {
//valid name, but need to change if not duplicate
return getAllUsers().then((users) => {
let sameName = [];
return getAllUsers()
.then((users) => {
let sameName = [];
//look for name names
users.forEach((user) => {
if (user.uid !== requestUser.uid) {
try {
if (
user.displayName.toLowerCase() ===
requestUser.displayName.toLowerCase()
) {
sameName.push(user);
//look for name names
users.forEach((user) => {
if (user.uid !== requestUser.uid) {
try {
if (
user.displayName.toLowerCase() ===
requestUser.displayName.toLowerCase()
) {
sameName.push(user);
}
} catch (e) {
//
}
} catch (e) {
//
}
}
});
if (sameName.length === 0) {
admin
.firestore()
.collection("users")
.doc(request.uid)
.update({ name: requestUser.displayName })
.then(() => {
return 0;
});
} else {
//check when the request user made the account compared to others
let earliestTimestamp = 999999999999999;
sameName.forEach((sn) => {
let ts =
new Date(sn.metadata.creationTime).getTime() / 1000;
if (ts <= earliestTimestamp) {
earliestTimestamp = ts;
}
});
if (
new Date(requestUser.metadata.creationTime).getTime() /
1000 >
earliestTimestamp
) {
console.log(
`user ${requestUser.uid} ${requestUser.displayName} needs to change name`
);
return 2;
} else {
if (sameName.length === 0) {
admin
.firestore()
.collection("users")
@ -231,13 +203,48 @@ exports.checkIfNeedsToChangeName = functions.https.onCall(
.then(() => {
return 0;
});
} else {
//check when the request user made the account compared to others
let earliestTimestamp = 999999999999999;
sameName.forEach((sn) => {
let ts =
new Date(sn.metadata.creationTime).getTime() / 1000;
if (ts <= earliestTimestamp) {
earliestTimestamp = ts;
}
});
if (
new Date(
requestUser.metadata.creationTime
).getTime() /
1000 >
earliestTimestamp
) {
console.log(
`user ${requestUser.uid} ${requestUser.displayName} needs to change name`
);
return 2;
} else {
admin
.firestore()
.collection("users")
.doc(request.uid)
.update({ name: requestUser.displayName })
.then(() => {
return 0;
});
}
}
}
});
})
.catch((e) => {
console.error(`error getting all users - ${e}`);
});
}
});
} else {
console.log("name is good");
return 0;
}
});
} catch (e) {
@ -841,7 +848,10 @@ async function checkLeaderboards(resultObj, type) {
});
} else {
//continue
return cont(ret.id, ret.docs[0].data());
return cont(
`${String(resultObj.mode)}_${String(resultObj.mode2)}_${type}`,
ret.docs[0].data()
);
}
});