Merge branch 'livekit' into layout-state

This commit is contained in:
Robin 2024-04-19 13:28:30 -04:00
commit bfb26ca500
47 changed files with 852 additions and 801 deletions

View File

@ -1,34 +1,25 @@
name: Build
on:
pull_request: {}
pull_request:
types:
- synchronize
- opened
- labeled
paths-ignore:
- ".github/**"
- "docs/**"
push:
branches: [livekit, full-mesh]
paths-ignore:
- ".github/**"
- "docs/**"
jobs:
build:
name: Build
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v4
- name: Yarn cache
uses: actions/setup-node@v4
with:
cache: "yarn"
- name: Install dependencies
run: "yarn install"
- name: Build
run: "yarn run build"
env:
SENTRY_ORG: ${{ secrets.SENTRY_ORG }}
SENTRY_PROJECT: ${{ secrets.SENTRY_PROJECT }}
SENTRY_URL: ${{ secrets.SENTRY_URL }}
SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
VITE_APP_VERSION: ${{ github.sha }}
NODE_OPTIONS: "--max-old-space-size=4096"
- name: Upload Artifact
uses: actions/upload-artifact@v4
with:
name: build
path: dist
# We'll only use this in a triggered job, then we're done with it
retention-days: 1
build_element_call:
uses: ./.github/workflows/element-call.yaml
with:
vite_app_version: ${{ github.event.release.tag_name || github.sha }}
secrets:
SENTRY_ORG: ${{ secrets.SENTRY_ORG }}
SENTRY_PROJECT: ${{ secrets.SENTRY_PROJECT }}
SENTRY_URL: ${{ secrets.SENTRY_URL }}
SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}

56
.github/workflows/docker.yaml vendored Normal file
View File

@ -0,0 +1,56 @@
name: Docker - Deploy
on:
workflow_call:
inputs:
docker_tags:
required: true
type: string
env:
REGISTRY: ghcr.io
IMAGE_NAME: ${{ github.repository }}
jobs:
build_and_deploy:
name: Build & publish docker
runs-on: ubuntu-latest
permissions:
contents: write # required to upload release asset
packages: write
steps:
- name: Check it out
uses: actions/checkout@v4
- name: 📥 Download artifact
uses: actions/download-artifact@v4
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
run-id: ${{ github.event.workflow_run.id }}
name: build-output
path: dist
- name: Log in to container registry
uses: docker/login-action@5f4866a30a54f16a52d2ecb4a3898e9e424939cf
with:
registry: ${{ env.REGISTRY }}
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}
- name: Extract metadata (tags, labels) for Docker
id: meta
uses: docker/metadata-action@1294d94f8ee362ab42b6da04c35f4cd03a0e6af7
with:
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
tags: ${{ inputs.docker_tags}}
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@a530e948adbeb357dbca95a7f8845d385edf4438
- name: Build and push Docker image
uses: docker/build-push-action@7e6f77677b7892794c8852c6e3773c3e9bc3129a
with:
context: .
platforms: linux/amd64,linux/arm64
push: true
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}

46
.github/workflows/element-call.yaml vendored Normal file
View File

@ -0,0 +1,46 @@
name: Element Call - Build
on:
workflow_call:
inputs:
vite_app_version:
required: true
type: string
secrets:
SENTRY_ORG:
required: true
SENTRY_PROJECT:
required: true
SENTRY_URL:
required: true
SENTRY_AUTH_TOKEN:
required: true
jobs:
build:
name: Build Element Call
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v4
- name: Yarn cache
uses: actions/setup-node@v4
with:
cache: "yarn"
- name: Install dependencies
run: "yarn install"
- name: Build
run: "yarn run build"
env:
SENTRY_ORG: ${{ secrets.SENTRY_ORG }}
SENTRY_PROJECT: ${{ secrets.SENTRY_PROJECT }}
SENTRY_URL: ${{ secrets.SENTRY_URL }}
SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
VITE_APP_VERSION: ${{ inputs.vite_app_version }}
NODE_OPTIONS: "--max-old-space-size=4096"
- name: Upload Artifact
uses: actions/upload-artifact@v4
with:
name: build-output
path: dist
# We'll only use this in a triggered job, then we're done with it
retention-days: 1

View File

@ -1,15 +1,29 @@
name: Netlify PR Preview
name: Netlify - Deploy
on:
workflow_run:
workflows: ["Build"]
types:
- completed
branches-ignore:
- "main"
- "livekit"
workflow_call:
inputs:
pr_number:
required: true
type: string
pr_head_full_name:
required: true
type: string
pr_head_ref:
required: true
type: string
deployment_ref:
required: true
type: string
secrets:
ELEMENT_BOT_TOKEN:
required: true
NETLIFY_AUTH_TOKEN:
required: true
NETLIFY_SITE_ID:
required: true
jobs:
deploy:
if: github.event.workflow_run.conclusion == 'success' && github.event.workflow_run.event == 'pull_request'
runs-on: ubuntu-latest
permissions:
deployments: write
@ -22,24 +36,17 @@ jobs:
step: start
token: ${{ secrets.GITHUB_TOKEN }}
env: Netlify
ref: ${{ github.event.workflow_run.head_sha }}
ref: ${{ inputs.deployment_ref }}
desc: |
Do you trust the author of this PR? Maybe this build will steal your keys or give you malware.
Exercise caution. Use test accounts.
- id: prdetails
uses: matrix-org/pr-details-action@v1.3
with:
owner: ${{ github.event.workflow_run.head_repository.owner.login }}
branch: ${{ github.event.workflow_run.head_branch }}
# There's a 'download artifact' action, but it hasn't been updated for the workflow_run action
# (https://github.com/actions/download-artifact/issues/60) so instead we get this mess:
- name: 📥 Download artifact
uses: dawidd6/action-download-artifact@v3
uses: actions/download-artifact@v4
with:
run_id: ${{ github.event.workflow_run.id }}
name: build
github-token: ${{ secrets.ELEMENT_BOT_TOKEN }}
run-id: ${{ github.event.workflow_run.id }}
name: build-output
path: webapp
- name: Add redirects file
@ -47,18 +54,15 @@ jobs:
run: curl -s https://raw.githubusercontent.com/element-hq/element-call/main/config/netlify_redirects > webapp/_redirects
- name: Add config file
run: curl -s "https://raw.githubusercontent.com/${{ github.event.workflow_run.head_repository.full_name }}/${{ github.event.workflow_run.head_branch }}/config/element_io_preview.json" > webapp/config.json
run: curl -s "https://raw.githubusercontent.com/${{ inputs.pr_head_full_name }}/${{ inputs.pr_head_ref }}/config/element_io_preview.json" > webapp/config.json
- name: ☁️ Deploy to Netlify
id: netlify
uses: nwtgck/actions-netlify@v2.1
uses: nwtgck/actions-netlify@v3.0
with:
publish-dir: webapp
deploy-message: "Deploy from GitHub Actions"
# These don't work because we're in workflow_run
enable-pull-request-comment: false
enable-commit-comment: false
alias: pr${{ steps.prdetails.outputs.pr_id }}
alias: pr${{ inputs.pr_number }}
env:
NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }}
NETLIFY_SITE_ID: ${{ secrets.NETLIFY_SITE_ID }}

