fix(chat): every second video has not been displayed

goooseman · Jun 16, 2020 · 390f1fa · 390f1fa
1 parent 0763403
commit 390f1fa
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/src/pages/Chat/components/ChatMessage/ChatMessage.container.spec.tsx b/src/pages/Chat/components/ChatMessage/ChatMessage.container.spec.tsx
@@ -158,4 +158,16 @@ describe("Youtube", () => {
     );
     expect(await findByLabelText("Youtube player")).toBeInTheDocument();
   });
+
+  it("should show youtube video for two messages in a row", async () => {
+    const textWithYoutube =
+      "Watch it: https://www.youtube.com/watch?v=BMUiFMZr7vk!";
+    const { findAllByLabelText } = render(
+      <>
+        <ChatMessageContainer {...defaultMessage} text={textWithYoutube} />
+        <ChatMessageContainer {...defaultMessage} text={textWithYoutube} />
+      </>
+    );
+    expect(await findAllByLabelText("Youtube player")).toHaveLength(2);
+  });
 });
diff --git a/src/pages/Chat/components/ChatMessage/ChatMessage.container.tsx b/src/pages/Chat/components/ChatMessage/ChatMessage.container.tsx
@@ -14,7 +14,7 @@ interface ChatMessageContainerState {
 const linkRegexp = /(https?:\/\/[\w-\.\/\:\?\=\&]+)/gi;
 const imageContentTypeRegexp = /^image\//;
 // https://gist.github.com/afeld/1254889
-const youtubeIdRegexp = /(youtu\.be\/|youtube\.com\/(watch\?(.*&)?v=|(embed|v)\/))([^\?&"'>]+)/g;
+const youtubeIdRegexp = /(youtu\.be\/|youtube\.com\/(watch\?(.*&)?v=|(embed|v)\/))([^\?&"'>]+)/;
 
 class ChatMessageContainer extends PureComponent<
   ChatMessageContainerProps,
@@ -91,7 +91,7 @@ class ChatMessageContainer extends PureComponent<
   };
 
   private getYoutubeId = (link: string): string | undefined => {
-    const match = youtubeIdRegexp.exec(link);
+    const match = link.match(youtubeIdRegexp);
     return match ? match[5] : undefined;
   };