From 40baad4a4f8b96637df5c2f0cb3c9c9e862f4b82 Mon Sep 17 00:00:00 2001
From: Nicolas Mowen <nickmowen213@gmail.com>
Date: Mon, 4 Mar 2024 14:25:53 -0700
Subject: [PATCH] Get working

---
 web/src/components/timeline/MotionSegment.tsx |  5 ++---
 web/src/hooks/use-motion-segment-utils.ts     | 16 ++++++++--------
 web/src/views/events/EventView.tsx            |  6 +++++-
 3 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/web/src/components/timeline/MotionSegment.tsx b/web/src/components/timeline/MotionSegment.tsx
index fc184e3d1..070b66857 100644
--- a/web/src/components/timeline/MotionSegment.tsx
+++ b/web/src/components/timeline/MotionSegment.tsx
@@ -1,6 +1,6 @@
 import { useEventUtils } from "@/hooks/use-event-utils";
 import { useEventSegmentUtils } from "@/hooks/use-event-segment-utils";
-import { ReviewSegment } from "@/types/review";
+import { MotionData, ReviewSegment } from "@/types/review";
 import React, {
   RefObject,
   useCallback,
@@ -10,13 +10,12 @@ import React, {
 } from "react";
 import scrollIntoView from "scroll-into-view-if-needed";
 import { MinimapBounds, Tick, Timestamp } from "./segment-metadata";
-import { MockMotionData } from "@/pages/UIPlayground";
 import { useMotionSegmentUtils } from "@/hooks/use-motion-segment-utils";
 import { isMobile } from "react-device-detect";
 
 type MotionSegmentProps = {
   events: ReviewSegment[];
-  motion_events: MockMotionData[];
+  motion_events: MotionData[];
   segmentTime: number;
   segmentDuration: number;
   timestampSpread: number;
diff --git a/web/src/hooks/use-motion-segment-utils.ts b/web/src/hooks/use-motion-segment-utils.ts
index 3ec5ee122..5942750ef 100644
--- a/web/src/hooks/use-motion-segment-utils.ts
+++ b/web/src/hooks/use-motion-segment-utils.ts
@@ -1,9 +1,9 @@
 import { useCallback, useMemo } from "react";
-import { MockMotionData } from "@/pages/UIPlayground";
+import { MotionData } from "@/types/review";
 
 export const useMotionSegmentUtils = (
   segmentDuration: number,
-  motion_events: MockMotionData[],
+  motion_events: MotionData[],
 ) => {
   const halfSegmentDuration = useMemo(
     () => segmentDuration / 2,
@@ -42,12 +42,12 @@ export const useMotionSegmentUtils = (
     (time: number): number => {
       const matchingEvent = motion_events.find((event) => {
         return (
-          time >= getSegmentStart(event.start_time) &&
-          time < getSegmentEnd(event.start_time)
+          time > getSegmentStart(event.start_time) &&
+          time <= getSegmentEnd(event.start_time)
         );
       });
 
-      return matchingEvent?.motionValue ?? 0;
+      return matchingEvent?.motion ?? 0;
     },
     [motion_events, getSegmentStart, getSegmentEnd],
   );
@@ -56,12 +56,12 @@ export const useMotionSegmentUtils = (
     (time: number): number => {
       const matchingEvent = motion_events.find((event) => {
         return (
-          time >= getSegmentStart(event.start_time) &&
-          time < getSegmentEnd(event.start_time)
+          time > getSegmentStart(event.start_time) &&
+          time <= getSegmentEnd(event.start_time)
         );
       });
 
-      return matchingEvent?.audioValue ?? 0;
+      return matchingEvent?.audio ?? 0;
     },
     [motion_events, getSegmentStart, getSegmentEnd],
   );
diff --git a/web/src/views/events/EventView.tsx b/web/src/views/events/EventView.tsx
index 96d6403c4..b5cb1c176 100644
--- a/web/src/views/events/EventView.tsx
+++ b/web/src/views/events/EventView.tsx
@@ -567,7 +567,11 @@ function MotionReview({
 
   const { data: motionData } = useSWR<MotionData[]>([
     "review/activity",
-    { before: timeRange.before, after: timeRange.after },
+    {
+      before: timeRange.before,
+      after: timeRange.after,
+      scale: segmentDuration / 2,
+    },
   ]);
 
   // timeline time