48
.github/workflows/pr-deploy.yaml vendored Normal file
View File

@ -0,0 +1,48 @@
name: PR Preview Deployments
on:
workflow_run:
workflows: ["Build"]
types:
- completed
jobs:
prdetails:
if: ${{ github.event.workflow_run.conclusion == 'success' && github.event.workflow_run.event == 'pull_request' }}
runs-on: ubuntu-latest
outputs:
pr_number: ${{ steps.prdetails.outputs.pr_id }}
pr_data_json: ${{ steps.prdetails.outputs.data }}
steps:
- id: prdetails
uses: matrix-org/pr-details-action@v1.3
continue-on-error: true
with:
owner: ${{ github.event.workflow_run.head_repository.owner.login }}
branch: ${{ github.event.workflow_run.head_branch }}
netlify:
needs: prdetails
permissions:
deployments: write
uses: ./.github/workflows/netlify.yaml
with:
pr_number: ${{ needs.prdetails.outputs.pr_number }}
pr_head_full_name: ${{ github.event.workflow_run.head_repository.full_name }}
pr_head_ref: ${{ needs.prdetails.outputs.pr_data_json && fromJSON(needs.prdetails.outputs.pr_data_json).head.ref }}
deployment_ref: ${{ needs.prdetails.outputs.pr_data_json && fromJSON(needs.prdetails.outputs.pr_data_json).head.sha || github.ref || github.head_ref }}
secrets:
ELEMENT_BOT_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}
NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }}
NETLIFY_SITE_ID: ${{ secrets.NETLIFY_SITE_ID }}
docker:
if: ${{ needs.prdetails.outputs.pr_data_json && contains(fromJSON(needs.prdetails.outputs.pr_data_json).labels.*.name, 'docker build') }}
needs: prdetails
permissions:
contents: write
packages: write
uses: ./.github/workflows/docker.yaml
with:
docker_tags: |
type=sha,format=short,event=branch
type=raw,value=pr_${{ needs.prdetails.outputs.pr_number }}

View File

@ -3,17 +3,32 @@ name: Build & publish images to the package registry for tags
on:
release:
types: [published]
push:
workflow_run:
workflows: ["Build"]
branches: [livekit]
types:
- completed
env:
REGISTRY: ghcr.io
IMAGE_NAME: ${{ github.repository }}
jobs:
build:
name: Build & publish
build_element_call:
if: ${{ github.event.workflow_run.event == 'release' }}
uses: ./.github/workflows/element-call.yaml
with:
vite_app_version: ${{ github.event.release.tag_name || github.sha }}
secrets:
SENTRY_ORG: ${{ secrets.SENTRY_ORG }}
SENTRY_PROJECT: ${{ secrets.SENTRY_PROJECT }}
SENTRY_URL: ${{ secrets.SENTRY_URL }}
SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
publish_tarball:
name: Publish tarball
runs-on: ubuntu-latest
outputs:
unix_time: ${{steps.current-time.outputs.unix_time}}
permissions:
contents: write # required to upload release asset
packages: write
@ -21,64 +36,33 @@ jobs:
- name: Get current time
id: current-time
run: echo "unix_time=$(date +'%s')" >> $GITHUB_OUTPUT
- name: Check it out
uses: actions/checkout@v4
- name: Log in to container registry
uses: docker/login-action@83a00bc1ab5ded6580f31df1c49e6aaa932d840d
- name: 📥 Download artifact
uses: actions/download-artifact@v4
with:
registry: ${{ env.REGISTRY }}
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}
- name: Yarn cache
uses: actions/setup-node@v4
with:
cache: "yarn"
- name: Install dependencies
run: "yarn install"
- name: Build
run: "yarn run build"
env:
SENTRY_ORG: ${{ secrets.SENTRY_ORG }}
SENTRY_PROJECT: ${{ secrets.SENTRY_PROJECT }}
SENTRY_URL: ${{ secrets.SENTRY_URL }}
SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
VITE_APP_VERSION: ${{ github.event.release.tag_name || github.sha }}
github-token: ${{ secrets.GITHUB_TOKEN }}
run-id: ${{ github.event.workflow_run.id }}
name: build-output
path: dist
- name: Create Tarball
env:
TARBALL_VERSION: ${{ github.event.release.tag_name || github.sha }}
run: |
tar --numeric-owner --transform "s/dist/element-call-${TARBALL_VERSION}/" -cvzf element-call-${TARBALL_VERSION}.tar.gz dist
- name: Upload
uses: actions/upload-artifact@ef09cdac3e2d3e60d8ccadda691f4f1cec5035cb
uses: actions/upload-artifact@b06cde36fc32a3ee94080e87258567f73f921537
env:
GITHUB_TOKEN: ${{ github.token }}
with:
path: "./element-call-*.tar.gz"
- name: Extract metadata (tags, labels) for Docker
id: meta
uses: docker/metadata-action@8e5442c4ef9f78752691e2d8f8d19755c6f78e81
with:
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
tags: |
type=sha,format=short,event=branch
type=semver,pattern=v{{version}}
type=raw,value=latest-ci,enable={{is_default_branch}}
type=raw,value=latest-ci_${{steps.current-time.outputs.unix_time}},enable={{is_default_branch}}
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@edfb0fe6204400c56fbfd3feba3fe9ad1adfa345
- name: Build and push Docker image
uses: docker/build-push-action@4976231911ebf5f32aad765192d35f942aa48cb8
with:
context: .
platforms: linux/amd64,linux/arm64
push: true
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
publish_docker:
needs: publish_tarball
permissions:
contents: write
packages: write
uses: ./.github/workflows/docker.yaml
with:
docker_tags: |
type=sha,format=short,event=branch
type=semver,pattern=v{{version}}
type=raw,value=latest-ci,enable={{is_default_branch}}
type=raw,value=latest-ci_${{needs.publish_tarball.outputs.unix_time}},enable={{is_default_branch}}

