diff --git a/backend/migrate.js b/backend/migrate.js
index b514e3e2d..45248201c 100644
--- a/backend/migrate.js
+++ b/backend/migrate.js
@@ -2,6 +2,8 @@ const admin = require("firebase-admin");
 const mongoose = require("mongoose");
 const { User } = require("./models/user");
 const { Leaderboard } = require("./models/leaderboard");
+const { Stats } = require("./models/stats");
+const { BotCommand } = require("./models/bot-command");
 
 const serviceAccount = require("../functions/serviceAccountKey.json");
 
@@ -18,6 +20,8 @@ mongoose.connect("mongodb://localhost:27017/monkeytype", {
   useUnifiedTopology: true,
 });
 
+// Database should be completely clear before this is ran in order to prevent overlapping documents
+// Migrate users
 userCount = 1;
 db.collection("users")
   .get()
@@ -74,8 +78,27 @@ db.collection("leaderboards")
   .get()
   .then((leaderboardsSnapshot) => {
     leaderboardsSnapshot.forEach((lbDoc) => {
-      console.log(lbDoc);
       let newLb = new Leaderboard(lbDoc);
       newLb.save();
     });
   });
+
+//migrate bot-commands
+db.collection("bot-commands")
+  .get()
+  .then((botCommandsSnapshot) => {
+    botCommandsSnapshot.forEach((bcDoc) => {
+      let newBotCommand = new BotCommand(botCommandDoc);
+      newBotCommand.save();
+    });
+  });
+
+//migrate public stats
+db.collection("public")
+  .doc("stats")
+  .get()
+  .then((ret) => {
+    let stats = ret.data();
+    let newStats = new Stats(stats);
+    newStats.save();
+  });
diff --git a/backend/models/stats.js b/backend/models/stats.js
new file mode 100644
index 000000000..93b771a29
--- /dev/null
+++ b/backend/models/stats.js
@@ -0,0 +1,17 @@
+const mongoose = require("mongoose");
+const Schema = mongoose.Schema;
+
+const statsSchema = new Schema(
+  {
+    completedTests: { type: Number, default: 0 },
+    startedTests: { type: Number, default: 0 },
+    timeTyping: { type: Number, default: 0 },
+  },
+  {
+    timestamps: true,
+  }
+);
+
+const Stats = mongoose.model("Stats", statsSchema);
+
+module.exports = { Stats };
diff --git a/backend/mongo-todo.md b/backend/mongo-todo.md
index 09de3b028..0c5daef2c 100644
--- a/backend/mongo-todo.md
+++ b/backend/mongo-todo.md
@@ -2,16 +2,17 @@
 
 ## Todo
 
-Make sure that the branch is ready for deployment
-
-- Add deploy script(s) to package.json
-- Create a plan for apache/nginx server
-  - Api should be accessible via api.monkeytype.com
+- Make sure that the branch is ready for deployment
+- Make sure that the bot can interact with the data on the express server
+  - Would be optimal if the bot were to run on the same server as the express server, so that the bot wouldn't have to access data through api routes
+- Determine if generatePairingCode should be removed or migrated
+  - This function was commented out in index.js but is used in frontend
 
 ## Bugs
 
 - Make sure that the bot is able to interact with the mongo database
   - If bot is on same server, it could work with mongo directly, otherwise, more api routes are needed
+- Do names have to be made lowercase before checking if a duplicate name is found?(that is when a new user is created or username is changed)
 
 ### Minor/efficiency bugs
 
@@ -34,6 +35,17 @@ Make sure that the branch is ready for deployment
   - Is this discord verified, if so, why do you need discord verified to be on leaderboard?
     - Temporarily removed from leaderboard requirements
 
+### Functions not found anywhere except for index.js
+
+Might need to be migrated, might not. I'm not sure why these are in the file if they are not being used.
+
+- getAllNames
+- getAllUsers
+- getPatreons
+- requestTest
+- incrementStartedTestCounter
+- incrementTestCounter
+
 ### Possibilities
 
 - Might be worthwhile to use redis to store userdata up to a certain point
@@ -42,3 +54,4 @@ Make sure that the branch is ready for deployment
 - Create a backup system to prevent loss of data
   - Users should be able to export their data themselves
     - Pretty much is just the user snap but without uid
+- Could split server.js into multiple files for easier code management
diff --git a/backend/server.js b/backend/server.js
index 2368dd780..b944ffda5 100644
--- a/backend/server.js
+++ b/backend/server.js
@@ -7,6 +7,7 @@ const helmet = require("helmet");
 const { User } = require("./models/user");
 const { Leaderboard } = require("./models/leaderboard");
 const { BotCommand } = require("./models/bot-command");
+const { Stats } = require("./models/stats");
 
 // Firebase admin setup
 //currently uses account key in functions to prevent repetition
@@ -93,6 +94,18 @@ Leaderboard.findOne((err, lb) => {
   clearDailyLeaderboards();
 });
 
+// Initialize stats database if none exists
+Stats.findOne((err, stats) => {
+  if (!stats) {
+    let newStats = new Stats({
+      completedTests: 0,
+      startedTests: 0,
+      timeTyping: 0,
+    });
+    newStats.save();
+  }
+});
+
 async function authenticateToken(req, res, next) {
   const authHeader = req.headers["authorization"];
   const token = await admin
@@ -525,7 +538,7 @@ function incrementT60Bananas(uid, result, userData) {
   }
 }
 
