Merge remote-tracking branch 'origin' into prod

eye-on-surveillance · May 3, 2024 · fb4bae0 · fb4bae0
2 parents ea7ac37 + ffefbfb
commit fb4bae0
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 22 deletions.
diff --git a/packages/googlecloud/functions/getanswer/main.py b/packages/googlecloud/functions/getanswer/main.py
@@ -59,6 +59,7 @@ def update_citations(citations, card_id, processing_time_ms):
             "source_publish_date": cit["Published"],
             "source_url": cit["URL"],
             "source_page_number": cit["Page Number"],
+            "source_timestamp": cit["Video timestamp"],  # Add this line
         }
         for cit in citations
     ]

diff --git a/packages/web/components/Card/BetaCard.tsx b/packages/web/components/Card/BetaCard.tsx
@@ -131,7 +131,7 @@ const BetaCard = ({ card }: { card: ICard }) => {
         {isYouTubeURL(thumbnail?.source_url) && (
           <iframe
             id="ytplayer"
-            src={getYouTubeEmbedUrl(thumbnail?.source_url)}
+            src={getYouTubeEmbedUrl(thumbnail?.source_url, thumbnail?.source_timestamp)}
             frameBorder="0"
             className="h-64 w-full lg:h-96"
           ></iframe>

diff --git a/packages/web/components/Card/Citation.tsx b/packages/web/components/Card/Citation.tsx
@@ -1,8 +1,4 @@
-import {
-  getYouTubeEmbedUrl,
-  getYouTubeThumbnail,
-  isYouTubeURL,
-} from "@/lib/utils";
+import { getYouTubeEmbedUrl, getYouTubeThumbnail, isYouTubeURL } from "@/lib/utils";
 import moment from "moment";
 import "./Citation.css";
 
@@ -22,12 +18,12 @@ const Citation = ({
     source_url,
     source_page_number: pageNumber,
     source_publish_date: publishedAt,
+    source_timestamp: timestamp,
     score: ignore,
     ...otherMetadata
   } = originalCitation;
 
-  const isYoutube =
-    source_url && isYouTubeURL(source_url) && getYouTubeThumbnail(source_url);
+  const isYoutube = source_url && isYouTubeURL(source_url) && getYouTubeThumbnail(source_url);
   const isUrlAvailable = source_url && source_url !== "url not available";
 
   return (
@@ -37,9 +33,7 @@ const Citation = ({
       }`}
     >
       <div>
-        <p className="font-bold lg:text-lg">
-          #{index + 1}: {title}
-        </p>
+        <p className="font-bold lg:text-lg">#{index + 1}: {title}</p>
         <p className="text-black">{moment(publishedAt).fromNow()}</p>
       </div>
 
@@ -48,7 +42,7 @@ const Citation = ({
           {isYoutube ? (
             <iframe
               id="ytplayer"
-              src={getYouTubeEmbedUrl(source_url)}
+              src={getYouTubeEmbedUrl(source_url, timestamp)}
               frameBorder="0"
               className="h-64 w-full lg:h-96"
             ></iframe>
@@ -81,4 +75,4 @@ const Citation = ({
   );
 };
 
-export default Citation;
+export default Citation;
diff --git a/packages/web/components/HomeResults/QueryResult.tsx b/packages/web/components/HomeResults/QueryResult.tsx
@@ -125,7 +125,7 @@ export default function QueryResult({ card }: { card: ICard }) {
               {isYouTubeURL(thumbnail?.source_url) && (
                 <iframe
                   id="ytplayer"
-                  src={getYouTubeEmbedUrl(thumbnail?.source_url)}
+                  src={getYouTubeEmbedUrl(thumbnail?.source_url, thumbnail?.source_timestamp)}
                   frameBorder="0"
                   className="h-64 w-full lg:h-96"
                 ></iframe>

diff --git a/packages/web/lib/utils.ts b/packages/web/lib/utils.ts
@@ -26,15 +26,19 @@ export function getYouTubeThumbnail(url: string): string | undefined {
 }
 
 export function getYouTubeEmbedUrl(
-  url: string | undefined
+  url: string | undefined,
+  timestamp: string | undefined
 ): string | undefined {
   if (!url) return undefined;
+
   const videoId = url.split("v=")[1]?.split("&")[0];
-  const tParts = url.split("t=");
-  let t = "";
-  if (tParts.length > 1) {
-    t = tParts[1].split("s")[0];
-  }
   if (!videoId) return undefined;
-  return `https://www.youtube.com/embed/${videoId}?autoplay=0&start=${t}`;
-}
+
+  let startTime = 0;
+  if (timestamp) {
+    const [minutes, seconds] = timestamp.split(":").map(Number);
+    startTime = minutes * 60 + seconds;
+  }
+
+  return `https://www.youtube.com/embed/${videoId}?autoplay=0&start=${startTime}`;
+}