View File

@ -38,7 +38,7 @@ jobs:
- name: Create Pull Request
id: cpr
uses: peter-evans/create-pull-request@v6.0.0
uses: peter-evans/create-pull-request@v6.0.3
with:
token: ${{ secrets.ELEMENT_BOT_TOKEN }}
branch: actions/localazy-download

View File

@ -3,6 +3,8 @@ on:
push:
branches:
- livekit
paths-ignore:
- ".github/**"
jobs:
upload:

View File

@ -22,5 +22,3 @@ turn:
external_tls: true
keys:
devkey: secret
signal_relay:
enabled: true

30
config/httpd.conf Normal file
View File

@ -0,0 +1,30 @@
<VirtualHost *:8080>
ServerName localhost
DocumentRoot "/app"
<Location "/">
# disable cache entriely by default (apart from Etag which is accurate enough)
Header add Cache-Control "private no-store, no-cache, must-revalidate, proxy-revalidate, max-age=0"
CacheDisable on
ExpiresActive off
# also turn off last-modified since they are just the timestamps of the file in the docker image
# and may or may not bear any resemblance to when the resource changed
Header add Last-Modified ""
DirectoryIndex index.html
</Location>
# assets can be cached because they have hashed filenames
<Location "/assets">
ExpiresActive on
ExpiresDefault "access plus 1 week"
Header add Cache-Control "public, no-transform"
</Location>
<Location "/apple-app-site-association">
ForceType application/json
</Location>
</VirtualHost>

View File

@ -19,15 +19,15 @@
},
"dependencies": {
"@juggle/resize-observer": "^3.3.1",
"@livekit/components-core": "^0.9.0",
"@livekit/components-core": "^0.10.0",
"@livekit/components-react": "^2.0.0",
"@matrix-org/olm": "https://gitlab.matrix.org/api/v4/projects/27/packages/npm/@matrix-org/olm/-/@matrix-org/olm-3.2.14.tgz",
"@opentelemetry/api": "^1.4.0",
"@opentelemetry/context-zone": "^1.9.1",
"@opentelemetry/exporter-jaeger": "^1.9.1",
"@opentelemetry/exporter-trace-otlp-http": "^0.48.0",
"@opentelemetry/instrumentation-document-load": "^0.35.0",
"@opentelemetry/instrumentation-user-interaction": "^0.35.0",
"@opentelemetry/instrumentation-document-load": "^0.36.0",
"@opentelemetry/instrumentation-user-interaction": "^0.36.0",
"@opentelemetry/sdk-trace-web": "^1.9.1",
"@radix-ui/react-dialog": "^1.0.4",
"@radix-ui/react-slider": "^1.1.2",
@ -62,7 +62,7 @@
"i18next-http-backend": "^2.0.0",
"livekit-client": "^2.0.2",
"lodash": "^4.17.21",
"matrix-js-sdk": "github:matrix-org/matrix-js-sdk#8123e9a3f1142a7619758c0a238172b007e3a06a",
"matrix-js-sdk": "github:matrix-org/matrix-js-sdk#d55c6a36df539f6adacc335efe5b9be27c9cee4a",
"matrix-widget-api": "^1.3.1",
"normalize.css": "^8.0.1",
"pako": "^2.0.4",

View File

@ -13,7 +13,8 @@
</script>
</head>
<body class="cpd-theme-dark">
<!-- The default class is: .no-theme {display: none}. It will be overwritten once the app is loaded. -->
<body class="no-theme">
<div id="root"></div>
</body>
</html>

View File

@ -31,8 +31,6 @@
"username": "Потребителско име",
"video": "Видео"
},
"exit_fullscreen_button_label": "Излез от цял екран",
"fullscreen_button_label": "Цял екран",
"join_existing_call_modal": {
"join_button": "Да, присъедини се",
"text": "Този разговор вече съществува, искате ли да се присъедините?",
@ -42,7 +40,6 @@
"lobby": {
"join_button": "Влез в разговора"
},
"local_volume_label": "Локална сила на звука",
"logging_in": "Влизане…",
"login_auth_links": "<0>Създайте акаунт</0> или <2>Влезте като гост</2>",
"login_title": "Влез",

View File

@ -29,10 +29,8 @@
"settings": "Nastavení",
"username": "Uživatelské jméno"
},
"exit_fullscreen_button_label": "Ukončit režim celé obrazovky",
"full_screen_view_description": "<0>Odeslání ladících záznamů nám pomůže diagnostikovat problém.</0>",
"full_screen_view_h1": "<0>Oops, něco se pokazilo.</0>",
"fullscreen_button_label": "Zvětšit na celou obrazovku",
"header_label": "Domov Element Call",
"join_existing_call_modal": {
"join_button": "Ano, připojit se",
@ -43,7 +41,6 @@
"lobby": {
"join_button": "Připojit se k hovoru"
},
"local_volume_label": "Lokální hlasitost",
"logging_in": "Přihlašování se…",
"login_auth_links": "<0>Vytvořit účet</0> Or <2>Jako host</2>",
"login_title": "Přihlášení",

View File

@ -56,10 +56,8 @@
"video": "Video"
},
"disconnected_banner": "Die Verbindung zum Server wurde getrennt.",
"exit_fullscreen_button_label": "Vollbildmodus verlassen",
"full_screen_view_description": "<0>Übermittelte Problemberichte helfen uns, Fehler zu beheben.</0>",
"full_screen_view_h1": "<0>Hoppla, etwas ist schiefgelaufen.</0>",
"fullscreen_button_label": "Vollbild",
"group_call_loader_failed_heading": "Anruf nicht gefunden",
"group_call_loader_failed_text": "Anrufe sind nun Ende-zu-Ende-verschlüsselt und müssen auf der Startseite erstellt werden. Damit stellen wir sicher, dass alle denselben Schlüssel verwenden.",
"hangup_button_label": "Anruf beenden",
@ -80,7 +78,6 @@
"join_button": "Anruf beitreten",
"leave_button": "Zurück zu kürzlichen Anrufen"
},
"local_volume_label": "Lokale Lautstärke",
"log_in": "Anmelden",
"logging_in": "Anmelden …",
"login_auth_links": "<0>Konto erstellen</0> Oder <2>Als Gast betreten</2>",
@ -141,7 +138,6 @@
"unmute_microphone_button_label": "Mikrofon aktivieren",
"version": "Version: {{version}}",
"video_tile": {
"presenter_label": "{{displayName}} präsentiert",
"sfu_participant_local": "Du"
},
"waiting_for_participants": "Warte auf weitere Teilnehmer …"