-async function incrementGlobalTypingStats(userData, resultObj) {
+async function incrementUserGlobalTypingStats(userData, resultObj) {
   let userGlobalStats = userData.globalStats;
   try {
     let newStarted;
@@ -561,13 +574,6 @@ async function incrementGlobalTypingStats(userData, resultObj) {
     } else {
       newTime = userGlobalStats.time + tt;
     }
-    // db.collection("users")
-    //   .doc(uid)
-    //   .update({
-    //     startedTests: newStarted,
-    //     completedTests: newCompleted,
-    //     timeTyping: roundTo2(newTime),
-    //   });
     incrementPublicTypingStats(resultObj.restartCount + 1, 1, tt);
     User.findOne({ uid: userData.uid }, (err, user) => {
       user.globalStats = {
@@ -583,20 +589,17 @@ async function incrementGlobalTypingStats(userData, resultObj) {
 }
 
 async function incrementPublicTypingStats(started, completed, time) {
-  /*
   try {
     time = roundTo2(time);
-    db.collection("public")
-      .doc("stats")
-      .update({
-        completedTests: admin.firestore.FieldValue.increment(completed),
-        startedTests: admin.firestore.FieldValue.increment(started),
-        timeTyping: admin.firestore.FieldValue.increment(time),
-      });
+    Stats.findOne({}, (err, stats) => {
+      stats.completedTests += completed;
+      stats.startedTests += started;
+      stats.timeTyping += time;
+      stats.save();
+    });
   } catch (e) {
     console.error(`Error while incrementing public stats: ${e}`);
   }
-  */
 }
 
 function isTagPresetNameValid(name) {
@@ -660,11 +663,21 @@ app.post("/signUp", (req, res) => {
 });
 
 app.post("/updateName", authenticateToken, (req, res) => {
-  User.findOne({ uid: req.uid }, (err, user) => {
-    user.name = req.body.name;
-    user.save();
-  });
-  res.status(200);
+  if (isUsernameValid(name)) {
+    User.findOne({ uid: req.uid }, (err, user) => {
+      User.findOne({ name: req.body.name }, (err2, user2) => {
+        if (!user2) {
+          user.name = req.body.name;
+          user.save();
+          res.status(200).send({ status: 1 });
+        } else {
+          res.status(200).send({ status: -1, message: "Username taken" });
+        }
+      });
+    });
+  } else {
+    res.status(200).send({ status: -1, message: "Username invalid" });
+  }
 });
 
 app.get("/fetchSnapshot", authenticateToken, (req, res) => {
@@ -927,7 +940,7 @@ app.post("/testCompleted", authenticateToken, (req, res) => {
             incrementT60Bananas(req.uid, obj, userdata);
           }
 
-          await incrementGlobalTypingStats(userdata, obj);
+          await incrementUserGlobalTypingStats(userdata, obj); //equivalent to getIncrementedTypingStats
 
           let returnobj = {
             resultCode: null,
@@ -1007,11 +1020,150 @@ app.post("/testCompleted", authenticateToken, (req, res) => {
 app.get("/userResults", authenticateToken, (req, res) => {
   User.findOne({ uid: req.uid }, (err, user) => {
     if (err) res.status(500).send({ error: err });
+    res.status(200).send({ results: user.results });
   });
-  //return list of results
   res.sendStatus(200);
 });
 
+app.post("/clearTagPb", authenticateToken, (req, res) => {
+  User.findOne({ uid: req.uid }, (err, user) => {
+    for (let i = 0; i < user.tags.length; i++) {
+      if (user.tags[i]._id.toString() === req.body.tagid.toString()) {
+        user.tags[i].personalBests = {};
+        user.save();
+        res.send({ resultCode: 1 });
+        return;
+      }
+    }
+  }).catch((e) => {
+    console.error(`error deleting tag pb for user ${req.uid}: ${e.message}`);
+    res.send({
+      resultCode: -999,
+      message: e.message,
+    });
+    return;
+  });
+  res.sendStatus(200);
+});
+
+app.post("/unlinkDiscord", authenticateToken, (req, res) => {
+  request = req.body.data;
+  try {
+    if (request === null || req.uid === undefined) {
+      res.status(200).send({ status: -999, message: "Empty request" });
+      return;
+    }
+    User.findOne({ uid: req.uid }, (err, user) => {
+      user.discordId = null;
+      user.save();
+    })
+      .then((f) => {
+        res.status(200).send({
+          status: 1,
+          message: "Unlinked",
+        });
+        return;
+      })
+      .catch((e) => {
+        res.status(200).send({
+          status: -999,
+          message: e.message,
+        });
+        return;
+      });
+  } catch (e) {
+    res.status(200).send({
+      status: -999,
+      message: e,
+    });
+    return;
+  }
+});
+
+app.post("/removeSmallTestsAndQPB", authenticateToken, (req, res) => {
+  User.findOne({ uid: req.uid }, (err, user) => {
+    user.results.forEach((result, index) => {
+      if (
+        (result.mode == "time" && result.mode2 < 15) ||
+        (result.mode == "words" && result.mode2 < 10) ||
+        (result.mode == "custom" && result.testDuration < 10)
+      ) {
+        user.results.splice(index, 1);
+      }
+    });
+    try {
+      delete user.personalBests.quote;
+    } catch {}
+    user.refactored = true;
+    user.save();
+    console.log("removed small tests for " + req.uid);
+    res.status(200);
+  }).catch((e) => {
+    console.log(`something went wrong for ${req.uid}: ${e.message}`);
+    res.status(200);
+  });
+});
+
+app.post("/updateResultTags", authenticateToken, (req, res) => {
+  try {
+    let validTags = true;
+    req.body.tags.forEach((tag) => {
+      if (!/^[0-9a-zA-Z]+$/.test(tag)) validTags = false;
+    });
+    if (validTags) {
+      User.findOne({ uid: req.uid }, (err, user) => {
+        for (let i = 0; i < user.results.length; i++) {
+          if (user.results[i]._id.toString() === req.body.resultid.toString()) {
+            user.results[i].tags = req.body.tags;
+            user.save();
+            console.log(
+              `user ${request.uid} updated tags for result ${request.resultid}`
+            );
+            res.send({ resultCode: 1 });
+            return;
+          }
+        }
+        console.error(
+          `error while updating tags for result by user ${req.uid}: ${e.message}`
+        );
+        res.send({ resultCode: -999 });
+      });
+    } else {
+      console.error(`invalid tags for user ${req.uid}: ${req.body.tags}`);
+      res.send({ resultCode: -1 });
+    }
+  } catch (e) {
+    console.error(`error updating tags by ${req.uid} - ${e}`);
+    res.send({ resultCode: -999, message: e });
+  }
+});
+
+app.post("/updateEmail", authenticateToken, (req, res) => {
+  try {
+    admin
+      .auth()
+      .getUser(req.uid)
+      .then((previous) => {
+        if (previous.email !== req.body.previousEmail) {
+          res.send({ resultCode: -1 });
+        } else {
+          User.findOne({ uid: req.uid }, (err, user) => {
+            user.email = req.body.newEmail;
+            user.emailVerified = false;
+            user.save();
+            res.send({ resultCode: 1 });
+          });
+        }
+      });
+  } catch (e) {
+    console.error(`error updating email for ${req.uid} - ${e}`);
+    res.send({
+      resultCode: -999,
+      message: e.message,
+    });
+  }
+});
+
 function isConfigKeyValid(name) {
   if (name === null || name === undefined || name === "") return false;
   if (name.length > 30) return false;
diff --git a/functions/index.js b/functions/index.js
index 2b870b06a..a5fb79a0f 100644
--- a/functions/index.js
+++ b/functions/index.js
@@ -18,164 +18,15 @@ const db = admin.firestore();
 const auth = admin.auth();
 const fetch = require("node-fetch");
 
-async function getAllNames() {
-  // return admin
-  //   .auth()
-  //   .listUsers()
-  //   .then((data) => {
-  //     let names = [];
-  //     data.users.forEach((user) => {
-  //       names.push(user.displayName);
-  //     });
-  //     return names;
-  //   });
-
-  let ret = [];
-
-  async function getAll(nextPageToken) {
-    // List batch of users, 1000 at a time.
-    let listUsersResult = await admin.auth().listUsers(1000, nextPageToken);
-    for (let i = 0; i < listUsersResult.users.length; i++) {
-      ret.push(listUsersResult.users[i].displayName);
-    }
-    if (listUsersResult.pageToken) {
-      // List next batch of users.
-      await getAll(listUsersResult.pageToken);
-    }
-  }
-
-  await getAll();
-  return ret;
-}
-
-async function getAllUsers() {
-  // return admin
-  //   .auth()
-  //   .listUsers()
-  //   .then((data) => {
-  //     let names = [];
-  //     data.users.forEach((user) => {
-  //       names.push(user.displayName);
-  //     });
-  //     return names;
-  //   });
-
-  let ret = [];
-
-  async function getAll(nextPageToken) {
-    // List batch of users, 1000 at a time.
-    let listUsersResult = await auth.listUsers(1000, nextPageToken);
-    for (let i = 0; i < listUsersResult.users.length; i++) {
-      let loopuser = listUsersResult.users[i];
-
-      //if custom claim is undefined check, if its true then ignore
-
-      // if (loopuser === undefined || loopuser.customClaims === undefined || loopuser.customClaims['nameChecked'] === undefined) {
-      ret.push(listUsersResult.users[i]);
-      // }
-
-      // console.log(loopuser.customClaims['asd']);
-
-      // let userdata = await db.collection('users').doc(listUsersResult.users[i].uid).get();
-
-      // let data = userdata.data();
-
-      // if (data === undefined || data.needsToChangeName === undefined) {
-      //   // console.log(data);
-      //   ret.push(listUsersResult.users[i]);
-      //   // console.log('user added');
-      // } else {
-      //   // console.log('user already added');
-      // }
-    }
-    if (listUsersResult.pageToken) {
-      // List next batch of users.
-      await getAll(listUsersResult.pageToken);
-    }
-  }
-  await getAll();
-  return ret;
-}
-
-function isUsernameValid(name) {
-  if (name === null || name === undefined || name === "") return false;
-  if (/miodec/.test(name.toLowerCase())) return false;
-  if (/bitly/.test(name.toLowerCase())) return false;
-  if (name.length > 14) return false;
-  if (/^\..*/.test(name.toLowerCase())) return false;
-  return /^[0-9a-zA-Z_.-]+$/.test(name);
-}
-
-exports.reserveDisplayName = functions.https.onCall(
-  async (request, response) => {
-    try {
-      let udata = await db.collection("users").doc(request.uid).get();
-      udata = udata.data();
-      if (request.name.toLowerCase() === udata.name.toLowerCase()) {
-        db.collection("takenNames").doc(request.name.toLowerCase()).set(
-          {
-            taken: true,
-          },
-          { merge: true }
-        );
-        console.log(`Reserved name ${request.name}`);
-      } else {
-        console.error(
-          `Could not reserve name. ${request.name.toLowerCase()} != ${udata.name.toLowerCase()}`
-        );
-      }
-    } catch (e) {
-      console.error(`Could not reserve name. ${e}`);
-    }
-  }
-);
-
-exports.changeDisplayName = functions.https.onCall(
-  async (request, response) => {
-    try {
-      if (!isUsernameValid(request.name))
-        return { status: -1, message: "Name not valid" };
-      let taken = await db
-        .collection("takenNames")
-        .doc(request.name.toLowerCase())
-        .get();
-      taken = taken.data();
-      if (taken === undefined || taken.taken === false) {
-        //not taken
-        let oldname = admin.auth().getUser(request.uid);
-        oldname = (await oldname).displayName;
-        await admin
-          .auth()
-          .updateUser(request.uid, { displayName: request.name });
-        await db
-          .collection("users")
-          .doc(request.uid)
-          .set({ name: request.name }, { merge: true });
-        await db.collection("takenNames").doc(request.name.toLowerCase()).set(
-          {
-            taken: true,
-          },
-          { merge: true }
-        );
-        await db.collection("takenNames").doc(oldname.toLowerCase()).delete();
-        return { status: 1, message: "Updated" };
-      } else {
-        return { status: -2, message: "Name taken." };
-      }
-    } catch (e) {
-      return { status: -999, message: "Error: " + e.message };
-    }
-  }
-);
-
-exports.clearName = functions.auth.user().onDelete((user) => {
-  db.collection("takenNames").doc(user.displayName.toLowerCase()).delete();
-  db.collection("users").doc(user.uid).delete();
-});
-
-exports.checkNameAvailability = functions.https.onRequest(
-  async (request, response) => {
-    response.set("Access-Control-Allow-Origin", origin);
+/*
+//this was commented out in the original code, and might not need to be transfered
+exports.generatePairingCode = functions
+  .runWith({
+    timeoutSeconds: 100,
+    memory: "2GB",
+  })
+  .https.onRequest((request, response) => {
+    response.set("Access-Control-Allow-Origin", "*");
     if (request.method === "OPTIONS") {
       // Send response to OPTIONS requests
       response.set("Access-Control-Allow-Methods", "POST, GET, OPTIONS");
@@ -188,2798 +39,110 @@ exports.checkNameAvailability = functions.https.onRequest(
       return;
     }
     request = request.body.data;
-
-    // 1 - available
-    // -1 - unavailable (taken)
-    // -2 - not valid name
-    // -999 - unknown error
     try {
-      if (!isUsernameValid(request.name)) {
-        response.status(200).send({
-          data: {
-            resultCode: -2,
-            message: "Username is not valid",
-          },
-        });
-        return;
-      }
-
-      let takendata = await db
-        .collection("takenNames")
-        .doc(request.name.toLowerCase())
-        .get();
-
-      takendata = takendata.data();
-
-      if (takendata !== undefined && takendata.taken) {
-        response.status(200).send({
-          data: {
-            resultCode: -1,
-            message: "Username is taken",
-          },
-        });
-        return;
-      } else {
-        response.status(200).send({
-          data: {
-            resultCode: 1,
-            message: "Username is available",
-          },
-        });
-        return;
-      }
-
-      // return getAllNames().then((data) => {
-      //   let available = 1;
-      //   data.forEach((name) => {
-      //     try {
-      //       if (name.toLowerCase() === request.name.toLowerCase()) available = -1;
-      //     } catch (e) {
-      //       //
-      //     }
-      //   });
-      //   return available;
-      // });
-    } catch (e) {
-      console.error(
-        `Error while checking name availability for ${request.name}:` +
-          e.message
-      );
-      response.status(200).send({
-        data: {
-          resultCode: -999,
-          message: "Unexpected error: " + e,
-        },
-      });
-      return;
-    }
-  }
-);
-
-// exports.changeName = functions.https.onCall((request, response) => {
-//   try {
-//     if (!isUsernameValid(request.name)) {
-//       console.warn(
-//         `${request.uid} tried to change their name to ${request.name} - not valid`
-//       );
-//       return 0;
-//     }
-//     return getAllNames().then((data) => {
-//       let available = 1;
-//       data.forEach((name) => {
-//         try {
-//           if (name.toLowerCase() === request.name.toLowerCase()) available = 0;
-//         } catch (e) {
-//           //
-//         }
-//       });
-//       if (available === 1) {
-//         return admin
-//           .auth()
-//           .updateUser(request.uid, {
-//             displayName: request.name,
-//           })
-//           .then((d) => {
-//             console.log(
-//               `${request.uid} changed their name to ${request.name} - done`
-//             );
-//             return 1;
-//           })
-//           .catch((e) => {
-//             console.error(
-//               `${request.uid} tried to change their name to ${request.name} - ${e.message}`
-//             );
-//             return -1;
-//           });
-//       } else {
-//         console.warn(
-//           `${request.uid} tried to change their name to ${request.name} - already taken`
-//         );
-//         return 0;
-//       }
-//     });
-//   } catch (e) {
-//     console.error(
-//       `${request.uid} tried to change their name to ${request.name} - ${e}`
-//     );
-//     return -1;
-//   }
-// });
-
-// exports.checkIfNeedsToChangeName = functions.https.onCall(
-//   (request, response) => {
-//     try {
-//       return db
-//         .collection("users")
-//         .doc(request.uid)
-//         .get()
-//         .then((doc) => {
-//           if (
-//             doc.data().name === undefined ||
-//             doc.data().name === null ||
-//             doc.data().name === ""
-//           ) {
-//             return admin
-//               .auth()
-//               .getUser(request.uid)
-//               .then((requestUser) => {
-//                 if (!isUsernameValid(requestUser.displayName)) {
-//                   //invalid name, needs to change
-//                   console.log(
-//                     `user ${requestUser.uid} ${requestUser.displayName} needs to change name`
-//                   );
-//                   return 1;
-//                 } else {
-//                   //valid name, but need to change if not duplicate
-
-//                   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);
-//                             }
-//                           } catch (e) {
-//                             //
-//                           }
-//                         }
-//                       });
-
-//                       if (sameName.length === 0) {
-//                         db.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 {
-//                           db.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) {
-//       return -1;
-//     }
-//   }
-// );
-
-exports.removeSmallTestsAndQPB = functions.https.onCall(
-  async (request, response) => {
-    let uid = request.uid;
-
-    try {
-      let docs = await db
-        .collection(`users/${uid}/results`)
-        .where("mode", "==", "time")
-        .where("mode2", "<", 15)
-        .get();
-      docs.forEach(async (doc) => {
-        db.collection(`users/${uid}/results`).doc(doc.id).delete();
-      });
-      let docs2 = await db
-        .collection(`users/${uid}/results`)
-        .where("mode", "==", "words")
-        .where("mode2", "<", 10)
-        .get();
-      docs2.forEach(async (doc) => {
-        db.collection(`users/${uid}/results`).doc(doc.id).delete();
-      });
-      let docs3 = await db
-        .collection(`users/${uid}/results`)
-        .where("mode", "==", "custom")
-        .where("testDuration", "<", 10)
-        .get();
-      docs3.forEach(async (doc) => {
-        db.collection(`users/${uid}/results`).doc(doc.id).delete();
-      });
-      // console.log(`removing small tests for ${uid}: ${docs.size} time, ${docs2.size} words, ${docs3.size} custom`);
-      let userdata = await db.collection(`users`).doc(uid).get();
-      userdata = userdata.data();
-      try {
-        pbs = userdata.personalBests;
-        // console.log(`removing ${Object.keys(pbs.quote).length} quote pb`);
-        delete pbs.quote;
-        await db.collection("users").doc(uid).update({ personalBests: pbs });
-      } catch {}
-      db.collection("users")
-        .doc(uid)
-        .set({ refactored: true }, { merge: true });
-      console.log("removed small tests for " + uid);
-    } catch (e) {
-      console.log(`something went wrong for ${uid}: ${e.message}`);
-    }
-  }
-);
-
-exports.resetPersonalBests = functions.https.onCall(
-  async (request, response) => {
-    let uid = request.uid;
-
-    try {
-      var user = await db.collection("users").doc(uid);
-      await user.update({ personalBests: {} });
-      return true;
-    } catch (e) {
-      console.log(
-        `something went wrong when deleting personal bests for ${uid}: ${e.message}`
-      );
-      return false;
-    }
-  }
-);
-
-async function checkIfPB(uid, obj, userdata) {
-  let pbs = null;
-  if (obj.mode == "quote") {
-    return false;
-  }
-  if (obj.funbox !== "none") {
-    return false;
-  }
-  try {
-    pbs = userdata.personalBests;
-    if (pbs === undefined) {
-      throw new Error("pb is undefined");
-    }
-  } catch (e) {
-    return db
-      .collection("users")
-      .doc(uid)
-      .update({
-        personalBests: {
-          [obj.mode]: {
-            [obj.mode2]: [
-              {
-                language: obj.language,
-                difficulty: obj.difficulty,
-                punctuation: obj.punctuation,
-                wpm: obj.wpm,
-                acc: obj.acc,
-                raw: obj.rawWpm,
-                timestamp: Date.now(),
-                consistency: obj.consistency,
-              },
-            ],
-          },
-        },
-      })
-      .then((e) => {
-        return true;
-      })
-      .catch((e) => {
-        return db
-          .collection("users")
-          .doc(uid)
-          .set({
-            personalBests: {
-              [obj.mode]: {
-                [obj.mode2]: [
-                  {
-                    language: obj.language,
-                    difficulty: obj.difficulty,
-                    punctuation: obj.punctuation,
-                    wpm: obj.wpm,
-                    acc: obj.acc,
-                    raw: obj.rawWpm,
-                    timestamp: Date.now(),
-                    consistency: obj.consistency,
-                  },
-                ],
-              },
-            },
-          })
-          .then((e) => {
-            return true;
-          });
-      });
-  }
-  // //check mode, mode2, punctuation, language and difficulty
-
-  let toUpdate = false;
-  let found = false;
-  try {
-    if (pbs[obj.mode][obj.mode2] === undefined) {
-      pbs[obj.mode][obj.mode2] = [];
-    }
-    pbs[obj.mode][obj.mode2].forEach((pb) => {
-      if (
-        pb.punctuation === obj.punctuation &&
-        pb.difficulty === obj.difficulty &&
-        pb.language === obj.language
-      ) {
-        //entry like this already exists, compare wpm
-        found = true;
-        if (pb.wpm < obj.wpm) {
-          //new pb
-          pb.wpm = obj.wpm;
-          pb.acc = obj.acc;
-          pb.raw = obj.rawWpm;
-          pb.timestamp = Date.now();
-          pb.consistency = obj.consistency;
-          toUpdate = true;
-        } else {
-          //no pb
-          return false;
-        }
-      }
-    });
-    //checked all pbs, nothing found - meaning this is a new pb
-    if (!found) {
-      pbs[obj.mode][obj.mode2].push({
-        language: obj.language,
-        difficulty: obj.difficulty,
-        punctuation: obj.punctuation,
-        wpm: obj.wpm,
-        acc: obj.acc,
-        raw: obj.rawWpm,
-        timestamp: Date.now(),
-        consistency: obj.consistency,
-      });
-      toUpdate = true;
-    }
-  } catch (e) {
-    // console.log(e);
-    pbs[obj.mode] = {};
-    pbs[obj.mode][obj.mode2] = [
-      {
-        language: obj.language,
-        difficulty: obj.difficulty,
-        punctuation: obj.punctuation,
-        wpm: obj.wpm,
-        acc: obj.acc,
-        raw: obj.rawWpm,
-        timestamp: Date.now(),
-        consistency: obj.consistency,
-      },
-    ];
-    toUpdate = true;
-  }
-
-  if (toUpdate) {
-    db.collection("users").doc(uid).update({ personalBests: pbs });
-    return true;
-  } else {
-    return false;
-  }
-}
-
-async function checkIfTagPB(uid, obj, userdata) {
-  if (obj.tags.length === 0) {
-    return [];
-  }
-  if (obj.mode == "quote") {
-    return [];
-  }
-  let dbtags = [];
-  let restags = obj.tags;
-  try {
-    let snap = await db.collection(`users/${uid}/tags`).get();
-    snap.forEach((doc) => {
-      if (restags.includes(doc.id)) {
-        let data = doc.data();
-        data.id = doc.id;
-        dbtags.push(data);
-      }
-    });
-  } catch {
-    return [];
-  }
-
-  let ret = [];
-  for (let i = 0; i < dbtags.length; i++) {
-    let pbs = null;
-    try {
-      pbs = dbtags[i].personalBests;
-      if (pbs === undefined) {
-        throw new Error("pb is undefined");
-      }
-    } catch (e) {
-      //undefined personal best = new personal best
-      db.collection(`users/${uid}/tags`)
-        .doc(dbtags[i].id)
-        .set(
-          {
-            personalBests: {
-              [obj.mode]: {
-                [obj.mode2]: [
-                  {
-                    language: obj.language,
-                    difficulty: obj.difficulty,
-                    punctuation: obj.punctuation,
-                    wpm: obj.wpm,
-                    acc: obj.acc,
-                    raw: obj.rawWpm,
-                    timestamp: Date.now(),
-                    consistency: obj.consistency,
-                  },
-                ],
-              },
-            },
-          },
-          { merge: true }
-        )
-        .then((e) => {
-          ret.push(dbtags[i].id);
-        });
-      continue;
-    }
-    let toUpdate = false;
-    let found = false;
-    try {
-      if (pbs[obj.mode][obj.mode2] === undefined) {
-        pbs[obj.mode][obj.mode2] = [];
-      }
-      pbs[obj.mode][obj.mode2].forEach((pb) => {
-        if (
-          pb.punctuation === obj.punctuation &&
-          pb.difficulty === obj.difficulty &&
-          pb.language === obj.language
-        ) {
-          //entry like this already exists, compare wpm
-          found = true;
-          if (pb.wpm < obj.wpm) {
-            //new pb
-            pb.wpm = obj.wpm;
-            pb.acc = obj.acc;
-            pb.raw = obj.rawWpm;
-            pb.timestamp = Date.now();
-            pb.consistency = obj.consistency;
-            toUpdate = true;
-          } else {
-            //no pb
-            return false;
-          }
-        }
-      });
-      //checked all pbs, nothing found - meaning this is a new pb
-      if (!found) {
-        pbs[obj.mode][obj.mode2].push({
-          language: obj.language,
-          difficulty: obj.difficulty,
-          punctuation: obj.punctuation,
-          wpm: obj.wpm,
-          acc: obj.acc,
-          raw: obj.rawWpm,
-          timestamp: Date.now(),
-          consistency: obj.consistency,
-        });
-        toUpdate = true;
-      }
-    } catch (e) {
-      // console.log(e);
-      pbs[obj.mode] = {};
-      pbs[obj.mode][obj.mode2] = [
-        {
-          language: obj.language,
-          difficulty: obj.difficulty,
-          punctuation: obj.punctuation,
-          wpm: obj.wpm,
-          acc: obj.acc,
-          raw: obj.rawWpm,
-          timestamp: Date.now(),
-          consistency: obj.consistency,
-        },
-      ];
-      toUpdate = true;
-    }
-
-    if (toUpdate) {
-      db.collection(`users/${uid}/tags`)
-        .doc(dbtags[i].id)
-        .update({ personalBests: pbs });
-      ret.push(dbtags[i].id);
-    }
-  }
-  return ret;
-}
-
-//old
-// async function checkIfTagPB(uid, obj) {
-//   if (obj.tags.length === 0) {
-//     return [];
-//   }
-//   let dbtags = [];
-//   let restags = obj.tags;
-//   try {
-//     let snap = await db.collection(`users/${uid}/tags`).get();
-//     snap.forEach((doc) => {
-//       if (restags.includes(doc.id)) {
-//         let data = doc.data();
-//         data.id = doc.id;
-//         dbtags.push(data);
-//       }
-//     });
-//   } catch (e) {
-//     return [];
-//   }
-//   let wpm = obj.wpm;
-//   let ret = [];
-//   for (let i = 0; i < dbtags.length; i++) {
-//     let dbtag = dbtags[i];
-//     if (dbtag.pb === undefined || dbtag.pb < wpm) {
-//       //no pb found, meaning this one is a pb
-//       await db.collection(`users/${uid}/tags`).doc(dbtag.id).update({
-//         pb: wpm,
-//       });
-//       ret.push(dbtag.id);
-//     }
-//   }
-//   return ret;
-// }
-
-exports.clearTagPb = functions.https.onCall((request, response) => {
-  try {
-    return db
-      .collection(`users/${request.uid}/tags`)
-      .doc(request.tagid)
-      .update({
-        pb: 0,
-      })
-      .then((e) => {
-        return {
-          resultCode: 1,
-        };
-      })
-      .catch((e) => {
+      if (request === null) {
         console.error(
-          `error deleting tag pb for user ${request.uid}: ${e.message}`
+          `error while trying to generate discord pairing code - no input`
         );
-        return {
-          resultCode: -999,
-          message: e.message,
-        };
-      });
-  } catch (e) {
-    console.error(`error deleting tag pb for ${request.uid} - ${e}`);
-    return { resultCode: -999 };
-  }
-});
-
-function stdDev(array) {
-  const n = array.length;
-  const mean = array.reduce((a, b) => a + b) / n;
-  return Math.sqrt(
-    array.map((x) => Math.pow(x - mean, 2)).reduce((a, b) => a + b) / n
-  );
-}
-
-function roundTo2(num) {
-  return Math.round((num + Number.EPSILON) * 100) / 100;
-}
-
-function validateResult(result) {
-  if (result.wpm > result.rawWpm) {
-    console.error(
-      `Could not validate result for ${result.uid}. ${result.wpm} > ${result.rawWpm}`
-    );
-    return false;
-  }
-  let wpm = roundTo2((result.correctChars * (60 / result.testDuration)) / 5);
-  if (
-    wpm < result.wpm - result.wpm * 0.01 ||
-    wpm > result.wpm + result.wpm * 0.01
-  ) {
-    console.error(
-      `Could not validate result for ${result.uid}. wpm ${wpm} != ${result.wpm}`
-    );
-    return false;
-  }
-  // if (result.allChars != undefined) {
-  //   let raw = roundTo2((result.allChars * (60 / result.testDuration)) / 5);
-  //   if (
-  //     raw < result.rawWpm - result.rawWpm * 0.01 ||
-  //     raw > result.rawWpm + result.rawWpm * 0.01
-  //   ) {
-  //     console.error(
-  //       `Could not validate result for ${result.uid}. raw ${raw} != ${result.rawWpm}`
-  //     );
-  //     return false;
-  //   }
-  // }
-  if (result.mode === "time" && (result.mode2 === 15 || result.mode2 === 60)) {
-    let keyPressTimeSum =
-      result.keySpacing.reduce((total, val) => {
-        return total + val;
-      }) / 1000;
-    if (
-      keyPressTimeSum < result.testDuration - 1 ||
-      keyPressTimeSum > result.testDuration + 1
-    ) {
-      console.error(
-        `Could not validate key spacing sum for ${result.uid}. ${keyPressTimeSum} !~ ${result.testDuration}`
-      );
-      return false;
-    }
-
-    if (
-      result.testDuration < result.mode2 - 1 ||
-      result.testDuration > result.mode2 + 1
-    ) {
-      console.error(
-        `Could not validate test duration for ${result.uid}. ${result.testDuration} !~ ${result.mode2}`
-      );
-      return false;
-    }
-  }
-
-  if (result.chartData.raw !== undefined) {
-    if (result.chartData.raw.filter((w) => w > 350).length > 0) return false;
-  }
-
-  if (result.wpm > 100 && result.consistency < 10) return false;
-
-  return true;
-}
-
-exports.requestTest = functions.https.onRequest((request, response) => {
-  response.set("Access-Control-Allow-Origin", origin);
-  response.set("Access-Control-Allow-Headers", "*");
-  response.set("Access-Control-Allow-Credentials", "true");
-  response.status(200).send({ data: "test" });
-});
-
-exports.getPatreons = functions.https.onRequest(async (request, response) => {
-  response.set("Access-Control-Allow-Origin", origin);
-  response.set("Access-Control-Allow-Headers", "*");
-  response.set("Access-Control-Allow-Credentials", "true");
-  if (request.method === "OPTIONS") {
-    // Send response to OPTIONS requests
-    response.set("Access-Control-Allow-Methods", "POST, GET, OPTIONS");
-    response.set("Access-Control-Allow-Headers", "Authorization,Content-Type");
-    response.set("Access-Control-Max-Age", "3600");
-    response.status(204).send("");
-    return;
-  }
-  request = request.body.data;
-  try {
-    let patreon = await db.collection("patreon").doc("patreons").get();
-    let data = patreon.data().list;
-
-    data = data.sort((a, b) => {
-      return b.value - a.value;
-    });
-
-    let ret = [];
-    data.forEach((pdoc) => {
-      ret.push(pdoc.name);
-    });
-
-    response.status(200).send({ data: ret });
-    return;
-  } catch (e) {
-    response.status(200).send({ e });
-    return;
-  }
-});
-
-exports.verifyUser = functions.https.onRequest(async (request, response) => {
-  response.set("Access-Control-Allow-Origin", origin);
-  response.set("Access-Control-Allow-Headers", "*");
-  response.set("Access-Control-Allow-Credentials", "true");
-  if (request.method === "OPTIONS") {
-    // Send response to OPTIONS requests
-    response.set("Access-Control-Allow-Methods", "POST, GET, OPTIONS");
-    response.set("Access-Control-Allow-Headers", "Authorization,Content-Type");
-    response.set("Access-Control-Max-Age", "3600");
-    response.status(204).send("");
-    return;
-  }
-  request = request.body.data;
-  if (request.uid == undefined) {
-    response
-      .status(200)
-      .send({ data: { status: -1, message: "Need to provide uid" } });
-    return;
-  }
-  try {
-    return fetch("https://discord.com/api/users/@me", {
-      headers: {
-        authorization: `${request.tokenType} ${request.accessToken}`,
-      },
-    })
-      .then((res) => res.json())
-      .then(async (res2) => {
-        let did = res2.id;
-
-        if (
-          (await db.collection("users").where("discordId", "==", did).get())
-            .docs.length > 0
-        ) {
-          response.status(200).send({
-            data: {
-              status: -1,
-              message:
-                "This Discord account is already paired to a different Monkeytype account",
-            },
-          });
-          return;
-        }
-
-        await db.collection("users").doc(request.uid).update({
-          discordId: did,
-        });
-        await db.collection("bot-commands").add({
-          command: "verify",
-          arguments: [did, request.uid],
-          executed: false,
-          requestTimestamp: Date.now(),
-        });
-        response
-          .status(200)
-          .send({ data: { status: 1, message: "Verified", did: did } });
+        response.status(200).send({ data: { status: -999 } });
         return;
-      })
-      .catch((e) => {
-        console.error(
-          "Something went wrong when trying to verify user " + e.message
-        );
-        response.status(200).send({ data: { status: -1, message: e.message } });
-        return;
-      });
-  } catch (e) {
-    response.status(200).send({ data: { status: -1, message: e } });
-    return;
-  }
-});
-
-function incrementT60Bananas(uid, result, userData) {
-  try {
-    let best60;
-    try {
-      best60 = Math.max(
-        ...userData.personalBests.time[60].map((best) => best.wpm)
-      );
-      if (!Number.isFinite(best60)) {
-        throw "Not finite";
       }
-    } catch (e) {
-      best60 = undefined;
-    }
 
-    if (best60 != undefined && result.wpm < best60 - best60 * 0.25) {
-      // console.log("returning");
-      return;
-    } else {
-      //increment
-      // console.log("checking");
-      db.collection(`users/${uid}/bananas`)
-        .doc("bananas")
+      return db
+        .collection("users")
+        .doc(request.uid)
         .get()
-        .then((docRef) => {
-          let data = docRef.data();
-          if (data === undefined) {
-            //create doc
-            db.collection(`users/${uid}/bananas`).doc("bananas").set(
-              {
-                t60bananas: 1,
-              },
-              { merge: true }
+        .then(async (userDoc) => {
+          userDocData = userDoc.data();
+          if (
+            userDocData.discordPairingCode !== undefined &&
+            userDocData.discordPairingCode !== null
+          ) {
+            console.log(
+              `user ${request.uid} already has code ${userDocData.discordPairingCode}`
             );
+            response.status(200).send({
+              data: {
+                status: -999,
+                pairingCode: userDocData.discordPairingCode,
+              },
+            });
           } else {
-            //increment
-            db.collection(`users/${uid}/bananas`)
-              .doc("bananas")
-              .set(
+            let stepSize = 1000;
+            let existingCodes = [];
+            let query = await db
+              .collection(`users`)
+              .where("discordPairingCode", ">", "")
+              .limit(stepSize)
+              .get();
+            let lastDoc;
+            while (query.docs.length > 0) {
+              lastDoc = query.docs[query.docs.length - 1];
+              query.docs.forEach((doc) => {
+                let docData = doc.data();
+                if (
+                  docData.discordPairingCode !== undefined &&
+                  docData.discordPairingCode !== null
+                ) {
+                  existingCodes.push(docData.discordPairingCode);
+                }
+              });
+              query = await db
+                .collection(`users`)
+                .where("discordPairingCode", ">", "")
+                .limit(stepSize)
+                .startAfter(lastDoc)
+                .get();
+            }
+
+            let randomCode = generate(9);
+
+            while (existingCodes.includes(randomCode)) {
+              randomCode = generate(9);
+            }
+
+            return db
+              .collection("users")
+              .doc(request.uid)
+              .update(
                 {
-                  t60bananas: admin.firestore.FieldValue.increment(1),
+                  discordPairingCode: randomCode,
                 },
                 { merge: true }
-              );
-          }
-        });
-    }
-  } catch (e) {
-    console.log(
-      "something went wrong when trying to increment bananas " + e.message
-    );
-  }
-}
-
-async function getIncrementedTypingStats(userData, resultObj) {
-  try {
-    let newStarted;
-    let newCompleted;
-    let newTime;
-
-    let tt = 0;
-    let afk = resultObj.afkDuration;
-    if (afk == undefined) {
-      afk = 0;
-    }
-    tt = resultObj.testDuration + resultObj.incompleteTestSeconds - afk;
-
-    if (tt > 500)
-      console.log(
-        `FUCK, INCREASING BY A LOT ${resultObj.uid}: ${JSON.stringify(
-          resultObj
-        )}`
-      );
-
-    if (userData.startedTests === undefined) {
-      newStarted = resultObj.restartCount + 1;
-    } else {
-      newStarted = userData.startedTests + resultObj.restartCount + 1;
-    }
-    if (userData.completedTests === undefined) {
-      newCompleted = 1;
-    } else {
-      newCompleted = userData.completedTests + 1;
-    }
-    if (userData.timeTyping === undefined) {
-      newTime = tt;
-    } else {
-      newTime = userData.timeTyping + tt;
-    }
-    // db.collection("users")
-    //   .doc(uid)
-    //   .update({
-    //     startedTests: newStarted,
-    //     completedTests: newCompleted,
-    //     timeTyping: roundTo2(newTime),
-    //   });
-    incrementPublicTypingStats(resultObj.restartCount + 1, 1, tt);
-
-    return {
-      newStarted: newStarted,
-      newCompleted: newCompleted,
-      newTime: roundTo2(newTime),
-    };
-  } catch (e) {
-    console.error(`Error while incrementing stats for user ${uid}: ${e}`);
-  }
-}
-
-async function getUpdatedLbMemory(userdata, mode, mode2, globallb, dailylb) {
-  let lbmemory = userdata.lbMemory;
-
-  if (lbmemory === undefined) {
-    lbmemory = {};
-  }
-
-  if (lbmemory[mode + mode2] == undefined) {
-    lbmemory[mode + mode2] = {
-      global: null,
-      daily: null,
-    };
-  }
-
-  if (globallb.insertedAt === -1) {
-    lbmemory[mode + mode2]["global"] = globallb.insertedAt;
-  } else if (globallb.insertedAt >= 0) {
-    if (globallb.newBest) {
-      lbmemory[mode + mode2]["global"] = globallb.insertedAt;
-    } else {
-      lbmemory[mode + mode2]["global"] = globallb.foundAt;
-    }
-  }
-
-  if (dailylb.insertedAt === -1) {
-    lbmemory[mode + mode2]["daily"] = dailylb.insertedAt;
-  } else if (dailylb.insertedAt >= 0) {
-    if (dailylb.newBest) {
-      lbmemory[mode + mode2]["daily"] = dailylb.insertedAt;
-    } else {
-      lbmemory[mode + mode2]["daily"] = dailylb.foundAt;
-    }
-  }
-
-  return lbmemory;
-}
-
-async function incrementPublicTypingStats(started, completed, time) {
-  try {
-    time = roundTo2(time);
-    db.collection("public")
-      .doc("stats")
-      .update({
-        completedTests: admin.firestore.FieldValue.increment(completed),
-        startedTests: admin.firestore.FieldValue.increment(started),
-        timeTyping: admin.firestore.FieldValue.increment(time),
-      });
-  } catch (e) {
-    console.error(`Error while incrementing public stats: ${e}`);
-  }
-}
-
-async function incrementTestCounter(uid, userData) {
-  try {
-    if (userData.completedTests === undefined) {
-      let results = await db.collection(`users/${uid}/results`).get();
-      let count = results.docs.length;
-      db.collection("users")
-        .doc(uid)
-        .update({
-          completedTests: admin.firestore.FieldValue.increment(count),
-        });
-      db.collection("public")
-        .doc("stats")
-        .update({
-          completedTests: admin.firestore.FieldValue.increment(count),
-        });
-    } else {
-      db.collection("users")
-        .doc(uid)
-        .update({ completedTests: admin.firestore.FieldValue.increment(1) });
-      db.collection("public")
-        .doc("stats")
-        .update({ completedTests: admin.firestore.FieldValue.increment(1) });
-    }
-  } catch (e) {
-    console.error(
-      `Error while incrementing completed tests for user ${uid}: ${e}`
-    );
-  }
-}
-
-async function incrementStartedTestCounter(uid, num, userData) {
-  try {
-    if (userData.startedTests === undefined) {
-      let stepSize = 1000;
-      let results = [];
-      let query = await db
-        .collection(`users/${uid}/results`)
-        .orderBy("timestamp", "desc")
-        .limit(stepSize)
-        .get();
-      let lastDoc;
-      while (query.docs.length > 0) {
-        lastDoc = query.docs[query.docs.length - 1];
-        query.docs.forEach((doc) => {
-          results.push({ restartCount: doc.data().restartCount });
-        });
-        query = await db
-          .collection(`users/${uid}/results`)
-          .orderBy("timestamp", "desc")
-          .limit(stepSize)
-          .startAfter(lastDoc)
-          .get();
-      }
-
-      let count = 0;
-      results.forEach((result) => {
-        try {
-          let rc = result.restartCount;
-          if (rc === undefined) {
-            rc = 0;
-          }
-
-          count += parseInt(rc);
-        } catch (e) {}
-      });
-      count += results.length;
-      db.collection("users")
-        .doc(uid)
-        .update({
-          startedTests: admin.firestore.FieldValue.increment(count),
-        });
-      db.collection("public")
-        .doc("stats")
-        .update({
-          startedTests: admin.firestore.FieldValue.increment(count),
-        });
-    } else {
-      db.collection("users")
-        .doc(uid)
-        .update({ startedTests: admin.firestore.FieldValue.increment(num) });
-      db.collection("public")
-        .doc("stats")
-        .update({ startedTests: admin.firestore.FieldValue.increment(num) });
-    }
-  } catch (e) {
-    console.error(
-      `Error while incrementing started tests for user ${uid}: ${e}`
-    );
-  }
-}
-
-exports.testCompleted = functions.https.onRequest(async (request, response) => {
-  response.set("Access-Control-Allow-Origin", origin);
-  if (request.method === "OPTIONS") {
-    // Send response to OPTIONS requests
-    response.set("Access-Control-Allow-Methods", "POST, GET, OPTIONS");
-    response.set("Access-Control-Allow-Headers", "Authorization,Content-Type");
-    response.set("Access-Control-Max-Age", "3600");
-    response.status(204).send("");
-    return;
-  }
-  request = request.body.data;
-  if (request === undefined) {
-    response.status(200).send({ data: { resultCode: -999 } });
-    return;
-  }
-  try {
-    if (request.uid === undefined || request.obj === undefined) {
-      console.error(`error saving result for - missing input`);
-      response.status(200).send({ data: { resultCode: -999 } });
-      return;
-    }
-
-    let obj = request.obj;
-
-    if (obj.incompleteTestSeconds > 500)
-      console.log(
-        `FUCK, HIGH INCOMPLETE TEST SECONDS ${request.uid}: ${JSON.stringify(
-          obj
-        )}`
-      );
-
-    function verifyValue(val) {
-      let errCount = 0;
-      if (val === null || val === undefined) {
-      } else if (Array.isArray(val)) {
-        //array
-        val.forEach((val2) => {
-          errCount += verifyValue(val2);
-        });
-      } else if (typeof val === "object" && !Array.isArray(val)) {
-        //object
-        Object.keys(val).forEach((valkey) => {
-          errCount += verifyValue(val[valkey]);
-        });
-      } else {
-        if (!/^[0-9a-zA-Z._\-\+]+$/.test(val)) errCount++;
-      }
-      return errCount;
-    }
-    let errCount = verifyValue(obj);
-    if (errCount > 0) {
-      console.error(
-        `error saving result for ${
-          request.uid
-        } error count ${errCount} - bad input - ${JSON.stringify(request.obj)}`
-      );
-      response.status(200).send({ data: { resultCode: -1 } });
-      return;
-    }
-
-    if (
-      obj.wpm <= 0 ||
-      obj.wpm > 350 ||
-      obj.acc < 50 ||
-      obj.acc > 100 ||
-      obj.consistency > 100
-    ) {
-      response.status(200).send({ data: { resultCode: -1 } });
-      return;
-    }
-    if (
-      (obj.mode === "time" && obj.mode2 < 15 && obj.mode2 > 0) ||
-      (obj.mode === "time" && obj.mode2 == 0 && obj.testDuration < 15) ||
-      (obj.mode === "words" && obj.mode2 < 10 && obj.mode2 > 0) ||
-      (obj.mode === "words" && obj.mode2 == 0 && obj.testDuration < 15) ||
-      (obj.mode === "custom" &&
-        obj.customText !== undefined &&
-        !obj.customText.isWordRandom &&
-        !obj.customText.isTimeRandom &&
-        obj.customText.textLen < 10) ||
-      (obj.mode === "custom" &&
-        obj.customText !== undefined &&
-        obj.customText.isWordRandom &&
-        !obj.customText.isTimeRandom &&
-        obj.customText.word < 10) ||
-      (obj.mode === "custom" &&
-        obj.customText !== undefined &&
-        !obj.customText.isWordRandom &&
-        obj.customText.isTimeRandom &&
-        obj.customText.time < 15)
-    ) {
-      response
-        .status(200)
-        .send({ data: { resultCode: -5, message: "Test too short" } });
-      return;
-    }
-    if (!validateResult(obj)) {
-      if (
-        obj.bailedOut &&
-        ((obj.mode === "time" && obj.mode2 >= 3600) ||
-          (obj.mode === "words" && obj.mode2 >= 5000) ||
-          obj.mode === "custom")
-      ) {
-        //dont give an error
-      } else {
-        response.status(200).send({ data: { resultCode: -4 } });
-        return;
-      }
-    }
-
-    let keySpacing = null;
-    let keyDuration = null;
-    try {
-      keySpacing = {
-        average:
-          obj.keySpacing.reduce((previous, current) => (current += previous)) /
-          obj.keySpacing.length,
-        sd: stdDev(obj.keySpacing),
-      };
-
-      keyDuration = {
-        average:
-          obj.keyDuration.reduce((previous, current) => (current += previous)) /
-          obj.keyDuration.length,
-        sd: stdDev(obj.keyDuration),
-      };
-    } catch (e) {
-      console.error(
-        `cant verify key spacing or duration for user ${request.uid}! - ${e} - ${obj.keySpacing} ${obj.keyDuration}`
-      );
-    }
-
-    obj.keySpacingStats = keySpacing;
-    obj.keyDurationStats = keyDuration;
-
-    if (obj.mode == "time" && (obj.mode2 == 15 || obj.mode2 == 60)) {
-    } else {
-      obj.keySpacing = "removed";
-      obj.keyDuration = "removed";
-    }
-
-    // emailVerified = await admin
-    //   .auth()
-    //   .getUser(request.uid)
-    //   .then((user) => {
-    //     return user.emailVerified;
-    //   });
-    // emailVerified = true;
-
-    // if (obj.funbox === "nospace") {
-    //   response.status(200).send({ data: { resultCode: -1 } });
-    //   return;
-    // }
-    return db
-      .collection("users")
-      .doc(request.uid)
-      .get()
-      .then((ret) => {
-        let userdata = ret.data();
-        let name = userdata.name === undefined ? false : userdata.name;
-        let banned = userdata.banned === undefined ? false : userdata.banned;
-        let verified = userdata.verified;
-        request.obj.name = name;
-
-        //check keyspacing and duration here
-        if (obj.mode === "time" && obj.wpm > 130 && obj.testDuration < 122) {
-          if (verified === false || verified === undefined) {
-            if (keySpacing !== null && keyDuration !== null) {
-              if (
-                keySpacing.sd <= 15 ||
-                keyDuration.sd <= 10 ||
-                keyDuration.average < 15 ||
-                (obj.wpm > 200 && obj.consistency < 70)
-              ) {
-                console.error(
-                  `possible bot detected by user (${obj.wpm} ${obj.rawWpm} ${
-                    obj.acc
-                  }) ${request.uid} ${name} - spacing ${JSON.stringify(
-                    keySpacing
-                  )} duration ${JSON.stringify(keyDuration)}`
-                );
-                response.status(200).send({ data: { resultCode: -2 } });
+              )
+              .then((res) => {
+                console.log(`generated ${randomCode} for user ${request.uid}`);
+                response.status(200).send({
+                  data: {
+                    status: 1,
+                    pairingCode: randomCode,
+                  },
+                });
                 return;
-              }
-              if (
-                (keySpacing.sd > 15 && keySpacing.sd <= 25) ||
-                (keyDuration.sd > 10 && keyDuration.sd <= 15) ||
-                (keyDuration.average > 15 && keyDuration.average <= 20)
-              ) {
+              })
+              .catch((e) => {
                 console.error(
-                  `very close to bot detected threshold by user (${obj.wpm} ${
-                    obj.rawWpm
-                  } ${obj.acc}) ${
-                    request.uid
-                  } ${name} - spacing ${JSON.stringify(
-                    keySpacing
-                  )} duration ${JSON.stringify(keyDuration)}`
+                  `error while trying to set discord pairing code ${randomCode} for user ${request.uid} - ${e}`
                 );
-              }
-            } else {
-              response.status(200).send({ data: { resultCode: -3 } });
-              return;
-            }
-          }
-        }
-
-        //yeet the key data
-        obj.keySpacing = null;
-        obj.keyDuration = null;
-        try {
-          obj.keyDurationStats.average = roundTo2(obj.keyDurationStats.average);
-          obj.keyDurationStats.sd = roundTo2(obj.keyDurationStats.sd);
-          obj.keySpacingStats.average = roundTo2(obj.keySpacingStats.average);
-          obj.keySpacingStats.sd = roundTo2(obj.keySpacingStats.sd);
-        } catch (e) {}
-
-        // return db
-        //   .collection(`users/${request.uid}/results`)
-        //   .add(obj)
-        //   .then((e) => {
-
-        // let createdDocId = e.id;
-        return Promise.all([
-          // checkLeaderboards(
-          //   request.obj,
-          //   "global",
-          //   banned,
-          //   name,
-          //   verified,
-          //   emailVerified
-          // ),
-          // checkLeaderboards(
-          //   request.obj,
-          //   "daily",
-          //   banned,
-          //   name,
-          //   verified,
-          //   emailVerified
-          // ),
-          checkIfPB(request.uid, request.obj, userdata),
-          checkIfTagPB(request.uid, request.obj),
-        ])
-          .then(async (values) => {
-            // let globallb = values[0].insertedAt;
-            // let dailylb = values[1].insertedAt;
-            let ispb = values[0];
-            let tagPbs = values[1];
-            let createdDocId = await stripAndSave(request.uid, request.obj);
-            createdDocId = createdDocId.id;
-            // console.log(values);
-
-            if (obj.mode === "time" && String(obj.mode2) === "60") {
-              incrementT60Bananas(request.uid, obj, userdata);
-            }
-
-            let newTypingStats = await getIncrementedTypingStats(userdata, obj);
-
-            db.collection("users").doc(request.uid).update({
-              startedTests: newTypingStats.newStarted,
-              completedTests: newTypingStats.newCompleted,
-              timeTyping: newTypingStats.newTime,
-            });
-            // }
-
-            let returnobj = {
-              resultCode: null,
-              // globalLeaderboard: globallb,
-              // dailyLeaderboard: dailylb,
-              // lbBanned: banned,
-              name: name,
-              createdId: createdDocId,
-              needsToVerify: values[0].needsToVerify,
-              needsToVerifyEmail: values[0].needsToVerifyEmail,
-              tagPbs: tagPbs,
-            };
-            if (ispb) {
-              let logobj = request.obj;
-              logobj.keySpacing = "removed";
-              logobj.keyDuration = "removed";
-              console.log(
-                `saved result for ${request.uid} (new PB) - ${JSON.stringify(
-                  logobj
-                )}`
-              );
-              await db
-                .collection(`users/${request.uid}/results/`)
-                .doc(createdDocId)
-                .update({ isPb: true });
-              if (
-                obj.mode === "time" &&
-                String(obj.mode2) === "60" &&
-                userdata.discordId !== null &&
-                userdata.discordId !== undefined
-              ) {
-                if (verified !== false) {
-                  console.log(
-                    `sending command to the bot to update the role for user ${request.uid} with wpm ${obj.wpm}`
-                  );
-                  updateDiscordRole(userdata.discordId, Math.round(obj.wpm));
-                }
-              }
-              returnobj.resultCode = 2;
-            } else {
-              let logobj = request.obj;
-              logobj.keySpacing = "removed";
-              logobj.keyDuration = "removed";
-              console.log(
-                `saved result for ${request.uid} - ${JSON.stringify(logobj)}`
-              );
-              returnobj.resultCode = 1;
-            }
-            response.status(200).send({ data: returnobj });
-            return;
-          })
-          .catch((e) => {
-            console.error(
-              `error saving result when checking for PB / checking leaderboards for ${request.uid} - ${e.message}`
-            );
-            response
-              .status(200)
-              .send({ data: { resultCode: -999, message: e.message } });
-            return;
-          });
-      })
-      .catch((e) => {
-        console.error(
-          `error saving result when getting user data for ${request.uid} - ${e.message}`
-        );
-        response
-          .status(200)
-          .send({ data: { resultCode: -999, message: e.message } });
-        return;
-      });
-  } catch (e) {
-    console.error(
-      `error saving result for ${request.uid} - ${JSON.stringify(
-        request.obj
-      )} - ${e}`
-    );
-    response
-      .status(200)
-      .send({ data: { resultCode: -999, message: e.message } });
-    return;
-  }
-});
-
-async function stripAndSave(uid, obj) {
-  if (obj.bailedOut === false) delete obj.bailedOut;
-  if (obj.blindMode === false) delete obj.blindMode;
-  if (obj.difficulty === "normal") delete obj.difficulty;
-  if (obj.funbox === "none") delete obj.funbox;
-  if (obj.language === "english") delete obj.language;
-  if (obj.numbers === false) delete obj.numbers;
-  if (obj.punctuation === false) delete obj.punctuation;
-
-  return await db.collection(`users/${uid}/results`).add(obj);
-}
-
-exports.updateEmail = functions.https.onCall(async (request, response) => {
-  try {
-    let previousEmail = await admin.auth().getUser(request.uid);
-
-    if (previousEmail.email !== request.previousEmail) {
-      return { resultCode: -1 };
-    } else {
-      await admin.auth().updateUser(request.uid, {
-        email: request.newEmail,
-        emailVerified: false,
-      });
-      return {
-        resultCode: 1,
-      };
-    }
-  } catch (e) {
-    console.error(`error updating email for ${request.uid} - ${e}`);
-    return {
-      resultCode: -999,
-      message: e.message,
-    };
-  }
-});
-
-function updateDiscordRole(discordId, wpm) {
-  db.collection("bot-commands").add({
-    command: "updateRole",
-    arguments: [discordId, wpm],
-    executed: false,
-    requestTimestamp: Date.now(),
-  });
-}
-
-function isTagPresetNameValid(name) {
-  if (name === null || name === undefined || name === "") return false;
-  if (name.length > 16) return false;
-  return /^[0-9a-zA-Z_.-]+$/.test(name);
-}
-
-exports.addTag = functions.https.onCall((request, response) => {
-  try {
-    if (!isTagPresetNameValid(request.name)) {
-      return { resultCode: -1 };
-    } else {
-      return db
-        .collection(`users/${request.uid}/tags`)
-        .add({
-          name: request.name,
-        })
-        .then((e) => {
-          console.log(`user ${request.uid} created a tag: ${request.name}`);
-          return {
-            resultCode: 1,
-            id: e.id,
-          };
-        })
-        .catch((e) => {
-          console.error(
-            `error while creating tag for user ${request.uid}: ${e.message}`
-          );
-          return { resultCode: -999, message: e.message };
-        });
-    }
-  } catch (e) {
-    console.error(`error adding tag for ${request.uid} - ${e}`);
-    return { resultCode: -999, message: e.message };
-  }
-});
-
-exports.editTag = functions.https.onCall((request, response) => {
-  try {
-    if (!isTagPresetNameValid(request.name)) {
-      return { resultCode: -1 };
-    } else {
-      return db
-        .collection(`users/${request.uid}/tags`)
-        .doc(request.tagid)
-        .update({
-          name: request.name,
-        })
-        .then((e) => {
-          console.log(`user ${request.uid} updated a tag: ${request.name}`);
-          return {
-            resultCode: 1,
-          };
-        })
-        .catch((e) => {
-          console.error(
-            `error while updating tag for user ${request.uid}: ${e.message}`
-          );
-          return { resultCode: -999, message: e.message };
-        });
-    }
-  } catch (e) {
-    console.error(`error updating tag for ${request.uid} - ${e}`);
-    return { resultCode: -999, message: e.message };
-  }
-});
-
-exports.removeTag = functions.https.onCall((request, response) => {
-  try {
-    return db
-      .collection(`users/${request.uid}/tags`)
-      .doc(request.tagid)
-      .delete()
-      .then((e) => {
-        console.log(`user ${request.uid} deleted a tag`);
-        return {
-          resultCode: 1,
-        };
-      })
-      .catch((e) => {
-        console.error(
-          `error deleting tag for user ${request.uid}: ${e.message}`
-        );
-        return { resultCode: -999 };
-      });
-  } catch (e) {
-    console.error(`error deleting tag for ${request.uid} - ${e}`);
-    return { resultCode: -999 };
-  }
-});
-
-exports.updateResultTags = functions.https.onCall((request, response) => {
-  try {
-    let validTags = true;
-    request.tags.forEach((tag) => {
-      if (!/^[0-9a-zA-Z]+$/.test(tag)) validTags = false;
-    });
-    if (validTags) {
-      return db
-        .collection(`users/${request.uid}/results`)
-        .doc(request.resultid)
-        .update({
-          tags: request.tags,
-        })
-        .then((e) => {
-          console.log(
-            `user ${request.uid} updated tags for result ${request.resultid}`
-          );
-          return {
-            resultCode: 1,
-          };
-        })
-        .catch((e) => {
-          console.error(
-            `error while updating tags for result by user ${request.uid}: ${e.message}`
-          );
-          return { resultCode: -999 };
-        });
-    } else {
-      console.error(`invalid tags for user ${request.uid}: ${request.tags}`);
-      return { resultCode: -1 };
-    }
-  } catch (e) {
-    console.error(`error updating tags by ${request.uid} - ${e}`);
-    return { resultCode: -999, message: e };
-  }
-});
-
-function isConfigKeyValid(name) {
-  if (name === null || name === undefined || name === "") return false;
-  if (name.length > 30) return false;
-  return /^[0-9a-zA-Z_.\-#+]+$/.test(name);
-}
-
-exports.saveConfig = functions.https.onCall((request, response) => {
-  try {
-    if (request.uid === undefined || request.obj === undefined) {
-      console.error(`error saving config for ${request.uid} - missing input`);
-      return {
-        resultCode: -1,
-        message: "Missing input",
-      };
-    }
-
-    let obj = request.obj;
-    let errorMessage = "";
-    let err = false;
-    Object.keys(obj).forEach((key) => {
-      if (err) return;
-      if (!isConfigKeyValid(key)) {
-        err = true;
-        console.error(`${key} failed regex check`);
-        errorMessage = `${key} failed regex check`;
-      }
-      if (err) return;
-      if (key === "resultFilters") return;
-      if (key === "customBackground") return;
-      if (key === "customLayoutfluid") return;
-      let val = obj[key];
-      if (Array.isArray(val)) {
-        val.forEach((valarr) => {
-          if (!isConfigKeyValid(valarr)) {
-            err = true;
-            console.error(`${key}: ${valarr} failed regex check`);
-            errorMessage = `${key}: ${valarr} failed regex check`;
-          }
-        });
-      } else {
-        if (!isConfigKeyValid(val)) {
-          err = true;
-          console.error(`${key}: ${val} failed regex check`);
-          errorMessage = `${key}: ${val} failed regex check`;
-        }
-      }
-    });
-    if (err) {
-      console.error(
-        `error saving config for ${request.uid} - bad input - ${JSON.stringify(
-          request.obj
-        )}`
-      );
-      return {
-        resultCode: -1,
-        message: "Bad input. " + errorMessage,
-      };
-    }
-
-    return db
-      .collection(`users`)
-      .doc(request.uid)
-      .set(
-        {
-          config: obj,
-        },
-        { merge: true }
-      )
-      .then((e) => {
-        return {
-          resultCode: 1,
-          message: "Saved",
-        };
-      })
-      .catch((e) => {
-        console.error(
-          `error saving config to DB for ${request.uid} - ${e.message}`
-        );
-        return {
-          resultCode: -1,
-          message: e.message,
-        };
-      });
-  } catch (e) {
-    console.error(`error saving config for ${request.uid} - ${e}`);
-    return {
-      resultCode: -999,
-      message: e,
-    };
-  }
-});
-
-exports.addPreset = functions.https.onCall(async (request, response) => {
-  try {
-    if (!isTagPresetNameValid(request.obj.name)) {
-      return { resultCode: -1 };
-    } else if (request.uid === undefined || request.obj === undefined) {
-      console.error(`error saving config for ${request.uid} - missing input`);
-      return {
-        resultCode: -1,
-        message: "Missing input",
-      };
-    } else {
-      let config = request.obj.config;
-      let errorMessage = "";
-      let err = false;
-      Object.keys(config).forEach((key) => {
-        if (err) return;
-        if (!isConfigKeyValid(key)) {
-          err = true;
-          console.error(`${key} failed regex check`);
-          errorMessage = `${key} failed regex check`;
-        }
-        if (err) return;
-        if (key === "resultFilters") return;
-        if (key === "customBackground") return;
-        let val = config[key];
-        if (Array.isArray(val)) {
-          val.forEach((valarr) => {
-            if (!isConfigKeyValid(valarr)) {
-              err = true;
-              console.error(`${key}: ${valarr} failed regex check`);
-              errorMessage = `${key}: ${valarr} failed regex check`;
-            }
-          });
-        } else {
-          if (!isConfigKeyValid(val)) {
-            err = true;
-            console.error(`${key}: ${val} failed regex check`);
-            errorMessage = `${key}: ${val} failed regex check`;
-          }
-        }
-      });
-      if (err) {
-        console.error(
-          `error adding preset for ${
-            request.uid
-          } - bad input - ${JSON.stringify(request.obj)}`
-        );
-        return {
-          resultCode: -1,
-          message: "Bad input. " + errorMessage,
-        };
-      }
-
-      let presets = await db.collection(`users/${request.uid}/presets`).get();
-      if (presets.docs.length >= 10) {
-        return {
-          resultCode: -2,
-          message: "Preset limit",
-        };
-      }
-
-      return db
-        .collection(`users/${request.uid}/presets`)
-        .add(request.obj)
-        .then((e) => {
-          return {
-            resultCode: 1,
-            message: "Saved",
-            id: e.id,
-          };
-        })
-        .catch((e) => {
-          console.error(
-            `error adding preset to DB for ${request.uid} - ${e.message}`
-          );
-          return {
-            resultCode: -1,
-            message: e.message,
-          };
-        });
-    }
-  } catch (e) {
-    console.error(`error adding preset for ${request.uid} - ${e}`);
-    return {
-      resultCode: -999,
-      message: e,
-    };
-  }
-});
-
-exports.editPreset = functions.https.onCall((request, response) => {
-  try {
-    if (!isTagPresetNameValid(request.name)) {
-      return { resultCode: -1 };
-    } else {
-      return db
-        .collection(`users/${request.uid}/presets`)
-        .doc(request.presetid)
-        .set({
-          config: request.config,
-          name: request.name,
-        })
-        .then((e) => {
-          console.log(`user ${request.uid} updated a preset: ${request.name}`);
-          return {
-            resultCode: 1,
-          };
-        })
-        .catch((e) => {
-          console.error(
-            `error while updating preset for user ${request.uid}: ${e.message}`
-          );
-          return { resultCode: -999, message: e.message };
-        });
-    }
-  } catch (e) {
-    console.error(`error updating preset for ${request.uid} - ${e}`);
-    return { resultCode: -999, message: e.message };
-  }
-});
-
-exports.removePreset = functions.https.onCall((request, response) => {
-  try {
-    return db
-      .collection(`users/${request.uid}/presets`)
-      .doc(request.presetid)
-      .delete()
-      .then((e) => {
-        console.log(`user ${request.uid} deleted a tag`);
-        return {
-          resultCode: 1,
-        };
-      })
-      .catch((e) => {
-        console.error(
-          `error deleting tag for user ${request.uid}: ${e.message}`
-        );
-        return { resultCode: -999 };
-      });
-  } catch (e) {
-    console.error(`error deleting tag for ${request.uid} - ${e}`);
-    return { resultCode: -999 };
-  }
-});
-
-// exports.saveLbMemory = functions.https.onCall((request, response) => {
-//   try {
-//     if (request.uid === undefined || request.obj === undefined) {
-//       console.error(
-//         `error saving lb memory for ${request.uid} - missing input`
-//       );
-//       return {
-//         returnCode: -1,
-//         message: "Missing input",
-//       };
-//     }
-
-//     let obj = request.obj;
-//     return db
-//       .collection(`users`)
-//       .doc(request.uid)
-//       .set(
-//         {
-//           lbMemory: obj,
-//         },
-//         { merge: true }
-//       )
-//       .then((e) => {
-//         return {
-//           returnCode: 1,
-//           message: "Saved",
-//         };
-//       })
-//       .catch((e) => {
-//         console.error(
-//           `error saving lb memory to DB for ${request.uid} - ${e.message}`
-//         );
-//         return {
-//           returnCode: -1,
-//           message: e.message,
-//         };
-//       });
-//   } catch (e) {
-//     console.error(`error saving lb memory for ${request.uid} - ${e}`);
-//     return {
-//       resultCode: -999,
-//       message: e,
-//     };
-//   }
-// });
-
-function generate(n) {
-  var add = 1,
-    max = 12 - add;
-
-  if (n > max) {
-    return generate(max) + generate(n - max);
-  }
-
-  max = Math.pow(10, n + add);
-  var min = max / 10; // Math.pow(10, n) basically
-  var number = Math.floor(Math.random() * (max - min + 1)) + min;
-
-  return ("" + number).substring(add);
-}
-
-class Leaderboard {
-  constructor(size, mode, mode2, type, starting) {
-    this.size = size;
-    this.board = [];
-    this.mode = mode;
-    this.mode2 = parseInt(mode2);
-    this.type = type;
-    if (starting !== undefined && starting !== null) {
-      starting.forEach((entry) => {
-        if (
-          entry.mode == this.mode &&
-          parseInt(entry.mode2) === parseInt(this.mode2)
-        ) {
-          let hid = entry.hidden === undefined ? false : entry.hidden;
-          this.board.push({
-            uid: entry.uid,
-            name: entry.name,
-            wpm: parseFloat(entry.wpm),
-            raw: parseFloat(entry.raw),
-            acc: parseFloat(entry.acc),
-            consistency: isNaN(parseInt(entry.consistency))
-              ? "-"
-              : parseInt(entry.consistency),
-            mode: entry.mode,
-            mode2: parseInt(entry.mode2),
-            timestamp: entry.timestamp,
-            hidden: hid,
-          });
-        }
-      });
-    }
-    this.sortBoard();
-    this.clipBoard();
-  }
-  sortBoard() {
-    this.board.sort((a, b) => {
-      if (a.wpm === b.wpm) {
-        if (a.acc === b.acc) {
-          return a.timestamp - b.timestamp;
-        } else {
-          return b.acc - a.acc;
-        }
-      } else {
-        return b.wpm - a.wpm;
-      }
-    });
-  }
-  clipBoard() {
-    let boardLength = this.board.length;
-    if (boardLength > this.size) {
-      while (this.board.length !== this.size) {
-        this.board.pop();
-      }
-    }
-  }
-  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;
-    // let ret;
-    let foundAt = null;
-    if (this.board !== undefined) {
-      this.board.forEach((entry, index) => {
-        if (entry.uid === uid) {
-          if (found) {
-            this.board.splice(index, 1);
-            // if (index > insertedAt) {
-            //   //removed old result
-            //   ret = false;
-            // } else {
-            //   ret = true;
-            // }
-          } else {
-            found = true;
-            foundAt = index;
-          }
-        }
-      });
-    }
-    // console.log(ret);
-    // return ret;
-    return foundAt;
-  }
-  insert(a) {
-    let insertedAt = -1;
-    if (a.mode == this.mode && parseInt(a.mode2) === parseInt(this.mode2)) {
-      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,
+                response.status(200).send({
+                  data: {
+                    status: -999,
+                  },
                 });
-                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.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,
+                return;
               });
-              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;
-          }
-        }
-        // console.log(this.board);
-        this.clipBoard();
-        return {
-          insertedAt: insertedAt,
-          newBest: newBest,
-          foundAt: foundAt,
-        };
-      } else {
-        return {
-          insertedAt: -999,
-        };
-      }
-    } else {
-      return {
-        insertedAt: -999,
-      };
-    }
-  }
-}
-
-// exports.generatePairingCode = functions
-//   .runWith({
-//     timeoutSeconds: 100,
-//     memory: "2GB",
-//   })
-//   .https.onRequest((request, response) => {
-//     response.set("Access-Control-Allow-Origin", "*");
-//     if (request.method === "OPTIONS") {
-//       // Send response to OPTIONS requests
-//       response.set("Access-Control-Allow-Methods", "POST, GET, OPTIONS");
-//       response.set(
-//         "Access-Control-Allow-Headers",
-//         "Authorization,Content-Type"
-//       );
-//       response.set("Access-Control-Max-Age", "3600");
-//       response.status(204).send("");
-//       return;
-//     }
-//     request = request.body.data;
-//     try {
-//       if (request === null) {
-//         console.error(
-//           `error while trying to generate discord pairing code - no input`
-//         );
-//         response.status(200).send({ data: { status: -999 } });
-//         return;
-//       }
-
-//       return db
-//         .collection("users")
-//         .doc(request.uid)
-//         .get()
-//         .then(async (userDoc) => {
-//           userDocData = userDoc.data();
-//           if (
-//             userDocData.discordPairingCode !== undefined &&
-//             userDocData.discordPairingCode !== null
-//           ) {
-//             console.log(
-//               `user ${request.uid} already has code ${userDocData.discordPairingCode}`
-//             );
-//             response.status(200).send({
-//               data: {
-//                 status: -999,
-//                 pairingCode: userDocData.discordPairingCode,
-//               },
-//             });
-//           } else {
-//             let stepSize = 1000;
-//             let existingCodes = [];
-//             let query = await db
-//               .collection(`users`)
-//               .where("discordPairingCode", ">", "")
-//               .limit(stepSize)
-//               .get();
-//             let lastDoc;
-//             while (query.docs.length > 0) {
-//               lastDoc = query.docs[query.docs.length - 1];
-//               query.docs.forEach((doc) => {
-//                 let docData = doc.data();
-//                 if (
-//                   docData.discordPairingCode !== undefined &&
-//                   docData.discordPairingCode !== null
-//                 ) {
-//                   existingCodes.push(docData.discordPairingCode);
-//                 }
-//               });
-//               query = await db
-//                 .collection(`users`)
-//                 .where("discordPairingCode", ">", "")
-//                 .limit(stepSize)
-//                 .startAfter(lastDoc)
-//                 .get();
-//             }
-
-//             let randomCode = generate(9);
-
-//             while (existingCodes.includes(randomCode)) {
-//               randomCode = generate(9);
-//             }
-
-//             return db
-//               .collection("users")
-//               .doc(request.uid)
-//               .update(
-//                 {
-//                   discordPairingCode: randomCode,
-//                 },
-//                 { merge: true }
-//               )
-//               .then((res) => {
-//                 console.log(`generated ${randomCode} for user ${request.uid}`);
-//                 response.status(200).send({
-//                   data: {
-//                     status: 1,
-//                     pairingCode: randomCode,
-//                   },
-//                 });
-//                 return;
-//               })
-//               .catch((e) => {
-//                 console.error(
-//                   `error while trying to set discord pairing code ${randomCode} for user ${request.uid} - ${e}`
-//                 );
-//                 response.status(200).send({
-//                   data: {
-//                     status: -999,
-//                   },
-//                 });
-//                 return;
-//               });
-//           }
-//         });
-//     } catch (e) {
-//       console.error(
-//         `error while trying to generate discord pairing code for user ${request.uid} - ${e}`
-//       );
-//       response.status(200).send({
-//         data: {
-//           status: -999,
-//         },
-//       });
-//       return;
-//     }
-//   });
-
-exports.unlinkDiscord = functions.https.onRequest((request, response) => {
-  response.set("Access-Control-Allow-Origin", origin);
-  if (request.method === "OPTIONS") {
-    // Send response to OPTIONS requests
-    response.set("Access-Control-Allow-Methods", "POST, GET, OPTIONS");
-    response.set("Access-Control-Allow-Headers", "Authorization,Content-Type");
-    response.set("Access-Control-Max-Age", "3600");
-    response.status(204).send("");
-    return;
-  }
-  request = request.body.data;
-  try {
-    if (request === null || request.uid === undefined) {
-      response
-        .status(200)
-        .send({ data: { status: -999, message: "Empty request" } });
-      return;
-    }
-    return db
-      .collection(`users`)
-      .doc(request.uid)
-      .update({
-        discordId: null,
-      })
-      .then((f) => {
-        response.status(200).send({
-          data: {
-            status: 1,
-            message: "Unlinked",
-          },
-        });
-        return;
-      })
-      .catch((e) => {
-        response.status(200).send({
-          data: {
-            status: -999,
-            message: e.message,
-          },
-        });
-        return;
-      });
-  } catch (e) {
-    response.status(200).send({
-      data: {
-        status: -999,
-        message: e,
-      },
-    });
-    return;
-  }
-});
-
-exports.checkLeaderboards = functions.https.onRequest(
-  async (request, response) => {
-    response.set("Access-Control-Allow-Origin", origin);
-    if (request.method === "OPTIONS") {
-      // Send response to OPTIONS requests
-      response.set("Access-Control-Allow-Methods", "POST, GET, OPTIONS");
-      response.set(
-        "Access-Control-Allow-Headers",
-        "Authorization,Content-Type"
-      );
-      response.set("Access-Control-Max-Age", "3600");
-      response.status(204).send("");
-      return;
-    }
-    request = request.body.data;
-
-    if (request.token === undefined) {
-      response.status(200).send({
-        data: {
-          status: -999,
-          message: "No token",
-        },
-      });
-      return;
-    }
-    let tokenDecoded;
-    try {
-      tokenDecoded = await admin.auth().verifyIdToken(request.token);
     } catch (e) {
-      response.status(200).send({
-        data: {
-          status: -999,
-          message: "Bad token",
-        },
-      });
-      return;
-    }
-    request.emailVerified = tokenDecoded.email_verified;
-    request.uid = tokenDecoded.uid;
-
-    // name:
-    // banned:
-    // verified:
-    // discordId
-
-    let userData = await db.collection("users").doc(request.uid).get();
-    userData = userData.data();
-
-    request.name = userData.name;
-    request.banned = userData.banned;
-    request.verified = userData.verified;
-    request.discordId = userData.discordId;
-    request.lbMemory = userData.lbMemory;
-
-    function verifyValue(val) {
-      let errCount = 0;
-      if (val === null || val === undefined) {
-      } else if (Array.isArray(val)) {
-        //array
-        val.forEach((val2) => {
-          errCount += verifyValue(val2);
-        });
-      } else if (typeof val === "object" && !Array.isArray(val)) {
-        //object
-        Object.keys(val).forEach((valkey) => {
-          errCount += verifyValue(val[valkey]);
-        });
-      } else {
-        if (!/^[0-9a-zA-Z._\-\+]+$/.test(val)) errCount++;
-      }
-      return errCount;
-    }
-    let errCount = verifyValue(request);
-    if (errCount > 0) {
       console.error(
-        `error checking leaderboard for ${
-          request.uid
-        } error count ${errCount} - bad input - ${JSON.stringify(request.obj)}`
+        `error while trying to generate discord pairing code for user ${request.uid} - ${e}`
       );
       response.status(200).send({
         data: {
           status: -999,
-          message: "Bad input",
         },
       });
       return;
     }
-
-    try {
-      if (request.emailVerified === false) {
-        response.status(200).send({
-          data: {
-            needsToVerifyEmail: true,
-          },
-        });
-        return;
-      }
-      if (request.name === undefined) {
-        response.status(200).send({
-          data: {
-            noName: true,
-          },
-        });
-        return;
-      }
-      if (request.banned) {
-        response.status(200).send({
-          data: {
-            banned: true,
-          },
-        });
-        return;
-      }
-      if (request.verified === false) {
-        response.status(200).send({
-          data: {
-            needsToVerify: true,
-          },
-        });
-        return;
-      }
-
-      request.result.name = request.name;
-
-      if (
-        request.result.mode === "time" &&
-        ["15", "60"].includes(String(request.result.mode2)) &&
-        request.result.language === "english" &&
-        request.result.funbox === "none"
-      ) {
-        let global = await db
-          .runTransaction(async (t) => {
-            const lbdoc = await t.get(
-              db
-                .collection("leaderboards")
-                .where("mode", "==", String(request.result.mode))
-                .where("mode2", "==", String(request.result.mode2))
-                .where("type", "==", "global")
-            );
-            // let lbData;
-            let docid = `${String(request.result.mode)}_${String(
-              request.result.mode2
-            )}_${"global"}`;
-            // if (lbdoc.docs.length === 0) {
-            //   console.log(
-            //     `no ${request.mode} ${request.mode2} ${type} leaderboard found - creating`
-            //   );
-            //   let toAdd = {
-            //     size: 20,
-            //     mode: String(request.mode),
-            //     mode2: String(request.mode2),
-            //     type: type,
-            //   };
-            //   t.set(
-            //     db
-            //       .collection("leaderboards")
-            //       .doc(
-            //         `${String(request.mode)}_${String(request.mode2)}_${type}`
-            //       ),
-            //     toAdd
-            //   );
-            //   lbData = toAdd;
-            // } else {
-            //   lbData = lbdoc.docs[0].data();
-            // }
-            let boardInfo = lbdoc.docs[0].data();
-            if (
-              boardInfo.minWpm === undefined ||
-              boardInfo.board.length !== boardInfo.size ||
-              (boardInfo.minWpm !== undefined &&
-                request.result.wpm > boardInfo.minWpm &&
-                boardInfo.board.length === boardInfo.size)
-            ) {
-              let boardData = boardInfo.board;
-              let lb = new Leaderboard(
-                boardInfo.size,
-                request.result.mode,
-                request.result.mode2,
-                boardInfo.type,
-                boardData
-              );
-              let insertResult = lb.insert(request.result);
-              if (insertResult.insertedAt >= 0) {
-                t.update(db.collection("leaderboards").doc(docid), {
-                  size: lb.size,
-                  type: lb.type,
-                  board: lb.board,
-                  minWpm: lb.getMinWpm(),
-                });
-              }
-              return insertResult;
-            } else {
-              //not above leaderboard minwpm
-              return {
-                insertedAt: -1,
-              };
-            }
-          })
-          .catch((error) => {
-            console.error(
-              `error in transaction checking leaderboards - ${error}`
-            );
-            response.status(200).send({
-              data: {
-                status: -999,
-                message: error,
-              },
-            });
-          });
-
-        let daily = await db
-          .runTransaction(async (t) => {
-            const lbdoc = await t.get(
-              db
-                .collection("leaderboards")
-                .where("mode", "==", String(request.result.mode))
-                .where("mode2", "==", String(request.result.mode2))
-                .where("type", "==", "daily")
-            );
-            // let lbData;
-            let docid = `${String(request.result.mode)}_${String(
-              request.result.mode2
-            )}_${"daily"}`;
-            // if (lbdoc.docs.length === 0) {
-            //   console.log(
-            //     `no ${request.mode} ${request.mode2} ${type} leaderboard found - creating`
-            //   );
-            //   let toAdd = {
-            //     size: 20,
-            //     mode: String(request.mode),
-            //     mode2: String(request.mode2),
-            //     type: type,
-            //   };
-            //   t.set(
-            //     db
-            //       .collection("leaderboards")
-            //       .doc(
-            //         `${String(request.mode)}_${String(request.mode2)}_${type}`
-            //       ),
-            //     toAdd
-            //   );
-            //   lbData = toAdd;
-            // } else {
-            //   lbData = lbdoc.docs[0].data();
-            // }
-            let boardInfo = lbdoc.docs[0].data();
-            if (
-              boardInfo.minWpm === undefined ||
-              boardInfo.board.length !== boardInfo.size ||
-              (boardInfo.minWpm !== undefined &&
-                request.result.wpm > boardInfo.minWpm &&
-                boardInfo.board.length === boardInfo.size)
-            ) {
-              let boardData = boardInfo.board;
-              let lb = new Leaderboard(
-                boardInfo.size,
-                request.result.mode,
-                request.result.mode2,
-                boardInfo.type,
-                boardData
-              );
-              let insertResult = lb.insert(request.result);
-              if (insertResult.insertedAt >= 0) {
-                t.update(db.collection("leaderboards").doc(docid), {
-                  size: lb.size,
-                  type: lb.type,
-                  board: lb.board,
-                  minWpm: lb.getMinWpm(),
-                });
-              }
-              return insertResult;
-            } else {
-              //not above leaderboard minwpm
-              return {
-                insertedAt: -1,
-              };
-            }
-          })
-          .catch((error) => {
-            console.error(
-              `error in transaction checking leaderboards - ${error}`
-            );
-            response.status(200).send({
-              data: {
-                status: -999,
-                message: error,
-              },
-            });
-          });
-
-        //send discord update
-        let usr =
-          request.discordId != undefined ? request.discordId : request.name;
-
-        if (
-          global !== null &&
-          global.insertedAt >= 0 &&
-          global.insertedAt <= 9 &&
-          global.newBest
-        ) {
-          let lbstring = `${request.result.mode} ${request.result.mode2} global`;
-          console.log(
-            `sending command to the bot to announce lb update ${usr} ${
-              global.insertedAt + 1
-            } ${lbstring} ${request.result.wpm}`
-          );
-
-          announceLbUpdate(
-            usr,
-            global.insertedAt + 1,
-            lbstring,
-            request.result.wpm,
-            request.result.rawWpm,
-            request.result.acc,
-            request.result.consistency
-          );
-        }
-
-        //
-
-        if (
-          // obj.mode === "time" &&
-          // (obj.mode2 == "15" || obj.mode2 == "60") &&
-          // obj.language === "english"
-          global !== null ||
-          daily !== null
-        ) {
-          let updatedLbMemory = await getUpdatedLbMemory(
-            request.lbMemory,
-            request.result.mode,
-            request.result.mode2,
-            global,
-            daily
-          );
-          db.collection("users").doc(request.uid).update({
-            lbMemory: updatedLbMemory,
-          });
-        }
-
-        response.status(200).send({
-          data: {
-            status: 2,
-            daily: daily,
-            global: global,
-          },
-        });
-        return;
-      } else {
-        response.status(200).send({
-          data: {
-            status: 1,
-            daily: {
-              insertedAt: null,
-            },
-            global: {
-              insertedAt: null,
-            },
-          },
-        });
-        return;
-      }
-    } catch (e) {
-      console.log(e);
-      response.status(200).send({
-        data: {
-          status: -999,
-          message: e,
-        },
-      });
-      return;
-    }
-  }
-);
-
-// async function checkLeaderboards(
-//   resultObj,
-//   type,
-//   banned,
-//   name,
-//   verified,
-//   emailVerified
-// ) {
-//   //lb disable
-//   // return {
-//   //   insertedAt: null,
-//   // };
-//   //
-//   try {
-
-//   } catch (e) {
-//     console.error(
-//       `error while checking leaderboards - ${e} - ${type} ${resultObj}`
-//     );
-//     return {
-//       insertedAt: null,
-//     };
-//   }
-// }
-
-exports.getLeaderboard = functions.https.onCall((request, response) => {
-  return db
-    .collection("leaderboards")
-    .where("mode", "==", String(request.mode))
-    .where("mode2", "==", String(request.mode2))
-    .where("type", "==", String(request.type))
-    .get()
-    .then(async (data) => {
-      // console.log("got data");
-      if (data.docs.length === 0) return null;
-      let lbdata = data.docs[0].data();
-      if (lbdata.board !== undefined) {
-        // console.log("replacing users");
-
-        // for (let i = 0; i < lbdata.board.length; i++) {
-        //   await db
-        //     .collection("users")
-        //     .doc(lbdata.board[i].uid)
-        //     .get()
-        //     .then((doc) => {
-        //       if (
-        //         lbdata.board[i].uid !== null &&
-        //         lbdata.board[i].uid === request.uid
-        //       ) {
-        //         lbdata.board[i].currentUser = true;
-        //       }
-        //       lbdata.board[i].name = doc.data().name;
-        //       lbdata.board[i].uid = null;
-        //     });
-        // }
-
-        lbdata.board.forEach((boardentry) => {
-          if (boardentry.uid !== null && boardentry.uid === request.uid) {
-            boardentry.currentUser = true;
-          }
-          boardentry.uid = null;
-        });
-
-        // console.log(lbdata);
-        if (request.type === "daily") {
-          let resetTime = new Date(Date.now());
-          resetTime.setHours(0, 0, 0, 0);
-          resetTime.setDate(resetTime.getUTCDate() + 1);
-          resetTime = resetTime.valueOf();
-          lbdata.resetTime = resetTime;
-        }
-
-        return lbdata;
-      } else {
-        if (
-          lbdata.board === undefined ||
-          lbdata.board === [] ||
-          lbdata.board.length === 0
-        ) {
-          return lbdata;
-        } else {
-          return [];
-        }
-      }
-    });
-});
-
-exports.scheduledFunctionCrontab = functions.pubsub
-  .schedule("00 00 * * *")
-  .timeZone("Africa/Abidjan")
-  .onRun((context) => {
-    try {
-      console.log("moving daily leaderboards to history");
-      db.collection("leaderboards")
-        .where("type", "==", "daily")
-        .get()
-        .then(async (res) => {
-          for (let i = 0; i < res.docs.length; i++) {
-            let doc = res.docs[i];
-
-            let lbdata = doc.data();
-
-            let winnerUid = lbdata.board[0].uid;
-            await db
-              .collection("users")
-              .doc(winnerUid)
-              .get()
-              .then(async (userDoc) => {
-                let userData = userDoc.data();
-                let lbwins = userData.dailyLbWins;
-
-                let lbname = lbdata.mode + lbdata.mode2;
-
-                if (lbwins === undefined) {
-                  //first win ever
-                  lbwins = {
-                    [lbname]: 1,
-                  };
-                } else {
-                  //object already exists
-                  if (lbwins[lbname] === undefined) {
-                    lbwins[lbname] = 1;
-                  } else {
-                    lbwins[lbname] = lbwins[lbname] + 1;
-                  }
-                }
-                await db.collection("users").doc(winnerUid).update({
-                  dailyLbWins: lbwins,
-                });
-              });
-
-            announceDailyLbResult(lbdata);
-            t = new Date();
-            // db.collection("leaderboards_history")
-            //   .doc(
-            //     `${t.getUTCDate()}_${t.getUTCMonth()}_${t.getUTCFullYear()}_${
-            //       lbdata.mode
-            //     }_${lbdata.mode2}`
-            //   )
-            //   .set(lbdata);
-            db.collection("leaderboards").doc(doc.id).set(
-              {
-                board: [],
-              },
-              { merge: true }
-            );
-          }
-        });
-      return null;
-    } catch (e) {
-      console.error(`error while moving daily leaderboards to history - ${e}`);
-    }
   });
-
-async function announceLbUpdate(discordId, pos, lb, wpm, raw, acc, con) {
-  db.collection("bot-commands").add({
-    command: "sayLbUpdate",
-    arguments: [discordId, pos, lb, wpm, raw, acc, con],
-    executed: false,
-    requestTimestamp: Date.now(),
-  });
-}
-
-async function announceDailyLbResult(lbdata) {
-  db.collection("bot-commands").add({
-    command: "announceDailyLbResult",
-    arguments: [lbdata],
-    executed: false,
-    requestTimestamp: Date.now(),
-  });
-}
+*/
diff --git a/src/js/account-controller.js b/src/js/account-controller.js
index 6a3c34833..b59a59c29 100644
--- a/src/js/account-controller.js
+++ b/src/js/account-controller.js
@@ -8,7 +8,6 @@ import * as Misc from "./misc";
 import * as Settings from "./settings";
 import * as ChallengeController from "./challenge-controller";
 import Config from "./config";
-import * as CloudFunctions from "./cloud-functions";
 import * as AllTimeStats from "./all-time-stats";
 import * as DB from "./db";
 import * as TestLogic from "./test-logic";
@@ -193,11 +192,15 @@ function signUp() {
               });
               if (TestLogic.notSignedInLastResult !== null) {
                 TestLogic.setNotSignedInUid(usr.uid);
-                CloudFunctions.testCompleted({
-                  uid: usr.uid,
-                  obj: TestLogic.notSignedInLastResult,
-                });
-                DB.getSnapshot().results.push(TestLogic.notSignedInLastResult);
+                axiosInstance
+                  .post("/testCompleted", {
+                    obj: TestLogic.notSignedInLastResult,
+                  })
+                  .then(() => {
+                    DB.getSnapshot().results.push(
+                      TestLogic.notSignedInLastResult
+                    );
+                  });
               }
               UI.changePage("account");
               usr.sendEmailVerification();
diff --git a/src/js/account.js b/src/js/account.js
index 5abee9ad8..60987dc46 100644
--- a/src/js/account.js
+++ b/src/js/account.js
@@ -1,6 +1,5 @@
 import * as DB from "./db";
 import * as Misc from "./misc";
-import * as CloudFunctions from "./cloud-functions";
 import * as Notifications from "./notifications";
 import * as ResultFilters from "./result-filters";
 import * as ThemeColors from "./theme-colors";
@@ -18,6 +17,7 @@ import * as Settings from "./settings";
 import * as ThemePicker from "./theme-picker";
 import * as AllTimeStats from "./all-time-stats";
 import * as PbTables from "./pb-tables";
+import axiosInstance from "./axios-instance";
 
 export function getDataAndInit() {
   DB.initSnapshot()
@@ -27,7 +27,7 @@ export function getDataAndInit() {
       if (snap === null) {
         throw "Missing db snapshot. Client likely could not connect to the backend.";
       }
-      let user = firebase.auth().currentUser; // I think that this should be stored in cookie
+      let user = firebase.auth().currentUser;
       if (snap.name === undefined) {
         //verify username
         if (Misc.isUsernameValid(user.name)) {
@@ -49,21 +49,23 @@ export function getDataAndInit() {
             promptVal = prompt(
               "Your name is either invalid or unavailable (you also need to do this if you used Google Sign Up). Please provide a new display name (cannot be longer than 14 characters, can only contain letters, numbers, underscores, dots and dashes):"
             );
-            cdnVal = await CloudFunctions.changename({
-              uid: user.uid,
-              name: promptVal,
-            });
-            if (cdnVal.data.status === 1) {
-              alert("Name updated", 1);
-              location.reload();
-            } else if (cdnVal.data.status < 0) {
-              alert(cdnVal.data.message, 0);
-            }
+            axiosInstance
+              .post("/updateName", {
+                name: promptVal,
+              })
+              .then((cdnVal) => {
+                if (cdnVal.data.status === 1) {
+                  alert("Name updated", 1);
+                  location.reload();
+                } else if (cdnVal.data.status < 0) {
+                  alert(cdnVal.data.message, 0);
+                }
+              });
           }
         }
       }
       if (snap.refactored === false) {
-        CloudFunctions.removeSmallTests({ uid: user.uid });
+        axiosInstance.post("/removeSmallTestsAndQPB");
       }
       if (!UpdateConfig.changedBeforeDb) {
         if (Config.localStorageConfig === null) {
diff --git a/src/js/account/verification-controller.js b/src/js/account/verification-controller.js
index bba85484e..f6b42fc54 100644
--- a/src/js/account/verification-controller.js
+++ b/src/js/account/verification-controller.js
@@ -1,4 +1,3 @@
-import * as CloudFunctions from "./cloud-functions";
 import * as Notifications from "./notifications";
 import * as Settings from "./settings";
 import * as DB from "./db";
diff --git a/src/js/cloud-functions.js b/src/js/cloud-functions.js
index 957c717df..d19459062 100644
--- a/src/js/cloud-functions.js
+++ b/src/js/cloud-functions.js
@@ -1,73 +1,3 @@
-// all functions here should be changed into api calls
-//export function testCompleted = axios.post('/testCompleted', )firebase
-//  .functions()
-//  .httpsCallable("testCompleted");
-import axiosInstance from "./axios-instance";
-
-export function testCompleted(input) {
-  console.log("testCompleted");
-}
-export function addTag(input) {
-  console.log("request data here");
-}
-export function editTag(input) {
-  console.log("request data here");
-}
-export function removeTag(input) {
-  console.log("request data here");
-}
-export function updateResultTags(input) {
-  console.log("request data here");
-}
-export function saveConfig(input) {
-  console.log("request data here");
-}
-export function addPreset(input) {
-  console.log("request data here");
-}
-export function editPreset(input) {
-  console.log("request data here");
-}
-export function removePreset(input) {
-  console.log("request data here");
-}
 export function generatePairingCode(input) {
   console.log("request data here");
 }
-export function saveLbMemory(input) {
-  console.log("request data here");
-}
-export function unlinkDiscord(input) {
-  console.log("request data here");
-}
-export function verifyUser(input) {
-  console.log("request data here");
-}
-export function reserveName(input) {
-  console.log("request data here");
-}
-export function updateEmail(input) {
-  console.log("request data here");
-}
-export function namecheck(input) {
-  console.log("request data here");
-}
-export function getLeaderboard(input) {
-  console.log("request data here");
-}
-export function clearTagPb(input) {
-  console.log("request data here");
-}
-export function changename(input) {
-  console.log("request data here");
-}
-
-export function removeSmallTests(input) {
-  console.log("request data here");
-}
-export function resetPersonalBests(input) {
-  console.log("request data here");
-}
-export function checkLeaderboards(input) {
-  console.log("request data here");
-}
diff --git a/src/js/db.js b/src/js/db.js
index 26dfa2870..77672c248 100644
--- a/src/js/db.js
+++ b/src/js/db.js
@@ -48,9 +48,7 @@ export async function getUserResults() {
     return true;
   } else {
     axiosInstance
-      .get("/userResults", {
-        uid: user.uid,
-      })
+      .get("/userResults")
       .then((response) => {
         dbSnapshot.results = response.data.results;
       })
diff --git a/src/js/popups/edit-preset-popup.js b/src/js/popups/edit-preset-popup.js
index b16494ed5..a6c75926e 100644
--- a/src/js/popups/edit-preset-popup.js
+++ b/src/js/popups/edit-preset-popup.js
@@ -1,6 +1,5 @@
 import * as Loader from "./loader";
 import * as DB from "./db";
-import * as CloudFunctions from "./cloud-functions";
 import * as Notifications from "./notifications";
 import * as Settings from "./settings";
 import * as Config from "./config";
diff --git a/src/js/popups/result-tags-popup.js b/src/js/popups/result-tags-popup.js
index facaf6099..43daa948a 100644
--- a/src/js/popups/result-tags-popup.js
+++ b/src/js/popups/result-tags-popup.js
@@ -1,7 +1,7 @@
 import * as DB from "./db";
 import * as Loader from "./loader";
-import * as CloudFunctions from "./cloud-functions";
 import * as Notifications from "./notifications";
+import axiosInstance from "./axios-instance";
 
 function show() {
   if ($("#resultEditTagsPanelWrapper").hasClass("hidden")) {
@@ -85,65 +85,66 @@ $("#resultEditTagsPanel .confirmButton").click((e) => {
   });
   Loader.show();
   hide();
-  CloudFunctions.updateResultTags({
-    uid: firebase.auth().currentUser.uid,
-    tags: newtags,
-    resultid: resultid,
-  }).then((r) => {
-    Loader.hide();
-    if (r.data.resultCode === 1) {
-      Notifications.add("Tags updated.", 1, 2);
-      DB.getSnapshot().results.forEach((result) => {
-        if (result.id === resultid) {
-          result.tags = newtags;
-        }
-      });
-
-      let tagNames = "";
-
-      if (newtags.length > 0) {
-        newtags.forEach((tag) => {
-          DB.getSnapshot().tags.forEach((snaptag) => {
-            if (tag === snaptag._id) {
-              tagNames += snaptag.name + ", ";
-            }
-          });
+  axiosInstance
+    .post("/updateResultTags", {
+      tags: newtags,
+      resultid: resultid,
+    })
+    .then((r) => {
+      Loader.hide();
+      if (r.data.resultCode === 1) {
+        Notifications.add("Tags updated.", 1, 2);
+        DB.getSnapshot().results.forEach((result) => {
+          if (result.id === resultid) {
+            result.tags = newtags;
+          }
         });
-        tagNames = tagNames.substring(0, tagNames.length - 2);
-      }
 
-      let restags;
-      if (newtags === undefined) {
-        restags = "[]";
-      } else {
-        restags = JSON.stringify(newtags);
-      }
+        let tagNames = "";
+
+        if (newtags.length > 0) {
+          newtags.forEach((tag) => {
+            DB.getSnapshot().tags.forEach((snaptag) => {
+              if (tag === snaptag._id) {
+                tagNames += snaptag.name + ", ";
+              }
+            });
+          });
+          tagNames = tagNames.substring(0, tagNames.length - 2);
+        }
+
+        let restags;
+        if (newtags === undefined) {
+          restags = "[]";
+        } else {
+          restags = JSON.stringify(newtags);
+        }
 
-      $(`.pageAccount #resultEditTags[resultid='${resultid}']`).attr(
-        "tags",
-        restags
-      );
-      if (newtags.length > 0) {
-        $(`.pageAccount #resultEditTags[resultid='${resultid}']`).css(
-          "opacity",
-          1
-        );
         $(`.pageAccount #resultEditTags[resultid='${resultid}']`).attr(
-          "aria-label",
-          tagNames
+          "tags",
+          restags
         );
+        if (newtags.length > 0) {
+          $(`.pageAccount #resultEditTags[resultid='${resultid}']`).css(
+            "opacity",
+            1
+          );
+          $(`.pageAccount #resultEditTags[resultid='${resultid}']`).attr(
+            "aria-label",
+            tagNames
+          );
+        } else {
+          $(`.pageAccount #resultEditTags[resultid='${resultid}']`).css(
+            "opacity",
+            0.25
+          );
+          $(`.pageAccount #resultEditTags[resultid='${resultid}']`).attr(
+            "aria-label",
+            "no tags"
+          );
+        }
       } else {
-        $(`.pageAccount #resultEditTags[resultid='${resultid}']`).css(
-          "opacity",
-          0.25
-        );
-        $(`.pageAccount #resultEditTags[resultid='${resultid}']`).attr(
-          "aria-label",
-          "no tags"
-        );
+        Notifications.add("Error updating tags: " + r.data.message, -1);
       }
-    } else {
-      Notifications.add("Error updating tags: " + r.data.message, -1);
-    }
-  });
+    });
 });
diff --git a/src/js/ready.js b/src/js/ready.js
index c1c9ca1b2..46c9e506d 100644
--- a/src/js/ready.js
+++ b/src/js/ready.js
@@ -6,7 +6,6 @@ import * as Settings from "./settings";
 import * as RouteController from "./route-controller";
 import * as UI from "./ui";
 import * as SignOutButton from "./sign-out-button";
-import * as AccountController from "./account-controller";
 
 ManualRestart.set();
 Misc.migrateFromCookies();
@@ -59,5 +58,4 @@ $(document).ready(() => {
       }
     });
   Settings.settingsFillPromise.then(Settings.update);
-  let user = firebase.auth().currentUser;
 });
diff --git a/src/js/settings.js b/src/js/settings.js
index 3cc089831..dd29e34e8 100644
--- a/src/js/settings.js
+++ b/src/js/settings.js
@@ -8,6 +8,7 @@ import * as Notifications from "./notifications";
 import * as DB from "./db";
 import * as Loader from "./loader";
 import * as CloudFunctions from "./cloud-functions";
+import axiosInstance from "./axios-instance";
 import * as Funbox from "./funbox";
 import * as TagController from "./tag-controller";
 import * as PresetController from "./preset-controller";
@@ -674,9 +675,7 @@ $(".pageSettings .section.discordIntegration #unlinkDiscordButton").click(
   (e) => {
     if (confirm("Are you sure?")) {
       Loader.show();
-      CloudFunctions.unlinkDiscord({
-        uid: firebase.auth().currentUser.uid,
-      }).then((ret) => {
+      axiosInstance.post("/unlinkDiscord").then((ret) => {
         Loader.hide();
         console.log(ret);
         if (ret.data.status === 1) {
diff --git a/src/js/simple-popups.js b/src/js/simple-popups.js
index 98d8fecf8..db83a13e5 100644
--- a/src/js/simple-popups.js
+++ b/src/js/simple-popups.js
@@ -1,5 +1,4 @@
 import * as Loader from "./loader";
-import * as CloudFunctions from "./cloud-functions";
 import * as Notifications from "./notifications";
 import * as AccountController from "./account-controller";
 import * as DB from "./db";
@@ -152,26 +151,27 @@ list.updateEmail = new SimplePopup(
   (previousEmail, newEmail) => {
     try {
       Loader.show();
-      CloudFunctions.updateEmail({
-        uid: firebase.auth().currentUser.uid,
-        previousEmail: previousEmail,
-        newEmail: newEmail,
-      }).then((data) => {
-        Loader.hide();
-        if (data.data.resultCode === 1) {
-          Notifications.add("Email updated", 0);
-          setTimeout(() => {
-            AccountController.signOut();
-          }, 1000);
-        } else if (data.data.resultCode === -1) {
-          Notifications.add("Current email doesn't match", 0);
-        } else {
-          Notifications.add(
-            "Something went wrong: " + JSON.stringify(data.data),
-            -1
-          );
-        }
-      });
+      axiosInstance
+        .post("/updateEmail", {
+          previousEmail: previousEmail,
+          newEmail: newEmail,
+        })
+        .then((data) => {
+          Loader.hide();
+          if (data.data.resultCode === 1) {
+            Notifications.add("Email updated", 0);
+            setTimeout(() => {
+              AccountController.signOut();
+            }, 1000);
+          } else if (data.data.resultCode === -1) {
+            Notifications.add("Current email doesn't match", 0);
+          } else {
+            Notifications.add(
+              "Something went wrong: " + JSON.stringify(data.data),
+              -1
+            );
+          }
+        });
     } catch (e) {
       Notifications.add("Something went wrong: " + e, -1);
     }
@@ -189,10 +189,10 @@ list.clearTagPb = new SimplePopup(
   () => {
     let tagid = eval("this.parameters[0]");
     Loader.show();
-    CloudFunctions.clearTagPb({
-      uid: firebase.auth().currentUser.uid,
-      tagid: tagid,
-    })
+    axiosInstance
+      .post("/clearTagPb", {
+        tagid: tagid,
+      })
       .then((res) => {
         Loader.hide();
         if (res.data.resultCode === 1) {
diff --git a/src/js/test/test-leaderboards.js b/src/js/test/test-leaderboards.js
index c67e42f81..cdfe05a47 100644
--- a/src/js/test/test-leaderboards.js
+++ b/src/js/test/test-leaderboards.js
@@ -160,22 +160,8 @@ export async function check(completedEvent) {
       delete lbRes.keySpacing;
       delete lbRes.keyDuration;
       delete lbRes.chartData;
-      /*
-      CloudFunctions.checkLeaderboards({
-        // uid: completedEvent.uid,
-        token: await firebase.auth().currentUser.getIdToken(),
-        // lbMemory: DB.getSnapshot().lbMemory,
-        // emailVerified: DB.getSnapshot().emailVerified,
-        // name: DB.getSnapshot().name,
-        // banned: DB.getSnapshot().banned,
-        // verified: DB.getSnapshot().verified,
-        // discordId: DB.getSnapshot().discordId,
-        result: lbRes,
-      })
-      */
       axiosInstance
         .post("/attemptAddToLeaderboards", {
-          //user data can be retrieved from the database
           result: lbRes,
         })
         .then((data) => {
diff --git a/src/js/theme-controller.js b/src/js/theme-controller.js
index 5d727580f..208189c9b 100644
--- a/src/js/theme-controller.js
+++ b/src/js/theme-controller.js
@@ -5,7 +5,6 @@ import * as Notifications from "./notifications";
 import Config from "./config";
 import * as UI from "./ui";
 import tinycolor from "tinycolor2";
-import axiosInstance from "./axios-instance";
 
 let isPreviewingTheme = false;
 export let randomTheme = null;