chat: fix bug with video chat button not inserting link and message

Author: williamstein

src/packages/frontend/chat/actions.ts

@@ -168,13 +168,15 @@ export class ChatActions extends Actions<ChatState> {
     tag,
     noNotification,
     submitMentionsRef,
+    extraInput,
   }: {
     input?: string;
     sender_id?: string;
     reply_to?: Date;
     tag?: string;
     noNotification?: boolean;
     submitMentionsRef?;
+    extraInput?: string;
   }): string => {
     if (this.syncdb == null || this.store == null) {
       console.warn("attempt to sendChat before chat actions initialized");
@@ -186,6 +188,9 @@ export class ChatActions extends Actions<ChatState> {
     if (submitMentionsRef?.current != null) {
       input = submitMentionsRef.current?.({ chat: `${time_stamp.valueOf()}` });
     }
+    if (extraInput) {
+      input = (input ?? "") + extraInput;
+    }
     input = input?.trim();
     if (!input) {
       // do not send when there is nothing to send.

src/packages/frontend/chat/chatroom.tsx

@@ -724,15 +724,22 @@ export function ChatPanel({
     );
   }
 
-  function sendMessage(replyToOverride?: Date | null): void {
+  function sendMessage(
+    replyToOverride?: Date | null,
+    extraInput?: string,
+  ): void {
     const reply_to =
       replyToOverride === undefined
         ? selectedThreadDate
         : (replyToOverride ?? undefined);
     if (!reply_to) {
       setAllowAutoSelectThread(true);
     }
-    const timeStamp = actions.sendChat({ submitMentionsRef, reply_to });
+    const timeStamp = actions.sendChat({
+      submitMentionsRef,
+      reply_to,
+      extraInput,
+    });
     if (!reply_to && timeStamp) {
       setSelectedThreadKey(timeStamp);
       setTimeout(() => {
@@ -918,7 +925,14 @@ export function ChatPanel({
           <Button
             style={{ height: "47.5px" }}
             onClick={() => {
-              actions?.frameTreeActions?.getVideoChat().startChatting();
+              const message = actions?.frameTreeActions
+                ?.getVideoChat()
+                .startChatting(actions);
+              if (!message) {
+                return;
+              }
+              console.log("start video chat returned", { message });
+              sendMessage(undefined, "\n\n" + message);
             }}
           >
             <Icon name="video-camera" /> Video

src/packages/frontend/chat/video/video-chat.ts

@@ -3,7 +3,6 @@ import { webapp_client } from "@cocalc/frontend/webapp-client";
 import { len, trunc_middle } from "@cocalc/util/misc";
 import { redux } from "@cocalc/frontend/app-framework";
 import { open_new_tab } from "../../misc/open-browser-tab";
-import { getSideChatActions } from "@cocalc/frontend/frame-editors/generic/chat";
 
 const VIDEO_CHAT_SERVER = "https://meet.jit.si";
 const VIDEO_UPDATE_INTERVAL_MS = 30 * 1000;
@@ -83,20 +82,12 @@ export class VideoChat {
     this.closeVideoChatWindow();
   };
 
-  startChatting = () => {
+  startChatting = (actions) => {
     this.openVideoChatWindow();
     redux.getActions("file_use")?.mark_file(this.project_id, this.path, "chat");
-    const sideChatActions =
-      getSideChatActions({
-        project_id: this.project_id,
-        path: this.path,
-      }) ??
-      redux.getEditorActions(this.project_id, this.path)?.getChatActions();
-    sideChatActions?.sendChat({
-      input: `[${this.getUserName()} joined Video Chat](${this.url()})`,
-    });
-    setTimeout(() => sideChatActions?.scrollToBottom(), 100);
-    setTimeout(() => sideChatActions?.scrollToBottom(), 1000);
+    setTimeout(() => actions?.scrollToBottom(), 100);
+    setTimeout(() => actions?.scrollToBottom(), 1000);
+    return `[${this.getUserName()} joined Video Chat](${this.url()})`
   };
 
   // The canonical secret chatroom id.