View File

@ -37,10 +37,8 @@
"username": "Όνομα χρήστη",
"video": "Βίντεο"
},
"exit_fullscreen_button_label": "Έξοδος από πλήρη οθόνη",
"full_screen_view_description": "<0>Η υποβολή αρχείων καταγραφής σφαλμάτων θα μας βοηθήσει να εντοπίσουμε το πρόβλημα.</0>",
"full_screen_view_h1": "<0>Ωχ, κάτι πήγε στραβά.</0>",
"fullscreen_button_label": "Πλήρη οθόνη",
"header_label": "Element Κεντρική Οθόνη Κλήσεων",
"join_existing_call_modal": {
"join_button": "Ναι, συμμετοχή στην κλήση",
@ -50,7 +48,6 @@
"lobby": {
"join_button": "Συμμετοχή στην κλήση"
},
"local_volume_label": "Τοπική ένταση",
"logging_in": "Σύνδεση…",
"login_auth_links": "<0>Δημιουργήστε λογαριασμό</0> Ή <2>Συμμετέχετε ως επισκέπτης</2>",
"login_title": "Σύνδεση",
@ -94,8 +91,5 @@
"unauthenticated_view_body": "Δεν έχετε εγγραφεί ακόμα; <2>Δημιουργήστε λογαριασμό</2>",
"unauthenticated_view_login_button": "Συνδεθείτε στον λογαριασμό σας",
"version": "Έκδοση: {{version}}",
"video_tile": {
"presenter_label": "{{displayName}} παρουσιάζει"
},
"waiting_for_participants": "Αναμονή για άλλους συμμετέχοντες…"
}

View File

@ -34,10 +34,8 @@
"settings": "Ajustes",
"username": "Nombre de usuario"
},
"exit_fullscreen_button_label": "Salir de pantalla completa",
"full_screen_view_description": "<0>Subir los registros de depuración nos ayudará a encontrar el problema.</0>",
"full_screen_view_h1": "<0>Ups, algo ha salido mal.</0>",
"fullscreen_button_label": "Pantalla completa",
"header_label": "Inicio de Element Call",
"join_existing_call_modal": {
"join_button": "Si, unirse a la llamada",
@ -48,7 +46,6 @@
"lobby": {
"join_button": "Unirse a la llamada"
},
"local_volume_label": "Volumen local",
"logging_in": "Iniciando sesión…",
"login_auth_links": "<0>Crear una cuenta</0> o <2>Acceder como invitado</2>",
"login_title": "Iniciar sesión",
@ -95,8 +92,5 @@
"unauthenticated_view_eula_caption": "Al hacer clic en \"Comenzar\", aceptas nuestro <2>Contrato de Licencia de Usuario Final (CLUF)</2>",
"unauthenticated_view_login_button": "Iniciar sesión en tu cuenta",
"version": "Versión: {{version}}",
"video_tile": {
"presenter_label": "{{displayName}} está presentando"
},
"waiting_for_participants": "Esperando a los otros participantes…"
}

View File

@ -52,10 +52,8 @@
"username": "Kasutajanimi"
},
"disconnected_banner": "Võrguühendus serveriga on katkenud.",
"exit_fullscreen_button_label": "Välju täisekraanivaatest",
"full_screen_view_description": "<0>Kui saadad meile vealogid, siis on lihtsam vea põhjust otsida.</0>",
"full_screen_view_h1": "<0>Ohoo, midagi on nüüd katki.</0>",
"fullscreen_button_label": "Täisekraan",
"group_call_loader_failed_heading": "Kõnet ei leidu",
"group_call_loader_failed_text": "Kõned on nüüd läbivalt krüptitud ning need pead looma kodulehelt. Sellega tagad, et kõik kasutavad samu krüptovõtmeid.",
"hangup_button_label": "Lõpeta kõne",
@ -75,7 +73,6 @@
"join_button": "Kõnega liitumine",
"leave_button": "Tagasi hiljutiste kõnede juurde"
},
"local_volume_label": "Kohalik helitugevus",
"logging_in": "Sisselogimine …",
"login_auth_links": "<0>Loo konto</0> Või <2>Sisene külalisena</2>",
"login_title": "Sisselogimine",
@ -133,7 +130,6 @@
"unmute_microphone_button_label": "Lülita mikrofon sisse",
"version": "Versioon: {{version}}",
"video_tile": {
"presenter_label": "{{displayName}} on esitlemas",
"sfu_participant_local": "Sina"
},
"waiting_for_participants": "Ootame teiste osalejate lisandumist…"

View File

@ -32,8 +32,6 @@
"username": "نام کاربری",
"video": "ویدیو"
},
"exit_fullscreen_button_label": "خروج از حالت تمام صفحه",
"fullscreen_button_label": "تمام صحفه",
"header_label": "خانهٔ تماس المنت",
"join_existing_call_modal": {
"join_button": "بله، به تماس بپیوندید",
@ -44,7 +42,6 @@
"lobby": {
"join_button": "پیوستن به تماس"
},
"local_volume_label": "حجم داخلی",
"logging_in": "ورود…",
"login_auth_links": "<0>ساخت حساب کاربری</0> Or <2>دسترسی به عنوان میهمان</2>",
"login_title": "ورود",

View File

@ -50,10 +50,8 @@
"video": "Vidéo"
},
"disconnected_banner": "La connexion avec le serveur a été perdue.",
"exit_fullscreen_button_label": "Quitter le plein écran",
"full_screen_view_description": "<0>Soumettre les journaux de débogage nous aidera à déterminer le problème.</0>",
"full_screen_view_h1": "<0>Oups, quelque chose sest mal passé.</0>",
"fullscreen_button_label": "Plein écran",
"group_call_loader_failed_heading": "Appel non trouvé",
"group_call_loader_failed_text": "Les appels sont maintenant chiffrés de bout-en-bout et doivent être créés depuis la page daccueil. Cela permet dêtre sûr que tout le monde utilise la même clé de chiffrement.",
"hangup_button_label": "Terminer lappel",
@ -73,7 +71,6 @@
"join_button": "Rejoindre lappel",
"leave_button": "Revenir à lhistorique des appels"
},
"local_volume_label": "Volume local",
"logging_in": "Connexion…",
"login_auth_links": "<0>Créer un compte</0> Or <2>Accès invité</2>",
"login_title": "Connexion",
@ -131,7 +128,6 @@
"unmute_microphone_button_label": "Allumer le microphone",
"version": "Version : {{version}}",
"video_tile": {
"presenter_label": "{{displayName}} est à lécran",
"sfu_participant_local": "Vous"
},
"waiting_for_participants": "En attente dautres participants…"

