[pull] master from monkeytypegame:master

backend/src/api/controllers/result.ts

@@ -43,7 +43,6 @@ import {
   GetResultsResponse,
   UpdateResultTagsRequest,
   UpdateResultTagsResponse,
-  ReportCompletedEventMismatchRequest,
 } from "@monkeytype/contracts/results";
 import {
   CompletedEvent,
@@ -185,48 +184,6 @@ export async function updateTags(
   });
 }
 
-export async function reportCompletedEventMismatch(
-  req: MonkeyRequest<undefined, ReportCompletedEventMismatchRequest>,
-): Promise<MonkeyResponse> {
-  const { uid } = req.ctx.decodedToken;
-  const {
-    notMatching,
-    mismatchedKeys,
-    groupKey,
-    language,
-    mode,
-    mode2,
-    difficulty,
-    duration,
-    funboxes,
-    version,
-    eventLog,
-  } = req.body;
-  // Logger.warning(
-  //   `Completed event mismatch for uid ${uid}: ${notMatching.join(", ")}`,
-  // );
-  // Logger.warning(`Old CE: ${JSON.stringify(ce)}`);
-  // Logger.warning(`New CE: ${JSON.stringify(ce2)}`);
-  void addLog(
-    "completed_event_mismatch",
-    {
-      notMatching,
-      mismatchedKeys,
-      groupKey,
-      language,
-      mode,
-      mode2,
-      difficulty,
-      duration,
-      funboxes,
-      version,
-      eventLog,
-    },
-    uid,
-  );
-  return new MonkeyResponse("Mismatch reported", null);
-}
-
 export async function addResult(
   req: MonkeyRequest<undefined, AddResultRequest>,
 ): Promise<AddResultResponse> {

backend/src/api/routes/results.ts

@@ -17,10 +17,6 @@ export default s.router(resultsContract, {
   updateTags: {
     handler: async (r) => callController(ResultController.updateTags)(r),
   },
-  reportCompletedEventMismatch: {
-    handler: async (r) =>
-      callController(ResultController.reportCompletedEventMismatch)(r),
-  },
   deleteAll: {
     handler: async (r) => callController(ResultController.deleteAll)(r),
   },

frontend/__tests__/test/events/data.spec.ts

@@ -57,7 +57,7 @@ function timerData(
   if (event === "step") {
     return { event, timer, drift: 0 };
   }
-  return { event, timer };
+  return { event, timer, date: 0 };
 }
 
 describe("data.ts", () => {
@@ -285,18 +285,8 @@ describe("data.ts", () => {
       logTestEvent("input", 1010, inputData({ wordIndex: 0, charIndex: 0 }));
       logTestEvent("input", 1100, inputData({ wordIndex: 0, charIndex: 1 }));
 
-      const perWord = getEventsPerWord(getAllTestEvents(), undefined, 50);
-      expect(perWord.get(0)).toHaveLength(1);
-    });
-
-    it("respects startMs", () => {
-      logTestEvent("input", 1010, inputData({ wordIndex: 0, charIndex: 0 }));
-      logTestEvent("input", 1100, inputData({ wordIndex: 0, charIndex: 1 }));
-
       const perWord = getEventsPerWord(getAllTestEvents(), 50);
       expect(perWord.get(0)).toHaveLength(1);
-      const first = perWord.get(0)?.[0];
-      expect(first?.type === "input" && first.data.charIndex).toBe(1);
     });
   });