Add version to console, rageshake, and settings modal

Prevent scroll in call view
Add protocol to copied room url
2022-02-16 11:29:43 -08:00 · 2022-02-16 11:17:33 -08:00 · 2022-02-16 10:52:07 -08:00
7 changed files with 21 additions and 4 deletions
--- a/scripts/dockerbuild.sh
+++ b/scripts/dockerbuild.sh
@@ -24,6 +24,9 @@ yarn link
 cd ..

 cd matrix-video-chat
+
+export VITE_APP_VERSION=$(git describe --tags --abbrev=0)
+
 yarn link matrix-js-sdk
 yarn link matrix-react-sdk
 yarn install
--- a/src/main.jsx
+++ b/src/main.jsx
@@ -27,6 +27,8 @@ import { InspectorContextProvider } from "./room/GroupCallInspector";

 rageshake.init();

+console.info(`matrix-video-chat ${import.meta.env.VITE_APP_VERSION || "dev"}`);
+
 if (import.meta.env.VITE_CUSTOM_THEME) {
  const style = document.documentElement.style;
  style.setProperty("--primaryColor", import.meta.env.VITE_PRIMARY_COLOR);
--- a/src/matrix-utils.js
+++ b/src/matrix-utils.js
@@ -120,12 +120,12 @@ export function getRoomUrl(roomId) {
    const [localPart, host] = roomId.replace("#", "").split(":");

    if (host !== defaultHomeserverHost) {
-      return `${window.location.host}/room/${roomId}`;
+      return `${window.location.protocol}//${window.location.host}/room/${roomId}`;
    } else {
-      return `${window.location.host}/${localPart}`;
+      return `${window.location.protocol}//${window.location.host}/${localPart}`;
    }
  } else {
-    return `${window.location.host}/room/${roomId}`;
+    return `${window.location.protocol}//${window.location.host}/room/${roomId}`;
  }
 }

--- a/src/room/InCallView.jsx
+++ b/src/room/InCallView.jsx
@@ -21,6 +21,7 @@ import { Avatar } from "../Avatar";
 import { UserMenuContainer } from "../UserMenuContainer";
 import { useRageshakeRequestModal } from "../settings/rageshake";
 import { RageshakeRequestModal } from "./RageshakeRequestModal";
+import { usePreventScroll } from "@react-aria/overlays";

 const canScreenshare = "getDisplayMedia" in navigator.mediaDevices;
 // There is currently a bug in Safari our our code with cloning and sending MediaStreams
@@ -47,6 +48,7 @@ export function InCallView({
  showInspector,
  roomId,
 }) {
+  usePreventScroll();
  const [layout, setLayout] = useVideoGridLayout(screenshareFeeds.length > 0);

  const items = useMemo(() => {
--- a/src/settings/SettingsModal.jsx
+++ b/src/settings/SettingsModal.jsx
@@ -11,6 +11,7 @@ import { useMediaHandler } from "./useMediaHandler";
 import { FieldRow, InputField } from "../input/Input";
 import { Button } from "../button";
 import { useDownloadDebugLog } from "./rageshake";
+import { Body } from "../typography/Typography";

 export function SettingsModal({
  client,
@@ -82,6 +83,11 @@ export function SettingsModal({
            </>
          }
        >
+          <FieldRow>
+            <Body className={styles.fieldRowText}>
+              Version: {import.meta.env.VITE_APP_VERSION || "dev"}
+            </Body>
+          </FieldRow>
          <FieldRow>
            <InputField
              id="showInspector"
--- a/src/settings/SettingsModal.module.css
+++ b/src/settings/SettingsModal.module.css
@@ -6,3 +6,7 @@
 .tabContainer {
  margin: 27px 16px;
 }
+
+.fieldRowText {
+  margin-bottom: 0;
+}
--- a/src/settings/rageshake.js
+++ b/src/settings/rageshake.js
@@ -41,7 +41,7 @@ export function useSubmitRageshake() {
          opts.description || "User did not supply any additional text."
        );
        body.append("app", "matrix-video-chat");
-        body.append("version", "dev");
+        body.append("version", import.meta.env.VITE_APP_VERSION || "dev");
        body.append("user_agent", userAgent);
        body.append("installed_pwa", false);
        body.append("touch_input", touchInput);
Author	SHA1	Message	Date
Robert Long	9fc4af2bd7	Add version to console, rageshake, and settings modal	2022-02-16 11:29:43 -08:00
Robert Long	0f3a7f9fd9	Prevent scroll in call view	2022-02-16 11:17:33 -08:00
Robert Long	1cc634509b	Add protocol to copied room url	2022-02-16 10:52:07 -08:00