View File

@ -50,10 +50,8 @@
"username": "Nama pengguna"
},
"disconnected_banner": "Koneksi ke server telah hilang.",
"exit_fullscreen_button_label": "Keluar dari layar penuh",
"full_screen_view_description": "<0>Mengirim catatan pengawakutuan akan membantu kami melacak masalahnya.</0>",
"full_screen_view_h1": "<0>Aduh, ada yang salah.</0>",
"fullscreen_button_label": "Layar penuh",
"group_call_loader_failed_heading": "Panggilan tidak ditemukan",
"group_call_loader_failed_text": "Panggilan sekarang terenkripsi secara ujung ke ujung dan harus dibuat dari laman beranda. Ini memastikan bahwa semuanya menggunakan kunci enkripsi yang sama.",
"hangup_button_label": "Akhiri panggilan",
@ -74,7 +72,6 @@
"join_button": "Bergabung ke panggilan",
"leave_button": "Kembali ke terkini"
},
"local_volume_label": "Volume lokal",
"logging_in": "Memasuki…",
"login_auth_links": "<0>Buat akun</0> Atau <2>Akses sebagai tamu</2>",
"login_title": "Masuk",
@ -132,7 +129,6 @@
"unmute_microphone_button_label": "Nyalakan mikrofon",
"version": "Versi: {{version}}",
"video_tile": {
"presenter_label": "{{displayName}} sedang menampilkan",
"sfu_participant_local": "Anda"
},
"waiting_for_participants": "Menunggu peserta lain…"

View File

@ -48,10 +48,8 @@
"username": "Nome utente"
},
"disconnected_banner": "La connessione al server è stata persa.",
"exit_fullscreen_button_label": "Esci da schermo intero",
"full_screen_view_description": "<0>L'invio di registri di debug ci aiuterà ad individuare il problema.</0>",
"full_screen_view_h1": "<0>Ops, qualcosa è andato storto.</0>",
"fullscreen_button_label": "Schermo intero",
"group_call_loader_failed_heading": "Chiamata non trovata",
"group_call_loader_failed_text": "Le chiamate ora sono cifrate end-to-end e devono essere create dalla pagina principale. Ciò assicura che chiunque usi la stessa chiave di crittografia.",
"hangup_button_label": "Termina chiamata",
@ -72,7 +70,6 @@
"join_button": "Entra in chiamata",
"leave_button": "Torna ai recenti"
},
"local_volume_label": "Volume locale",
"logging_in": "Accesso…",
"login_auth_links": "<0>Crea un profilo</0> o <2>Accedi come ospite</2>",
"login_title": "Accedi",
@ -129,7 +126,6 @@
"unmute_microphone_button_label": "Riaccendi il microfono",
"version": "Versione: {{version}}",
"video_tile": {
"presenter_label": "{{displayName}} sta presentando",
"sfu_participant_local": "Tu"
},
"waiting_for_participants": "In attesa di altri partecipanti…"

View File

@ -30,9 +30,7 @@
"username": "ユーザー名",
"video": "ビデオ"
},
"exit_fullscreen_button_label": "全画面表示を終了",
"full_screen_view_h1": "<0>何かがうまく行きませんでした。</0>",
"fullscreen_button_label": "全画面表示",
"header_label": "Element Call ホーム",
"join_existing_call_modal": {
"join_button": "はい、通話に参加",

View File

@ -40,10 +40,8 @@
"username": "Lietotājvārds"
},
"disconnected_banner": "Ir zaudēts savienojums ar serveri.",
"exit_fullscreen_button_label": "Iziet no pilnekrāna",
"full_screen_view_description": "<0>Atkļūdošanas žurnāla ierakstu iesūtīšana palīdzēs mums atklāt nepilnību.</0>",
"full_screen_view_h1": "<0>Ak vai, kaut kas nogāja greizi!</0>",
"fullscreen_button_label": "Pilnekrāns",
"header_label": "Element Call sākums",
"join_existing_call_modal": {
"join_button": "Jā, pievienoties zvanam",
@ -54,7 +52,6 @@
"lobby": {
"join_button": "Pievienoties zvanam"
},
"local_volume_label": "Vietējais skaļums",
"logging_in": "Piesakās…",
"login_auth_links": "<0>Izveidot kontu</0> vai <2>Piekļūt kā viesim</2>",
"login_title": "Pieteikties",
@ -103,8 +100,5 @@
"unauthenticated_view_eula_caption": "Klikšķināšana uz \"Aiziet\" apliecina piekrišanu mūsu <2>galalietotāja licencēšanas nolīgumam (GLLN)</2>",
"unauthenticated_view_login_button": "Pieteikties kontā",
"version": "Versija: {{version}}",
"video_tile": {
"presenter_label": "{{displayName}} uzstājas"
},
"waiting_for_participants": "Gaida citus dalībniekus…"
}

View File

@ -53,10 +53,8 @@
"video": "Wideo"
},
"disconnected_banner": "Utracono połączenie z serwerem.",
"exit_fullscreen_button_label": "Opuść pełny ekran",
"full_screen_view_description": "<0>Wysłanie dzienników debuggowania pomoże nam ustalić przyczynę problemu.</0>",
"full_screen_view_h1": "<0>Ojej, coś poszło nie tak.</0>",
"fullscreen_button_label": "Pełny ekran",
"group_call_loader_failed_heading": "Nie znaleziono połączenia",
"group_call_loader_failed_text": "Połączenia są teraz szyfrowane end-to-end i muszą zostać utworzone ze strony głównej. Pomaga to upewnić się, że każdy korzysta z tego samego klucza szyfrującego.",
"hangup_button_label": "Zakończ połączenie",
@ -77,7 +75,6 @@
"join_button": "Dołącz do połączenia",
"leave_button": "Wróć do ostatnie"
},
"local_volume_label": "Głośność lokalna",
"logging_in": "Logowanie…",
"login_auth_links": "<0>Utwórz konto</0> lub <2>Dołącz jako gość</2>",
"login_title": "Zaloguj się",
@ -135,7 +132,6 @@
"unmute_microphone_button_label": "Odcisz mikrofon",
"version": "Wersja: {{version}}",
"video_tile": {
"presenter_label": "{{displayName}} prezentuje",
"sfu_participant_local": "Ty"
},
"waiting_for_participants": "Oczekiwanie na pozostałych uczestników…"

View File

@ -38,10 +38,8 @@
"username": "Имя пользователя",
"video": "Видео"
},
"exit_fullscreen_button_label": "Выйти из полноэкранного режима",
"full_screen_view_description": "<0>Отправка журналов поможет нам найти и устранить проблему.</0>",
"full_screen_view_h1": "<0>Упс, что-то пошло не так.</0>",
"fullscreen_button_label": "Полноэкранный режим",
"header_label": "Главная Element Call",
"join_existing_call_modal": {
"join_button": "Да, присоединиться",
@ -52,7 +50,6 @@
"lobby": {
"join_button": "Присоединиться"
},
"local_volume_label": "Местная громкость",
"logging_in": "Вход…",
"login_auth_links": "<0>Создать аккаунт</0> или <2>Зайти как гость</2>",
"login_title": "Вход",
@ -96,8 +93,5 @@
"unauthenticated_view_body": "Ещё не зарегистрированы? <2>Создайте аккаунт</2>",
"unauthenticated_view_login_button": "Войдите в свой аккаунт",
"version": "Версия: {{version}}",
"video_tile": {
"presenter_label": "{{displayName}} представляет"
},
"waiting_for_participants": "Ожидание других участников…"
}

View File

@ -51,10 +51,8 @@
"username": "Meno používateľa"
},
"disconnected_banner": "Spojenie so serverom sa stratilo.",
"exit_fullscreen_button_label": "Ukončiť zobrazenie na celú obrazovku",
"full_screen_view_description": "<0>Odoslanie záznamov ladenia nám pomôže nájsť problém.</0>",
"full_screen_view_h1": "<0>Hups, niečo sa pokazilo.</0>",
"fullscreen_button_label": "Zobrazenie na celú obrazovku",
"group_call_loader_failed_heading": "Hovor nebol nájdený",
"group_call_loader_failed_text": "Hovory sú teraz end-to-end šifrované a je potrebné ich vytvoriť z domovskej stránky. To pomáha zabezpečiť, aby všetci používali rovnaký šifrovací kľúč.",
"hangup_button_label": "Ukončiť hovor",
@ -75,7 +73,6 @@
"join_button": "Pripojiť sa k hovoru",
"leave_button": "Späť k nedávnym"
},
"local_volume_label": "Lokálna hlasitosť",
"logging_in": "Prihlasovanie…",
"login_auth_links": "<0>Vytvoriť konto</0> Alebo <2>Prihlásiť sa ako hosť</2>",
"login_title": "Prihlásiť sa",
@ -133,7 +130,6 @@
"unmute_microphone_button_label": "Zrušiť stlmenie mikrofónu",
"version": "Verzia: {{version}}",
"video_tile": {
"presenter_label": "{{displayName}} prezentuje",
"sfu_participant_local": "Vy"
},
"waiting_for_participants": "Čaká sa na ďalších účastníkov…"

View File

@ -3,8 +3,5 @@
"headline": "{{displayName}}, ditt samtal har avslutats."
},
"star_rating_input_label_one": "{{count}} stjärna",
"star_rating_input_label_other": "{{count}} stjärnor",
"video_tile": {
"presenter_label": "{{displayName}} presenterar"
}
"star_rating_input_label_other": "{{count}} stjärnor"
}

View File

@ -24,8 +24,6 @@
"password": "Parola",
"settings": "Ayarlar"
},
"exit_fullscreen_button_label": "Tam ekranı terk et",
"fullscreen_button_label": "Tam ekran",
"join_existing_call_modal": {
"text": "Bu arama zaten var, katılmak ister misiniz?",
"title": "Mevcut aramaya katıl?"
@ -33,7 +31,6 @@
"lobby": {
"join_button": "Aramaya katıl"
},
"local_volume_label": "Yerel ses seviyesi",
"logging_in": "Giriliyor…",
"login_auth_links": "<0>Hesap oluştur</0> yahut <2>Konuk olarak gir</2>",
"login_title": "Gir",

View File

@ -53,10 +53,8 @@
"video": "Відео"
},
"disconnected_banner": "Втрачено зв'язок з сервером.",
"exit_fullscreen_button_label": "Вийти з повноекранного режиму",
"full_screen_view_description": "<0>Надсилання журналів налагодження допоможе нам виявити проблему.</0>",
"full_screen_view_h1": "<0>Йой, щось пішло не за планом.</0>",
"fullscreen_button_label": "Повноекранний режим",
"group_call_loader_failed_heading": "Виклик не знайдено",
"group_call_loader_failed_text": "Відтепер виклики захищено наскрізним шифруванням, і їх потрібно створювати з домашньої сторінки. Це допомагає переконатися, що всі користувачі використовують один і той самий ключ шифрування.",
"hangup_button_label": "Завершити виклик",
@ -77,7 +75,6 @@
"join_button": "Приєднатися до виклику",
"leave_button": "Повернутися до недавніх"
},
"local_volume_label": "Локальна гучність",
"logging_in": "Вхід…",
"login_auth_links": "<0>Створити обліковий запис</0> або <2>Отримати доступ як гість</2>",
"login_title": "Увійти",
@ -135,7 +132,6 @@
"unmute_microphone_button_label": "Увімкнути мікрофон",
"version": "Версія: {{version}}",
"video_tile": {
"presenter_label": "{{displayName}} представляє",
"sfu_participant_local": "Ви"
},
"waiting_for_participants": "Очікування на інших учасників…"

View File

@ -29,10 +29,8 @@
"username": "Tên người dùng",
"video": "Truyền hình"
},
"exit_fullscreen_button_label": "Rời chế độ toàn màn hình",
"full_screen_view_description": "<0>Gửi nhật ký gỡ lỗi sẽ giúp chúng tôi theo dõi vấn đề.</0>",
"full_screen_view_h1": "<0>Ối, có cái gì đó sai.</0>",
"fullscreen_button_label": "Toàn màn hình",
"join_existing_call_modal": {
"join_button": "Vâng, tham gia cuộc gọi",
"text": "Cuộc gọi đã tồn tại, bạn có muốn tham gia không?",
@ -73,8 +71,5 @@
"unauthenticated_view_body": "Chưa đăng ký? <2>Tạo tài khoản</2>",
"unauthenticated_view_login_button": "Đăng nhập vào tài khoản của bạn",
"version": "Phiên bản: {{version}}",
"video_tile": {
"presenter_label": "{{displayName}} đang trình bày"
},
"waiting_for_participants": "Đang đợi những người khác…"
}

View File

@ -51,10 +51,8 @@
"video": "视频"
},
"disconnected_banner": "与服务器的连接中断。",
"exit_fullscreen_button_label": "退出全屏",
"full_screen_view_description": "<0>提交日志以帮助我们修复问题。</0>",
"full_screen_view_h1": "<0>哎哟,出问题了。</0>",
"fullscreen_button_label": "全屏",
"group_call_loader_failed_heading": "未找到通话",
"group_call_loader_failed_text": "现在,通话是端对端加密的,需要从主页创建。这有助于确保每个人都使用相同的加密密钥。",
"hangup_button_label": "通话结束",
@ -70,7 +68,6 @@
"join_button": "加入通话",
"leave_button": "返回最近通话"
},
"local_volume_label": "本地音量",
"logging_in": "登录中……",
"login_auth_links": "<0>创建账户</0> Or <2>以访客身份继续</2>",
"login_title": "登录",
@ -128,7 +125,6 @@
"unmute_microphone_button_label": "取消麦克风静音",
"version": "版本:{{version}}",
"video_tile": {
"presenter_label": "{{displayName}}正在展示",
"sfu_participant_local": "你"
},
"waiting_for_participants": "等待其他参与者……"

View File

@ -53,10 +53,8 @@
"video": "視訊"
},
"disconnected_banner": "到伺服器的連線已遺失。",
"exit_fullscreen_button_label": "退出全螢幕",
"full_screen_view_description": "<0>送出除錯紀錄,可幫助我們修正問題。</0>",
"full_screen_view_h1": "<0>喔喔,有些地方怪怪的。</0>",
"fullscreen_button_label": "全螢幕",
"group_call_loader_failed_heading": "找不到通話",
"group_call_loader_failed_text": "通話現在是端對端加密的,必須從首頁建立。這有助於確保每個人都使用相同的加密金鑰。",
"hangup_button_label": "結束通話",
@ -77,7 +75,6 @@
"join_button": "加入通話",
"leave_button": "回到最近的通話"
},
"local_volume_label": "您的音量",
"logging_in": "登入中…",
"login_auth_links": "<0>建立帳號</0> 或<2>以訪客身份登入</2>",
"login_title": "登入",
@ -135,7 +132,6 @@
"unmute_microphone_button_label": "將麥克風取消靜音",
"version": "版本: {{version}}",
"video_tile": {
"presenter_label": "{{displayName}} 正在展示",
"sfu_participant_local": "您"
},
"waiting_for_participants": "等待其他參加者…"

View File

@ -72,7 +72,9 @@ export const App: FC<AppProps> = ({ history }) => {
const [loaded, setLoaded] = useState(false);
useEffect(() => {
Initializer.init()?.then(() => {
if (loaded) return;
setLoaded(true);
widget?.api.sendContentLoaded();
});
});

View File

@ -27,6 +27,7 @@ import styles from "./FullScreenView.module.css";
import { TranslatedError } from "./TranslatedError";
import { Config } from "./config/Config";
import { RageshakeButton } from "./settings/RageshakeButton";
import { useUrlParams } from "./UrlParams";
interface FullScreenViewProps {
className?: string;
@ -37,12 +38,11 @@ export const FullScreenView: FC<FullScreenViewProps> = ({
className,
children,
}) => {
const { hideHeader } = useUrlParams();
return (
<div className={classNames(styles.page, className)}>
<Header>
<LeftNav>
<HeaderLogo />
</LeftNav>
<LeftNav>{!hideHeader && <HeaderLogo />}</LeftNav>
<RightNav />
</Header>
<div className={styles.container}>

View File

@ -31,6 +31,7 @@ import {
UndecryptableToDeviceEventTracker,
QualitySurveyEventTracker,
CallDisconnectedEventTracker,
CallConnectDurationTracker,
} from "./PosthogEvents";
import { Config } from "../config/Config";
import { getUrlParams } from "../UrlParams";
@ -444,4 +445,5 @@ export class PosthogAnalytics {
public eventUndecryptableToDevice = new UndecryptableToDeviceEventTracker();
public eventQualitySurvey = new QualitySurveyEventTracker();
public eventCallDisconnected = new CallDisconnectedEventTracker();
public eventCallConnectDuration = new CallConnectDurationTracker();
}

View File

@ -15,6 +15,7 @@ limitations under the License.
*/
import { DisconnectReason } from "livekit-client";
import { logger } from "matrix-js-sdk/src/logger";
import {
IPosthogEvent,
@ -201,3 +202,38 @@ export class CallDisconnectedEventTracker {
});
}
}
interface CallConnectDuration extends IPosthogEvent {
eventName: "CallConnectDuration";
totalDuration: number;
websocketDuration: number;
peerConnectionDuration: number;
}
export class CallConnectDurationTracker {
private connectStart = 0;
private websocketConnected = 0;
public cacheConnectStart(): void {
this.connectStart = Date.now();
}
public cacheWsConnect(): void {
this.websocketConnected = Date.now();
}
public track(options = { log: false }): void {
const now = Date.now();
const totalDuration = now - this.connectStart;
const websocketDuration = this.websocketConnected - this.connectStart;
const peerConnectionDuration = now - this.websocketConnected;
PosthogAnalytics.instance.trackEvent<CallConnectDuration>({
eventName: "CallConnectDuration",
totalDuration,
websocketDuration,
peerConnectionDuration,
});
if (options.log)
logger.log(
`Time to connect:\ntotal: ${totalDuration}ms\npeerConnection: ${websocketDuration}ms\nwebsocket: ${peerConnectionDuration}ms`,
);
}
}

View File

@ -82,7 +82,12 @@ export const LoginPage: FC = () => {
},
[login, location, history, homeserver, setClient],
);
// we need to limit the length of the homserver name to not cover the whole loginview input with the string.
let shortendHomeserverName = Config.defaultServerName()?.slice(0, 25);
shortendHomeserverName =
shortendHomeserverName?.length !== Config.defaultServerName()?.length
? shortendHomeserverName + "..."
: shortendHomeserverName;
return (
<>
<div className={styles.container}>
@ -102,7 +107,7 @@ export const LoginPage: FC = () => {
autoCorrect="off"
autoCapitalize="none"
prefix="@"
suffix={`:${Config.defaultServerName()}`}
suffix={`:${shortendHomeserverName}`}
data-testid="login_username"
/>
</FieldRow>

View File

@ -21,6 +21,7 @@ import { createClient, MatrixClient } from "matrix-js-sdk/src/matrix";
import { initClient } from "../matrix-utils";
import { Session } from "../ClientContext";
import { Config } from "../config/Config";
import { widget } from "../widget";
export const useInteractiveRegistration = (): {
privacyPolicyUrl?: string;
@ -48,6 +49,8 @@ export const useInteractiveRegistration = (): {
}
useEffect(() => {
if (widget) return;
// An empty registerRequest is used to get the privacy policy and recaptcha key.
authClient.current!.registerRequest({}).catch((error) => {
setPrivacyPolicyUrl(
error.data?.params["m.login.terms"]?.policies?.privacy_policy?.en?.url,

View File

@ -156,6 +156,12 @@ body {
margin: 0;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
-webkit-tap-highlight-color: transparent;
}
/* We use this to not render the page at all until we know the theme.*/
.no-theme {
opacity: 0;
}
html,

View File

@ -59,4 +59,5 @@ export const defaultLiveKitOptions: RoomOptions = {
stopLocalTrackOnUnpublish: true,
reconnectPolicy: new DefaultReconnectPolicy(),
disconnectOnPageLeave: true,
webAudioMix: false,
};

View File

@ -27,6 +27,14 @@ import { logger } from "matrix-js-sdk/src/logger";
import * as Sentry from "@sentry/react";
import { SFUConfig, sfuConfigEquals } from "./openIDSFU";
import { PosthogAnalytics } from "../analytics/PosthogAnalytics";
declare global {
interface Window {
peerConnectionTimeout?: number;
websocketTimeout?: number;
}
}
/*
* Additional values for states that a call can be in, beyond what livekit
@ -124,7 +132,21 @@ async function connectAndPublish(
micTrack: LocalTrack | undefined,
screenshareTracks: MediaStreamTrack[],
): Promise<void> {
await livekitRoom!.connect(sfuConfig!.url, sfuConfig!.jwt);
const tracker = PosthogAnalytics.instance.eventCallConnectDuration;
// Track call connect duration
tracker.cacheConnectStart();
livekitRoom.once(RoomEvent.SignalConnected, tracker.cacheWsConnect);
await livekitRoom!.connect(sfuConfig!.url, sfuConfig!.jwt, {
// Due to stability issues on Firefox we are testing the effect of different
// timeouts, and allow these values to be set through the console
peerConnectionTimeout: window.peerConnectionTimeout ?? 45000,
websocketTimeout: window.websocketTimeout ?? 45000,
});
// remove listener in case the connect promise rejects before `SignalConnected` is emitted.
livekitRoom.off(RoomEvent.SignalConnected, tracker.cacheWsConnect);
tracker.track({ log: true });
if (micTrack) {
logger.info(`Publishing precreated mic track`);

View File

@ -1,5 +1,5 @@
/*
Copyright 2023 New Vector Ltd
Copyright 2023-2024 New Vector Ltd
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@ -14,18 +14,17 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
import { useEffect, useRef } from "react";
import { useRef } from "react";
import { BehaviorSubject, Observable } from "rxjs";
/**
* React hook that creates an Observable from a changing value. The Observable
* replays its current value upon subscription, emits whenever the value
* changes, and completes when the component is unmounted.
* replays its current value upon subscription and emits whenever the value
* changes.
*/
export function useObservable<T>(value: T): Observable<T> {
const subject = useRef<BehaviorSubject<T>>();
subject.current ??= new BehaviorSubject(value);
if (value !== subject.current.value) subject.current.next(value);
useEffect(() => subject.current!.complete(), []);
return subject.current;
}

View File

@ -22,10 +22,9 @@ export const useTheme = (): void => {
const { theme: themeName } = useUrlParams();
const previousTheme = useRef<string | null>(document.body.classList.item(0));
useLayoutEffect(() => {
// Don't update the current theme if the url does not contain a theme prop.
if (!themeName) return;
const theme = themeName.includes("light") ? "light" : "dark";
const themeHighContrast = themeName.includes("high-contrast") ? "-hc" : "";
// If the url does not contain a theme props we default to "dark".
const theme = themeName?.includes("light") ? "light" : "dark";
const themeHighContrast = themeName?.includes("high-contrast") ? "-hc" : "";
const themeString = "cpd-theme-" + theme + themeHighContrast;
if (themeString !== previousTheme.current) {
document.body.classList.remove(
@ -37,5 +36,6 @@ export const useTheme = (): void => {
document.body.classList.add(themeString);
previousTheme.current = themeString;
}
document.body.classList.remove("no-theme");
}, [previousTheme, themeName]);
};

View File

@ -158,6 +158,8 @@ export const widget = ((): WidgetHelpers | null => {
useE2eForGroupCall: e2eEnabled,
fallbackICEServerAllowed: allowIceFallback,
},
// ContentLoaded event will be sent as soon as the theme is set (see useTheme.ts)
false,
);
const clientPromise = new Promise<MatrixClient>((resolve) => {

View File

@ -26,7 +26,7 @@
"./node_modules/livekit-client/dist/src/room/participant/Participant.d.ts"
],
"livekit-client/dist/src/proto/livekit_models_pb": [
"./node_modules/livekit-client/dist/src/proto/livekit_models_pb.d.ts"
"./node_modules/@livekit/protocol/src/gen/livekit_models_pb.d.ts"
]
},

1061
yarn.lock

File diff suppressed because it is too large Load Diff