Compare commits

...

147 Commits

Author SHA1 Message Date
Timo
5262af7000 Fix sync loop by adding a 20ms break for the next mute sync (#1742)
* fix sync loop by adding a 20ms break for the next mute sync

---------

Signed-off-by: Timo K <toger5@hotmail.de>
2023-10-12 10:51:37 +02:00
Robin
94c4b4fd6a Merge pull request #1727 from vector-im/renovate/opentelemetry-instrumentation-user-interaction-0.x-lockfile
Update dependency @opentelemetry/instrumentation-user-interaction to v0.33.2
2023-10-11 11:06:28 -04:00
Robin
1a4e30a274 Merge pull request #1739 from vector-im/renovate/postcss-preset-env-9.x-lockfile
Update dependency postcss-preset-env to v9.2.0
2023-10-11 10:57:47 -04:00
Robin
fd16073c2e Merge pull request #1714 from vector-im/renovate/vite-plugin-html-template-1.x-lockfile
Update dependency vite-plugin-html-template to v1.2.1
2023-10-11 10:51:00 -04:00
Robin
5dee63d815 Merge pull request #1706 from vector-im/renovate/sass-1.x-lockfile
Update dependency sass to v1.69.2
2023-10-11 10:50:25 -04:00
Robin
ddf174c01a Merge pull request #1710 from RiotTranslateBot/weblate-element-call-element-call
Translations update from Weblate
2023-10-11 10:50:02 -04:00
Robin
6c2260f9da Merge pull request #1711 from vector-im/renovate/eslint-8.x-lockfile
Update dependency eslint to v8.51.0
2023-10-11 10:49:32 -04:00
renovate[bot]
227d433978 Update dependency @opentelemetry/instrumentation-user-interaction to v0.33.2 2023-10-11 14:47:59 +00:00
Robin
af13b27be5 Merge pull request #1726 from vector-im/renovate/opentelemetry-instrumentation-document-load-0.x-lockfile
Update dependency @opentelemetry/instrumentation-document-load to v0.33.2
2023-10-11 10:47:31 -04:00
Robin
f6de03585b Merge pull request #1738 from vector-im/renovate/eslint-plugin-deprecate-0.x-lockfile
Update dependency eslint-plugin-deprecate to v0.8.3
2023-10-11 10:46:47 -04:00
Robin
772c0655dc Merge pull request #1735 from vector-im/renovate/typescript-eslint-monorepo
Update typescript-eslint monorepo to v6.7.5
2023-10-11 10:46:20 -04:00
renovate[bot]
bc109a417d Update dependency postcss-preset-env to v9.2.0 2023-10-11 14:45:49 +00:00
Robin
e06ddff8bd Merge pull request #1621 from vector-im/renovate/prettier-3.x
Update dependency prettier to v3
2023-10-11 10:45:16 -04:00
Robin
614bc82402 Format code 2023-10-11 10:42:04 -04:00
renovate[bot]
b28e465122 Update dependency prettier to v3 2023-10-11 14:38:05 +00:00
renovate[bot]
e424d3698e Update dependency eslint-plugin-deprecate to v0.8.3 2023-10-11 14:33:23 +00:00
Robin
ec35f655e7 Merge pull request #1574 from robintown/eslint-upgrade
Upgrade eslint-plugin-matrix-org to 1.2.1
2023-10-11 10:32:54 -04:00
Robin
cc6f1f8631 Merge branch 'livekit' into eslint-upgrade 2023-10-11 10:30:57 -04:00
renovate[bot]
975d8a3adc Update typescript-eslint monorepo to v6.7.5 2023-10-11 13:01:40 +00:00
renovate[bot]
17be0578bc Update dependency @types/request to v2.48.10 (#1728)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-10-11 15:01:30 +02:00
renovate[bot]
3964b34596 Update dependency vaul to v0.7.1 (#1729)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-10-11 15:01:03 +02:00
David Baker
5900b76be2 Merge pull request #1694 from vector-im/renovate/posthog-js-1.x-lockfile
Update dependency posthog-js to v1.83.0
2023-10-11 11:48:21 +01:00
raspin0
0e5005f846 Translated using Weblate (Polish)
Currently translated at 100.0% (121 of 121 strings)

Translation: Element Call/element-call
Translate-URL: https://translate.element.io/projects/element-call/element-call/pl/
2023-10-11 10:47:56 +00:00
David Baker
d9ea66f091 Merge pull request #1712 from vector-im/renovate/node-18.x-lockfile
Update dependency @types/node to v18.18.4
2023-10-11 11:47:42 +01:00
David Baker
908b466b1e Merge pull request #1713 from vector-im/renovate/uuid-9.x-lockfile
Update dependency @types/uuid to v9.0.5
2023-10-11 11:47:14 +01:00
renovate[bot]
a94009043b Update dependency @opentelemetry/instrumentation-document-load to v0.33.2 2023-10-11 10:21:34 +00:00
David Baker
be36ce43e0 Merge pull request #1716 from vector-im/renovate/docker-build-push-action-digest
Update docker/build-push-action digest to 0f84726
2023-10-11 11:21:06 +01:00
renovate[bot]
2970071aa5 Update dependency sass to v1.69.2 2023-10-10 22:06:54 +00:00
David Baker
d575ea4117 Merge pull request #1722 from vector-im/dbkr/dont_use_sender
Don't use event.sender
2023-10-10 17:20:35 +01:00
David Baker
fbb2dc2afd Update to merged js-sdk commit 2023-10-10 17:17:16 +01:00
Timo
d5edcce470 Fix mute button not being in sync with actual video/audio feed. (#1721)
* Fix mute button not being in sync with actual video/audio feed.
This happens if we toggle the button while waiting for updating the stream.
It is prohibited by checking if the stream state is in sync after the update
is done.
Signed-off-by: Timo K <toger5@hotmail.de>


---------

Signed-off-by: Timo K <toger5@hotmail.de>
2023-10-10 14:14:39 +02:00
David Baker
7ab69435e5 Merge pull request #1717 from vector-im/dbkr/fix_url_password_param
Use base64url encoding for the password param
2023-10-10 11:07:45 +01:00
renovate[bot]
73e11b4084 Update dependency posthog-js to v1.83.0 2023-10-10 00:59:15 +00:00
David Baker
07cde7ee4d Don't use event.sender
Pull in a js-sdk change to avoid using event.sender (see js-sdk PR
for details).

Fixes https://github.com/vector-im/element-call/issues/1697
2023-10-09 20:49:03 +01:00
David Baker
df93fb4a3f Add comment 2023-10-09 16:35:27 +01:00
David Baker
6faceb07cd Log if password needed url encoding 2023-10-09 16:28:48 +01:00
David Baker
0892edc432 Use base64url encoding for the password param
As base64 is fairly obviously not sensible for URLs and we were not
URL encoding it so we were ending up with spaces in the URL.

Also base 64 encode the password in case, as per comment.
2023-10-09 10:08:10 +01:00
renovate[bot]
0c4430b72c Update docker/build-push-action digest to 0f84726 2023-10-09 08:28:42 +00:00
renovate[bot]
1d7e9d1a0b Update dependency vite-plugin-html-template to v1.2.1 2023-10-07 08:09:20 +00:00
renovate[bot]
bb9c453eac Update dependency @types/uuid to v9.0.5 2023-10-07 01:59:11 +00:00
renovate[bot]
4b066269eb Update dependency @types/node to v18.18.4 2023-10-07 01:58:57 +00:00
renovate[bot]
192b6a9d9e Update dependency eslint to v8.51.0 2023-10-06 23:01:39 +00:00
David Baker
e2abeba194 Merge pull request #1705 from vector-im/dbkr/use_secure_random
Generate call passwords with secure RNG
2023-10-06 16:20:50 +01:00
David Baker
e9798441f7 Merge remote-tracking branch 'origin/livekit' into dbkr/use_secure_random 2023-10-06 16:18:53 +01:00
David Baker
bc36acafc8 Merge pull request #1704 from vector-im/dbkr/refactor_room_create
Refactor room creation code a little
2023-10-06 16:18:18 +01:00
David Baker
f2435f1c31 More consistent variable naming 2023-10-06 16:15:16 +01:00
David Baker
715c5c73ca Merge remote-tracking branch 'origin/livekit' into dbkr/refactor_room_create 2023-10-06 15:15:30 +01:00
David Baker
be4afaeb7e Merge pull request #1687 from vector-im/dbkr/update_default_device
Switch capture devices if the default device changes
2023-10-06 12:01:46 +01:00
David Baker
44e604aaa1 Merge pull request #1703 from vector-im/dbkr/keep_password_in_url
Keep the password in the URL
2023-10-06 10:55:12 +01:00
David Baker
87d5062d34 Don't use js-sdk's base64 encode function
It uses the NodeJS Buffer global which presumably is provided by
Webpack in element-web but isn't here, apparently.
2023-10-05 17:57:23 +01:00
David Baker
d373081db1 Generate call passwords with secure RNG 2023-10-05 17:32:43 +01:00
David Baker
6481b2f67e Merge branch 'dbkr/keep_password_in_url' into dbkr/refactor_room_create 2023-10-05 17:27:03 +01:00
David Baker
b646b0ae56 Remove extra function
that was now doing exactly the same thing as the one above it.
2023-10-05 17:25:06 +01:00
David Baker
e63721acea Refactor room creation code a little
We c+ped the code to create room passwords between two places, but we
already had a createRoom utility function that knew about e2ee.
2023-10-05 16:44:31 +01:00
David Baker
4984bd630e Keep the password in the URL
We changed our minds: people do copy the URL from the bar and
give that to people and expect it to work: it doesn't make sense
to prioritise shorter URLs over this. There's no security advantage
unless we think there's a risk someone might steal your key by taking
a photo of your monitor over your shoulder and decrypting the calls
they can't already hear by standing behind you.
2023-10-05 16:13:56 +01:00
renovate[bot]
847789dcda Update dependency @sentry/vite-plugin to v2.8.0 (#1701)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-10-05 17:13:26 +02:00
renovate[bot]
d1cb6ee889 Update dependency vaul to ^0.7.0 (#1692)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-10-05 16:25:27 +02:00
renovate[bot]
7fbd84a63c Update dependency vite to v4.4.11 (#1699)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-10-05 16:24:29 +02:00
Timo
63a00eef2f await leave rtc session (#1648)
so that the widget is only getting the hangup even,
once the call has been cleaned up

Signed-off-by: Timo K <toger5@hotmail.de>
2023-10-04 18:27:07 +02:00
Timo
c18dce3617 Make sure roomAlias = null in widget mode (#1676)
Signed-off-by: Timo K <toger5@hotmail.de>
2023-10-04 15:56:57 +02:00
Stefan Ceriu
1eb2302060 Move apple-app-site-association to .well-known
https://developer.apple.com/videos/play/wwdc2019/717/

```
This file should be located at HTTPS://your domain name/.well-known/apple-app-site-association

Other paths are deprecated.
```
2023-10-04 16:40:49 +03:00
Stefan Ceriu
ad462f3d8e Fix apple-app-site-assoctiation no_universal_link query matching.
https://developer.apple.com/videos/play/wwdc2019/717/

```
You'll notice that I specify a question mark and an asterisk as the pattern from the query items value. A pattern consisting of a single asterisk matches any string, including the empty string. And a missing query item has a value equivalent to the empty string. So to match against the string that's at least one character long, I specify a question mark and then any additional characters are matched by the asterisk.
```
2023-10-04 16:40:49 +03:00
Robin
a3eb58f9fe Merge pull request #1688 from vector-im/renovate/vite-4.x-lockfile
Update dependency vite to v4.4.10
2023-10-03 16:29:34 -04:00
Robin
50b4d61fbd Merge pull request #1684 from RiotTranslateBot/weblate-element-call-element-call
Translations update from Weblate
2023-10-03 16:29:10 -04:00
Robin
d0eda79f27 Merge pull request #1691 from vector-im/renovate/vector-im-compound-web-0.x
Update dependency @vector-im/compound-web to ^0.5.0
2023-10-03 16:28:44 -04:00
Robin
a0cc7686b3 Merge pull request #1678 from vector-im/renovate/posthog-js-1.x-lockfile
Update dependency posthog-js to v1.81.3
2023-10-03 16:25:41 -04:00
renovate[bot]
20f96f17e4 Update dependency @vector-im/compound-web to ^0.5.0 2023-10-03 20:25:25 +00:00
random
1b109e1b3a Translated using Weblate (Italian)
Currently translated at 100.0% (121 of 121 strings)

Translation: Element Call/element-call
Translate-URL: https://translate.element.io/projects/element-call/element-call/it/
2023-10-03 19:43:00 +00:00
Jeff Huang
daa1fed0c0 Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (121 of 121 strings)

Translation: Element Call/element-call
Translate-URL: https://translate.element.io/projects/element-call/element-call/zh_Hant/
2023-10-03 19:43:00 +00:00
Timo
01b2367f38 allow widget related params in the fragment (#1675)
Signed-off-by: Timo K <toger5@hotmail.de>
2023-10-03 21:35:28 +02:00
renovate[bot]
2961d588b6 Update dependency vite to v4.4.10 2023-10-03 19:29:34 +00:00
David Baker
c37b2924af Comment 2023-10-03 18:27:10 +01:00
David Baker
e0cabbc514 Switch capture devices if the default device changes
This is a bit of a hack, but is the only way I can see that we can
update to using the new default device when the OS-level default
changes. Hopefully the comments explain everything.
2023-10-03 18:22:56 +01:00
Robin
e54a1274bb Merge pull request #1679 from vector-im/renovate/livekit-components-react-1.x-lockfile
Update dependency @livekit/components-react to v1.3.0
2023-10-03 07:54:25 -04:00
Robin
e246f3f66b Merge pull request #1667 from vector-im/renovate/sentry-javascript-monorepo
Update sentry-javascript monorepo to v7.73.0
2023-10-03 07:52:31 -04:00
Robin
c769a1b86b Merge pull request #1671 from vector-im/renovate/typescript-eslint-monorepo
Update typescript-eslint monorepo to v6.7.4
2023-10-03 07:51:40 -04:00
renovate[bot]
bbc58502da Update dependency @livekit/components-react to v1.3.0 2023-10-03 11:51:28 +00:00
renovate[bot]
72ab839eff Update dependency posthog-js to v1.81.3 2023-10-03 11:49:11 +00:00
Robin
aea404588a Merge pull request #1677 from vector-im/renovate/node-18.x-lockfile
Update dependency @types/node to v18.18.3
2023-10-03 07:48:37 -04:00
renovate[bot]
b3c0a01429 Update dependency @types/node to v18.18.3 2023-10-02 21:25:51 +00:00
renovate[bot]
27fa35cbab Update typescript-eslint monorepo to v6.7.4 2023-10-02 17:32:32 +00:00
Robin
f779bc26cd Merge pull request #1666 from vector-im/renovate/i18next-parser-8.x-lockfile
Update dependency i18next-parser to v8.8.0
2023-10-02 10:36:30 -04:00
Robin
6b94e3553c Merge pull request #1665 from RiotTranslateBot/weblate-element-call-element-call
Translations update from Weblate
2023-10-02 10:35:33 -04:00
renovate[bot]
13579d5972 Update sentry-javascript monorepo to v7.73.0 2023-10-02 14:00:44 +00:00
renovate[bot]
47c1740504 Update dependency i18next-parser to v8.8.0 2023-10-01 17:49:06 +00:00
Ihor Hordiichuk
21789f7d22 Translated using Weblate (Ukrainian)
Currently translated at 100.0% (121 of 121 strings)

Translation: Element Call/element-call
Translate-URL: https://translate.element.io/projects/element-call/element-call/uk/
2023-10-01 04:26:55 +00:00
Robin
67ea390847 Merge pull request #1664 from vector-im/renovate/vite-plugin-svgr-4.x-lockfile
Update dependency vite-plugin-svgr to v4.1.0
2023-09-29 22:27:41 -04:00
Robin
e501c5305f Merge pull request #1662 from vector-im/renovate/node-18.x-lockfile
Update dependency @types/node to v18.18.1
2023-09-29 22:26:50 -04:00
renovate[bot]
d3704dab33 Update dependency vite-plugin-svgr to v4.1.0 2023-09-29 21:28:22 +00:00
renovate[bot]
a7a2adaf6b Update dependency @types/node to v18.18.1 2023-09-29 17:01:31 +00:00
Robin
516d365511 Merge pull request #1660 from RiotTranslateBot/weblate-element-call-element-call
Translations update from Weblate
2023-09-29 13:01:03 -04:00
Vri
4343ae588e Translated using Weblate (German)
Currently translated at 100.0% (121 of 121 strings)

Translation: Element Call/element-call
Translate-URL: https://translate.element.io/projects/element-call/element-call/de/
2023-09-29 14:22:14 +00:00
David Baker
3e0bc8a0d9 Merge pull request #1659 from RiotTranslateBot/weblate-element-call-element-call
Translations update from Weblate
2023-09-29 11:28:20 +01:00
random
5586d32f33 Translated using Weblate (Italian)
Currently translated at 100.0% (121 of 121 strings)

Translation: Element Call/element-call
Translate-URL: https://translate.element.io/projects/element-call/element-call/it/
2023-09-29 09:48:49 +00:00
Glandos
07aa0f0abf Translated using Weblate (French)
Currently translated at 100.0% (121 of 121 strings)

Translation: Element Call/element-call
Translate-URL: https://translate.element.io/projects/element-call/element-call/fr/
2023-09-29 09:48:49 +00:00
Stefan Ceriu
399ec9fa8f vector-im/element-x-ios/issues/1824 - Switch apple-app-site-associations to the new format, add a query param exclusion for ignoring universal links 2023-09-29 12:04:50 +03:00
David Baker
2357cc18a9 Merge pull request #1657 from RiotTranslateBot/weblate-element-call-element-call
Translations update from Weblate
2023-09-29 09:13:00 +01:00
Glandos
e608823787 Translated using Weblate (French)
Currently translated at 96.6% (117 of 121 strings)

Translation: Element Call/element-call
Translate-URL: https://translate.element.io/projects/element-call/element-call/fr/
2023-09-29 07:41:22 +00:00
Priit Jõerüüt
b78c6a1ba5 Translated using Weblate (Estonian)
Currently translated at 100.0% (121 of 121 strings)

Translation: Element Call/element-call
Translate-URL: https://translate.element.io/projects/element-call/element-call/et/
2023-09-29 05:32:07 +00:00
Linerly
bbca3543a1 Translated using Weblate (Indonesian)
Currently translated at 100.0% (121 of 121 strings)

Translation: Element Call/element-call
Translate-URL: https://translate.element.io/projects/element-call/element-call/id/
2023-09-29 05:32:07 +00:00
Robin
43f2360fed Merge pull request #1655 from vector-im/renovate/vaul-0.x-lockfile
Update dependency vaul to v0.6.8
2023-09-28 22:28:14 -04:00
Robin
10b1da2d34 Merge pull request #1656 from RiotTranslateBot/weblate-element-call-element-call
Translations update from Weblate
2023-09-28 22:25:58 -04:00
Weblate
6d61825f0e Update translation files
Updated by "Cleanup translation files" hook in Weblate.

Translation: Element Call/element-call
Translate-URL: https://translate.element.io/projects/element-call/element-call/
2023-09-29 01:06:13 +00:00
renovate[bot]
760f6b5dc2 Update dependency vaul to v0.6.8 2023-09-28 22:43:12 +00:00
Robin
c3d4a3fafc Merge pull request #1652 from RiotTranslateBot/weblate-element-call-element-call
Translations update from Weblate
2023-09-28 18:42:48 -04:00
Robin
a5ce67a9bf Merge pull request #1651 from robintown/adjust-margin
Adjust margins
2023-09-28 18:41:35 -04:00
Jozef Gaal
9cc691d389 Translated using Weblate (Slovak)
Currently translated at 100.0% (121 of 121 strings)

Translation: Element Call/element-call
Translate-URL: https://translate.element.io/projects/element-call/element-call/sk/
2023-09-28 22:35:15 +00:00
Weblate
6df9e672f3 Update translation files
Updated by "Cleanup translation files" hook in Weblate.

Translation: Element Call/element-call
Translate-URL: https://translate.element.io/projects/element-call/element-call/
2023-09-28 17:46:09 +00:00
MarySue
2d56658d05 Translated using Weblate (Chinese (Simplified))
Currently translated at 100.0% (124 of 124 strings)

Translation: Element Call/element-call
Translate-URL: https://translate.element.io/projects/element-call/element-call/zh_Hans/
2023-09-28 17:46:08 +00:00
Robin
e582e9d171 Adjust margins 2023-09-28 12:41:00 -04:00
Robin
9078101c4a Merge pull request #1650 from vector-im/renovate/babel-monorepo
Update dependency @babel/core to v7.23.0
2023-09-28 10:13:42 -04:00
renovate[bot]
fb5e5b2079 Update dependency @babel/core to v7.23.0 2023-09-28 14:11:29 +00:00
Robin
aaef2bf3c8 Merge pull request #1643 from robintown/remove-storybook
Remove Storybook
2023-09-28 10:11:02 -04:00
Robin
bdc5d701cc Merge branch 'livekit' into remove-storybook 2023-09-28 10:08:51 -04:00
Robin
686529183c Merge pull request #1644 from robintown/remove-inspector
Remove the group call inspector
2023-09-28 09:57:27 -04:00
Robin
44dbe77757 Merge branch 'livekit' into remove-inspector 2023-09-28 09:54:37 -04:00
Robin
5134ff8e0a Merge pull request #1649 from robintown/fix-svg-import
Fix a broken SVG import
2023-09-28 09:49:22 -04:00
Robin
98bbd9ba3f Merge pull request #1645 from robintown/name-tag-color
Update the colors of name tags
2023-09-28 09:45:24 -04:00
Robin
3245ae9f60 Merge pull request #1641 from robintown/invite-modal
Implement the new invite modal designs
2023-09-28 09:45:03 -04:00
Robin
44a4d7a1d0 Fix a broken SVG import
https://github.com/vector-im/element-call/pull/1642 raced with https://github.com/vector-im/element-call/pull/1625, resulting in a broken import.
2023-09-28 09:44:00 -04:00
Robin
17836113ac Merge pull request #1642 from robintown/participants-icon
Replace the avatar stack in the header with an icon
2023-09-28 09:42:46 -04:00
Robin
7df093a23c Merge branch 'livekit' into invite-modal 2023-09-28 09:42:06 -04:00
Robin
d780193775 Merge pull request #1640 from robintown/fix-i18n-parser
Fix the i18n string scanner
2023-09-28 09:39:10 -04:00
David Baker
426132927f Merge pull request #1647 from vector-im/renovate/posthog-js-1.x-lockfile
Update dependency posthog-js to v1.81.2
2023-09-28 14:24:15 +01:00
renovate[bot]
8fe029d5fa Update dependency posthog-js to v1.81.2 2023-09-28 09:45:11 +00:00
Robin
99216c3b5a Merge pull request #1625 from vector-im/renovate/vite-plugin-svgr-4.x
Update dependency vite-plugin-svgr to v4
2023-09-27 19:08:41 -04:00
Robin
2730cea181 Fix imports 2023-09-27 19:06:10 -04:00
Robin
f0dc5f0eab Merge pull request #1628 from vector-im/renovate/major-sentry-javascript-monorepo
Update sentry-javascript monorepo to v7 (major)
2023-09-27 18:51:52 -04:00
Robin
3297b75f93 Merge pull request #1636 from vector-im/renovate/request-2.x-lockfile
Update dependency @types/request to v2.48.9
2023-09-27 18:50:31 -04:00
Robin
0e9a0eb041 Merge pull request #1626 from vector-im/renovate/vector-im-compound-web-0.x-lockfile
Update dependency @vector-im/compound-web to v0.4.5
2023-09-27 18:49:19 -04:00
Robin
ec4fa5ce83 Merge pull request #1637 from RiotTranslateBot/weblate-element-call-element-call
Translations update from Weblate
2023-09-27 18:37:49 -04:00
Robin
a7556f66b1 Update the colors of name tags
This was changed in the designs so we don't have to hard-code colors for them anymore.
2023-09-27 18:36:14 -04:00
Robin
05013cc510 Remove Storybook
As discussed in today's team meeting, no one is using the Storybook files anymore, and they're a maintenance burden, so we should remove them.
2023-09-27 18:32:11 -04:00
Robin
1dc4ef67f3 Remove the group call inspector
It's unused ever since we switched to LiveKit, and we intend to use other telemetry mechanisms going forward to fill this debugging use case, so it can be removed as discussed in today's team meeting.
2023-09-27 18:27:42 -04:00
Robin
916a88712a Replace the avatar stack in the header with an icon
This is a design update.
2023-09-27 18:12:04 -04:00
Robin
d0416e71cb Fix the i18n string scanner
Apparently the upgrade to i18next-parser v8 came with the deprecation of this 'useKeysAsDefaultValues' option, and this is the new way to configure that behavior.
2023-09-27 17:53:04 -04:00
Robin
2069c13bb8 Regenerate strings 2023-09-27 17:52:43 -04:00
Robin
8a14d60cb4 Implement the new invite modal designs 2023-09-27 17:45:18 -04:00
Robin
6865a13c3c Revert "Merge pull request #1603 from vector-im/renovate/babel-monorepo"
This reverts commit 03a2350e5c, reversing
changes made to db67343133.
2023-09-27 17:06:57 -04:00
Robin
a959436ac7 Change wording from 'share' to 'invite'
This was updated in the designs.
2023-09-27 15:17:04 -04:00
random
60f264620c Translated using Weblate (Italian)
Currently translated at 100.0% (124 of 124 strings)

Translation: Element Call/element-call
Translate-URL: https://translate.element.io/projects/element-call/element-call/it/
2023-09-27 13:52:55 +00:00
raspin0
c11b71abf6 Translated using Weblate (Polish)
Currently translated at 100.0% (124 of 124 strings)

Translation: Element Call/element-call
Translate-URL: https://translate.element.io/projects/element-call/element-call/pl/
2023-09-27 13:52:55 +00:00
renovate[bot]
752ba126dc Update dependency @types/request to v2.48.9 2023-09-27 11:58:13 +00:00
renovate[bot]
9cfaff8cdb Update sentry-javascript monorepo to v7 2023-09-27 01:08:38 +00:00
renovate[bot]
55f129e651 Update dependency @vector-im/compound-web to v0.4.5 2023-09-26 22:41:39 +00:00
renovate[bot]
b72eba33e2 Update dependency vite-plugin-svgr to v4 2023-09-26 19:36:47 +00:00
Robin
a7624806b2 Upgrade eslint-plugin-matrix-org to 1.2.1
This upgrade came with a number of new lints that needed to be fixed across the code base. Primarily: explicit return types on functions, and explicit visibility modifiers on class members.
2023-09-22 18:07:06 -04:00
176 changed files with 3143 additions and 10138 deletions

View File

@@ -1,13 +1,31 @@
const COPYRIGHT_HEADER = `/*
Copyright %%CURRENT_YEAR%% 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.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
`;
module.exports = {
plugins: ["matrix-org"],
extends: [
"prettier",
"plugin:matrix-org/react",
"plugin:matrix-org/a11y",
"plugin:matrix-org/typescript",
"prettier",
],
parserOptions: {
ecmaVersion: 2018,
ecmaVersion: "latest",
sourceType: "module",
project: ["./tsconfig.json"],
},
@@ -15,29 +33,13 @@ module.exports = {
browser: true,
node: true,
},
parserOptions: {
ecmaVersion: "latest",
sourceType: "module",
},
rules: {
"jsx-a11y/media-has-caption": ["off"],
"matrix-org/require-copyright-header": ["error", COPYRIGHT_HEADER],
"jsx-a11y/media-has-caption": "off",
"deprecate/import": "off", // Disabled because it crashes the linter
// We should use the js-sdk logger, never console directly.
"no-console": ["error"],
},
overrides: [
{
files: ["src/**/*.{ts,tsx}", "test/**/*.{ts,tsx}"],
extends: [
"plugin:matrix-org/typescript",
"plugin:matrix-org/react",
"prettier",
],
rules: {
// We're aiming to convert this code to strict mode
"@typescript-eslint/no-non-null-assertion": "off",
// We should use the js-sdk logger, never console directly.
"no-console": ["error"],
},
},
],
settings: {
react: {
version: "detect",

View File

@@ -75,7 +75,7 @@ jobs:
uses: docker/setup-buildx-action@dedd61cf5d839122591f5027c89bf3ad27691d18
- name: Build and push Docker image
uses: docker/build-push-action@4c1b68d83ad20cc1a09620ca477d5bbbb5fa14d0
uses: docker/build-push-action@0f847266c302569530c95bfa228489494c43b002
with:
context: .
platforms: linux/amd64,linux/arm64

View File

@@ -14,7 +14,7 @@ module.exports = {
Array.isArray(item) &&
item.length > 0 &&
item[0].name === "vite-plugin-mdx"
)
),
);
config.plugins.push(svgrPlugin());
config.resolve = config.resolve || {};

View File

@@ -18,5 +18,6 @@ export default {
output: "public/locales/$LOCALE/$NAMESPACE.json",
input: ["src/**/*.{ts,tsx}"],
sort: true,
useKeysAsDefaultValue: true,
// The key becomes the English version of the string
defaultValue: (_l, _ns, key) => key,
};

View File

@@ -5,8 +5,6 @@
"dev": "vite",
"build": "NODE_OPTIONS=--max-old-space-size=16384 vite build",
"serve": "vite preview",
"storybook": "start-storybook -p 6006",
"build-storybook": "build-storybook",
"prettier:check": "prettier -c .",
"prettier:format": "prettier -w .",
"lint": "yarn lint:types && yarn lint:eslint",
@@ -44,13 +42,15 @@
"@react-stately/select": "^3.1.3",
"@react-stately/tooltip": "^3.0.5",
"@react-stately/tree": "^3.2.0",
"@sentry/react": "^6.13.3",
"@sentry/tracing": "^6.13.3",
"@sentry/react": "^7.0.0",
"@sentry/tracing": "^7.0.0",
"@types/lodash": "^4.14.199",
"@use-gesture/react": "^10.2.11",
"@vector-im/compound-design-tokens": "^0.0.6",
"@vector-im/compound-web": "^0.4.0",
"@vector-im/compound-web": "^0.5.0",
"@vitejs/plugin-basic-ssl": "^1.0.1",
"@vitejs/plugin-react": "^4.0.1",
"buffer": "^6.0.3",
"classnames": "^2.3.1",
"events": "^3.3.0",
"i18next": "^23.0.0",
@@ -58,18 +58,15 @@
"i18next-http-backend": "^2.0.0",
"livekit-client": "^1.12.3",
"lodash": "^4.17.21",
"matrix-js-sdk": "github:matrix-org/matrix-js-sdk#6385c9c0dab8fe67bd3a8992a4777f243fdd1b68",
"matrix-js-sdk": "github:matrix-org/matrix-js-sdk#c8f8fb587d29dce22d314bfc16bf25a76b04e8bb",
"matrix-widget-api": "^1.3.1",
"mermaid": "^9.0.0",
"normalize.css": "^8.0.1",
"pako": "^2.0.4",
"postcss-preset-env": "^9.0.0",
"posthog-js": "^1.29.0",
"re-resizable": "^6.9.0",
"react": "18",
"react-dom": "18",
"react-i18next": "^13.0.0",
"react-json-view": "^1.21.3",
"react-router-dom": "^5.2.0",
"react-use-clipboard": "^1.0.7",
"react-use-measure": "^2.1.1",
@@ -77,16 +74,19 @@
"tinyqueue": "^2.0.3",
"unique-names-generator": "^4.6.0",
"uuid": "9",
"vaul": "^0.6.1"
"vaul": "^0.7.0"
},
"devDependencies": {
"@babel/core": "^7.16.5",
"@babel/preset-env": "^7.22.20",
"@babel/preset-react": "^7.22.15",
"@babel/preset-typescript": "^7.23.0",
"@react-spring/rafz": "^9.7.3",
"@react-types/dialog": "^3.5.5",
"@sentry/vite-plugin": "^2.0.0",
"@storybook/react": "^6.5.0-alpha.5",
"@testing-library/jest-dom": "^6.0.0",
"@testing-library/react": "^14.0.0",
"@testing-library/user-event": "^14.5.1",
"@types/content-type": "^1.1.5",
"@types/d3": "^7.4.0",
"@types/dom-screen-wake-lock": "^1.0.1",
@@ -105,23 +105,25 @@
"eslint": "^8.14.0",
"eslint-config-google": "^0.14.0",
"eslint-config-prettier": "^9.0.0",
"eslint-plugin-deprecate": "^0.8.2",
"eslint-plugin-import": "^2.26.0",
"eslint-plugin-jsx-a11y": "^6.5.1",
"eslint-plugin-matrix-org": "^0.4.0",
"eslint-plugin-matrix-org": "^1.2.1",
"eslint-plugin-react": "^7.29.4",
"eslint-plugin-react-hooks": "^4.5.0",
"eslint-plugin-unicorn": "^48.0.1",
"i18next-parser": "^8.0.0",
"identity-obj-proxy": "^3.0.0",
"jest": "^29.2.2",
"jest-environment-jsdom": "^29.3.1",
"jest-mock": "^29.5.0",
"prettier": "^2.6.2",
"prettier": "^3.0.0",
"sass": "^1.42.1",
"storybook-builder-vite": "^0.1.12",
"typescript": "^5.1.6",
"typescript-eslint-language-service": "^5.0.5",
"vite": "^4.2.0",
"vite-plugin-html-template": "^1.1.0",
"vite-plugin-svgr": "^3.2.0"
"vite-plugin-svgr": "^4.0.0"
},
"jest": {
"testEnvironment": "./test/environment.ts",
@@ -134,7 +136,7 @@
],
"moduleNameMapper": {
"\\.css$": "identity-obj-proxy",
"\\.svg$": "<rootDir>/test/mocks/svgr.ts",
"\\.svg\\?react$": "<rootDir>/test/mocks/svgr.ts",
"^\\./IndexedDBWorker\\?worker$": "<rootDir>/test/mocks/workerMock.ts",
"^\\./olm$": "<rootDir>/test/mocks/olmMock.ts"
},

View File

@@ -0,0 +1,26 @@
{
"applinks": {
"details": [
{
"appIDs": [
"7J4U792NQT.io.element.elementx",
"7J4U792NQT.io.element.elementx.nightly",
"7J4U792NQT.io.element.elementx.pr"
],
"components": [
{
"?": {
"no_universal_links": "?*"
},
"exclude": true,
"comment": "Opt out of universal links"
},
{
"/": "/*",
"comment": "Matches any URL"
}
]
}
]
}
}

View File

@@ -1,15 +0,0 @@
{
"applinks": {
"apps": [],
"details": [
{
"appIDs": [
"7J4U792NQT.io.element.elementx",
"7J4U792NQT.io.element.elementx.nightly",
"7J4U792NQT.io.element.elementx.pr"
],
"paths": ["*"]
}
]
}
}

View File

@@ -1,4 +1,4 @@
<!DOCTYPE html>
<!doctype html>
<html lang="en">
<head>
<meta charset="UTF-8" />

View File

@@ -9,19 +9,15 @@
"Close": "Затвори",
"Confirm password": "Потвърди паролата",
"Copied!": "Копирано!",
"Copy and share this call link": "Копирай и сподели връзка към разговора",
"Create account": "Създай акаунт",
"Debug log": "Debug логове",
"Debug log request": "Заявка за debug логове",
"Developer": "Разработчик",
"Display name": "Име/псевдоним",
"Download debug logs": "Изтеглете debug логове",
"Exit full screen": "Излез от цял екран",
"Full screen": "Цял екран",
"Go": "Напред",
"Home": "Начало",
"Include debug logs": "Включи debug логове",
"Inspector": "Инспектор",
"Join call": "Влез в разговора",
"Join call now": "Влез в разговора сега",
"Join existing call?": "Присъединяване към съществуващ разговор?",
@@ -49,7 +45,6 @@
"Sending…": "Изпращане…",
"Settings": "Настройки",
"Share screen": "Сподели екрана",
"Show call inspector": "Покажи инспектора на разговора",
"Sign in": "Влез",
"Sign out": "Излез",
"Speaker": "Говорител",

View File

@@ -1,5 +1,4 @@
{
"Copy and share this call link": "Zkopírujte a sdílejte odkaz na hovor",
"Copied!": "Zkopírováno!",
"Confirm password": "Potvrdit heslo",
"Close": "Zavřít",
@@ -18,7 +17,6 @@
"Speaker": "Reproduktor",
"Sign out": "Odhlásit se",
"Sign in": "Přihlásit se",
"Show call inspector": "Zobrazit inspektor hovoru",
"Share screen": "Sdílet obrazovku",
"Settings": "Nastavení",
"Sending…": "Posílání…",
@@ -43,7 +41,6 @@
"Loading…": "Načítání…",
"Join call now": "Připojit se k hovoru",
"Join call": "Připojit se k hovoru",
"Inspector": "Insepktor",
"Spotlight": "Soustředěný mód",
"Recaptcha not loaded": "Recaptcha se nenačetla",
"Recaptcha dismissed": "Recaptcha byla zamítnuta",
@@ -55,11 +52,9 @@
"Full screen": "Zvětšit na celou obrazovku",
"Exit full screen": "Ukončit režim celé obrazovky",
"Element Call Home": "Domov Element Call",
"Download debug logs": "Stáhnout ladící záznamy",
"Display name": "Zobrazované jméno",
"Developer": "Vývojář",
"Debug log request": "Žádost o protokoly ladění",
"Debug log": "Protokoly ladění",
"Create account": "Vytvořit účet",
"Copy": "Kopírovat",
"Another user on this call is having an issue. In order to better diagnose these issues we'd like to collect a debug log.": "Jiný uživatel v tomto hovoru má problémy. Abychom mohli diagnostikovat problém, rádi bychom shromáždili protokoly ladění.",

View File

@@ -9,19 +9,15 @@
"Close": "Schließen",
"Confirm password": "Passwort bestätigen",
"Copied!": "Kopiert!",
"Copy and share this call link": "Kopiere und teile diesen Anruflink",
"Create account": "Konto erstellen",
"Debug log": "Debug-Protokoll",
"Debug log request": "Debug-Log Anfrage",
"Developer": "Entwickler",
"Display name": "Anzeigename",
"Download debug logs": "Debug-Protokolle herunterladen",
"Exit full screen": "Vollbildmodus verlassen",
"Full screen": "Vollbild",
"Go": "Los gehts",
"Home": "Startseite",
"Include debug logs": "Debug-Protokolle einschließen",
"Inspector": "Inspektor",
"Join call": "Anruf beitreten",
"Join call now": "Anruf beitreten",
"Join existing call?": "An bestehendem Anruf teilnehmen?",
@@ -49,7 +45,6 @@
"Sending…": "Senden …",
"Settings": "Einstellungen",
"Share screen": "Bildschirm teilen",
"Show call inspector": "Anrufinspektor anzeigen",
"Sign in": "Anmelden",
"Sign out": "Abmelden",
"Speaker": "Wiedergabegerät",
@@ -104,9 +99,6 @@
"Microphone on": "Mikrofon an",
"{{count, number}}|one": "{{count, number}}",
"{{count, number}}|other": "{{count, number}}",
"{{names, list(style: short;)}}": "{{names, list(style: short;)}}",
"Share": "Teilen",
"Share this call": "Diesen Anruf teilen",
"Sharing screen": "Bildschirm wird geteilt",
"You": "Du",
"Continue in browser": "Weiter im Browser",
@@ -122,5 +114,10 @@
"Start new call": "Neuen Anruf beginnen",
"Call not found": "Anruf nicht gefunden",
"Calls are now end-to-end encrypted and need to be created from the home page. This helps make sure everyone's using the same encryption key.": "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.",
"Your web browser does not support media end-to-end encryption. Supported Browsers are Chrome, Safari, Firefox >=117": "Dein Webbrowser unterstützt keine Medien-Ende-zu-Ende-Verschlüsselung. Unterstützte Browser sind Chrome, Safari, Firefox >=117"
"Your web browser does not support media end-to-end encryption. Supported Browsers are Chrome, Safari, Firefox >=117": "Dein Webbrowser unterstützt keine Medien-Ende-zu-Ende-Verschlüsselung. Unterstützte Browser sind Chrome, Safari, Firefox >=117",
"Copy link": "Link kopieren",
"Invite": "Einladen",
"Invite to this call": "Zu diesem Anruf einladen",
"Link copied to clipboard": "Link in Zwischenablage kopiert",
"Participants": "Teilnehmende"
}

View File

@@ -3,7 +3,6 @@
"User menu": "Μενού χρήστη",
"Submit feedback": "Υποβάλετε σχόλια",
"Sign in": "Σύνδεση",
"Show call inspector": "Εμφάνιση του επιθεωρητή κλήσης",
"Share screen": "Κοινή χρήση οθόνης",
"Sending…": "Αποστολή…",
"Select an option": "Επιλέξτε μια επιλογή",
@@ -12,7 +11,6 @@
"Not registered yet? <2>Create an account</2>": "Δεν έχετε εγγραφεί ακόμα; <2>Δημιουργήστε λογαριασμό</2>",
"Login to your account": "Συνδεθείτε στον λογαριασμό σας",
"Logging in…": "Σύνδεση…",
"Inspector": "Επιθεωρητής",
"Display name": "Εμφανιζόμενο όνομα",
"Developer Settings": "Ρυθμίσεις προγραμματιστή",
"Debug log request": "Αίτημα αρχείου καταγραφής",
@@ -46,7 +44,6 @@
"Full screen": "Πλήρη οθόνη",
"Exit full screen": "Έξοδος από πλήρη οθόνη",
"Create account": "Δημιουργία λογαριασμού",
"Copy and share this call link": "Αντιγράψτε και μοιραστείτε αυτόν τον σύνδεσμο κλήσης",
"Copy": "Αντιγραφή",
"Copied!": "Αντιγράφηκε!",
"Confirm password": "Επιβεβαίωση κωδικού",
@@ -77,9 +74,7 @@
"How did it go?": "Πώς σας φάνηκε;",
"Include debug logs": "Να συμπεριληφθούν αρχεία καταγραφής",
"Recaptcha not loaded": "Το Recaptcha δεν φορτώθηκε",
"Debug log": "Αρχείο καταγραφής",
"Developer": "Προγραμματιστής",
"Download debug logs": "Λήψη αρχείων καταγραφής",
"Sending debug logs…": "Αποστολή αρχείων καταγραφής…",
"Submit": "Υποβολή",
"Your feedback": "Τα σχόλιά σας",

View File

@@ -5,7 +5,6 @@
"{{count}} stars|other": "{{count}} stars",
"{{displayName}} is presenting": "{{displayName}} is presenting",
"{{displayName}}, your call has ended.": "{{displayName}}, your call has ended.",
"{{names, list(style: short;)}}": "{{names, list(style: short;)}}",
"<0></0><1></1>You may withdraw consent by unchecking this box. If you are currently in a call, this setting will take effect at the end of the call.": "<0></0><1></1>You may withdraw consent by unchecking this box. If you are currently in a call, this setting will take effect at the end of the call.",
"<0>Already have an account?</0><1><0>Log in</0> Or <2>Access as a guest</2></1>": "<0>Already have an account?</0><1><0>Log in</0> Or <2>Access as a guest</2></1>",
"<0>Create an account</0> Or <2>Access as a guest</2>": "<0>Create an account</0> Or <2>Access as a guest</2>",
@@ -30,14 +29,12 @@
"Continue in browser": "Continue in browser",
"Copied!": "Copied!",
"Copy": "Copy",
"Copy and share this call link": "Copy and share this call link",
"Copy link": "Copy link",
"Create account": "Create account",
"Debug log": "Debug log",
"Debug log request": "Debug log request",
"Developer": "Developer",
"Developer Settings": "Developer Settings",
"Display name": "Display name",
"Download debug logs": "Download debug logs",
"Element Call Home": "Element Call Home",
"Element Call is temporarily not end-to-end encrypted while we test scalability.": "Element Call is temporarily not end-to-end encrypted while we test scalability.",
"Enable end-to-end encryption (password protected calls)": "Enable end-to-end encryption (password protected calls)",
@@ -54,10 +51,12 @@
"How did it go?": "How did it go?",
"If you are experiencing issues or simply would like to provide some feedback, please send us a short description below.": "If you are experiencing issues or simply would like to provide some feedback, please send us a short description below.",
"Include debug logs": "Include debug logs",
"Inspector": "Inspector",
"Invite": "Invite",
"Invite to this call": "Invite to this call",
"Join call": "Join call",
"Join call now": "Join call now",
"Join existing call?": "Join existing call?",
"Link copied to clipboard": "Link copied to clipboard",
"Loading…": "Loading…",
"Local volume": "Local volume",
"Logging in…": "Logging in…",
@@ -74,6 +73,7 @@
"Not now, return to home screen": "Not now, return to home screen",
"Not registered yet? <2>Create an account</2>": "Not registered yet? <2>Create an account</2>",
"Open in the app": "Open in the app",
"Participants": "Participants",
"Password": "Password",
"Passwords must match": "Passwords must match",
"Profile": "Profile",
@@ -92,11 +92,8 @@
"Sending debug logs…": "Sending debug logs…",
"Sending…": "Sending…",
"Settings": "Settings",
"Share": "Share",
"Share screen": "Share screen",
"Share this call": "Share this call",
"Sharing screen": "Sharing screen",
"Show call inspector": "Show call inspector",
"Show connection stats": "Show connection stats",
"Sign in": "Sign in",
"Sign out": "Sign out",

View File

@@ -15,7 +15,6 @@
"Speaker": "Altavoz",
"Sign out": "Cerrar sesión",
"Sign in": "Iniciar sesión",
"Show call inspector": "Mostrar inspector de llamada",
"Share screen": "Compartir pantalla",
"Settings": "Ajustes",
"Sending…": "Enviando…",
@@ -41,19 +40,15 @@
"Join existing call?": "¿Unirse a llamada existente?",
"Join call now": "Unirse a la llamada ahora",
"Join call": "Unirse a la llamada",
"Inspector": "Inspector",
"Include debug logs": "Incluir registros de depuración",
"Home": "Inicio",
"Go": "Comenzar",
"Full screen": "Pantalla completa",
"Exit full screen": "Salir de pantalla completa",
"Download debug logs": "Descargar registros de depuración",
"Display name": "Nombre a mostrar",
"Developer": "Desarrollador",
"Debug log request": "Petición de registros de depuración",
"Debug log": "Registro de depuración",
"Create account": "Crear cuenta",
"Copy and share this call link": "Copiar y compartir el enlace de la llamada",
"Copied!": "¡Copiado!",
"Confirm password": "Confirmar contraseña",
"Close": "Cerrar",

View File

@@ -2,19 +2,15 @@
"<0>Why not finish by setting up a password to keep your account?</0><1>You'll be able to keep your name and set an avatar for use on future calls</1>": "<0>Kas soovid salasõna seadistada ja sellega oma kasutajakonto alles jätta?</0><1>Nii saad säilitada oma nime ja määrata profiilipildi, mida saad kasutada tulevastes kõnedes</1>",
"<0>Create an account</0> Or <2>Access as a guest</2>": "<0>Loo konto</0> Või <2>Sisene külalisena</2>",
"<0>Already have an account?</0><1><0>Log in</0> Or <2>Access as a guest</2></1>": "<0>On sul juba konto?</0><1><0>Logi sisse</0> Või <2>Logi sisse külalisena</2></1>",
"Inspector": "Inspektor",
"Include debug logs": "Lisa veatuvastuslogid",
"Home": "Avavaatesse",
"Go": "Jätka",
"Full screen": "Täisekraan",
"Exit full screen": "Välju täisekraanivaatest",
"Download debug logs": "Lae alla veatuvastuslogid",
"Display name": "Kuvatav nimi",
"Developer": "Arendaja",
"Debug log request": "Veaotsingulogi päring",
"Debug log": "Veaotsingulogi",
"Create account": "Loo konto",
"Copy and share this call link": "Kopeeri ja jaga selle kõne linki",
"Copied!": "Kopeeritud!",
"Confirm password": "Kinnita salasõna",
"Close": "Sulge",
@@ -42,7 +38,6 @@
"Speaker": "Kõlar",
"Sign out": "Logi välja",
"Sign in": "Logi sisse",
"Show call inspector": "Näita kõneteavet",
"Share screen": "Jaga ekraani",
"Settings": "Seadistused",
"Sending…": "Saatmine…",
@@ -102,12 +97,9 @@
"Microphone off": "Mikrofon ei tööta",
"Microphone on": "Mikrofon töötab",
"Not encrypted": "Krüptimata",
"Share": "Jaga",
"Share this call": "Jaga seda kõnet",
"Sharing screen": "Ekraanivaade on jagamisel",
"{{count, number}}|one": "{{count, number}}",
"{{count, number}}|other": "{{count, number}}",
"{{names, list(style: short;)}}": "{{names, list(style: short;)}}",
"You": "Sina",
"Continue in browser": "Jätka veebibrauseris",
"Mute microphone": "Summuta mikrofon",
@@ -122,5 +114,10 @@
"Unmute microphone": "Lülita mikrofon sisse",
"Call not found": "Kõnet ei leidu",
"Calls are now end-to-end encrypted and need to be created from the home page. This helps make sure everyone's using the same encryption key.": "Kõned on nüüd läbivalt krüptitud ning need pead looma kodulehelt. Sellega tagad, et kõik kasutavad samu krüptovõtmeid.",
"Your web browser does not support media end-to-end encryption. Supported Browsers are Chrome, Safari, Firefox >=117": "Sinu veebibrauser ei toeta meedia läbivat krüptimist. Toetatud brauserid on Chrome, Chromium, Safari ja Firefox >=117"
"Your web browser does not support media end-to-end encryption. Supported Browsers are Chrome, Safari, Firefox >=117": "Sinu veebibrauser ei toeta meedia läbivat krüptimist. Toetatud brauserid on Chrome, Chromium, Safari ja Firefox >=117",
"Invite": "Kutsu",
"Link copied to clipboard": "Link on kopeeritud lõikelauale",
"Participants": "Osalejad",
"Copy link": "Kopeeri link",
"Invite to this call": "Kutsu liituma selle kõnaga"
}

View File

@@ -20,13 +20,10 @@
"Go": "رفتن",
"Full screen": "تمام صحفه",
"Exit full screen": "خروج از حالت تمام صفحه",
"Download debug logs": "دانلود لاگ عیب‌یابی",
"Display name": "نام نمایشی",
"Developer": "توسعه دهنده",
"Debug log request": "درخواست لاگ عیب‌یابی",
"Debug log": "لاگ عیب‌یابی",
"Create account": "ساخت حساب کاربری",
"Copy and share this call link": "لینک تماس را کپی کنید و به اشتراک بگذارید",
"Copied!": "کپی شد!",
"Confirm password": "تایید رمزعبور",
"Close": "بستن",
@@ -38,9 +35,7 @@
"<0>Create an account</0> Or <2>Access as a guest</2>": "<0>ساخت حساب کاربری</0> Or <2>دسترسی به عنوان میهمان</2>",
"<0>Already have an account?</0><1><0>Log in</0> Or <2>Access as a guest</2></1>": "<0>از قبل حساب کاربری دارید؟</0><1><0>ورود</0> Or <2>به عنوان یک میهمان وارد شوید</2></1>",
"Local volume": "حجم داخلی",
"Inspector": "بازرس",
"Spotlight": "نور افکن",
"Show call inspector": "نمایش بازرس تماس",
"Share screen": "اشتراک گذاری صفحه نمایش",
"Sending…": "در حال ارسال…",
"Sending debug logs…": "در حال ارسال باگ‌های عیب‌یابی…",

View File

@@ -8,19 +8,15 @@
"Close": "Fermer",
"Confirm password": "Confirmer le mot de passe",
"Copied!": "Copié !",
"Copy and share this call link": "Copier et partager le lien de cet appel",
"Create account": "Créer un compte",
"Debug log": "Journal de débogage",
"Debug log request": "Demande dun journal de débogage",
"Developer": "Développeur",
"Display name": "Nom daffichage",
"Download debug logs": "Télécharger les journaux de débogage",
"Exit full screen": "Quitter le plein écran",
"Full screen": "Plein écran",
"Go": "Commencer",
"Home": "Accueil",
"Include debug logs": "Inclure les journaux de débogage",
"Inspector": "Inspecteur",
"Join call": "Rejoindre lappel",
"Join call now": "Rejoindre lappel maintenant",
"Join existing call?": "Rejoindre un appel existant ?",
@@ -48,7 +44,6 @@
"Sending…": "Envoi…",
"Settings": "Paramètres",
"Share screen": "Partage décran",
"Show call inspector": "Afficher linspecteur dappel",
"Sign in": "Connexion",
"Sign out": "Déconnexion",
"Spotlight": "Premier plan",
@@ -97,14 +92,11 @@
"End-to-end encryption isn't supported on your browser.": "Le chiffrement de bout-en-bout nest pas pris en charge par votre navigateur.",
"Enable end-to-end encryption (password protected calls)": "Activer le chiffrement de bout-en-bout (appels protégés par mot de passe)",
"{{count, number}}|other": "{{count, number}}",
"{{names, list(style: short;)}}": "{{names, list(style: short;)}}",
"Encrypted": "Chiffré",
"End call": "Terminer lappel",
"Grid": "Grille",
"Microphone off": "Microphone éteint",
"Microphone on": "Microphone allumé",
"Share": "Partager",
"Share this call": "Partager cet appel",
"Sharing screen": "Lécran est partagé",
"{{count, number}}|one": "{{count, number}}",
"Not encrypted": "Non chiffré",
@@ -122,5 +114,10 @@
"Unmute microphone": "Allumer le microphone",
"Call not found": "Appel non trouvé",
"Calls are now end-to-end encrypted and need to be created from the home page. This helps make sure everyone's using the same encryption key.": "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.",
"Your web browser does not support media end-to-end encryption. Supported Browsers are Chrome, Safari, Firefox >=117": "Votre navigateur web ne prend pas en charge le chiffrement de bout-en-bout des médias. Les navigateurs pris en charge sont Chrome, Safari, Firefox >= 117"
"Your web browser does not support media end-to-end encryption. Supported Browsers are Chrome, Safari, Firefox >=117": "Votre navigateur web ne prend pas en charge le chiffrement de bout-en-bout des médias. Les navigateurs pris en charge sont Chrome, Safari, Firefox >= 117",
"Copy link": "Copier le lien",
"Invite": "Inviter",
"Invite to this call": "Inviter dans cet appel",
"Link copied to clipboard": "Lien copié dans le presse-papier",
"Participants": "Participants"
}

View File

@@ -9,19 +9,15 @@
"Close": "Tutup",
"Confirm password": "Konfirmasi kata sandi",
"Copied!": "Disalin!",
"Copy and share this call link": "Salin dan bagikan tautan panggilan ini",
"Create account": "Buat akun",
"Debug log": "Catatan pengawakutuan",
"Debug log request": "Permintaan catatan pengawakutuan",
"Developer": "Pengembang",
"Display name": "Nama tampilan",
"Download debug logs": "Unduh catatan pengawakutuan",
"Exit full screen": "Keluar dari layar penuh",
"Full screen": "Layar penuh",
"Go": "Bergabung",
"Home": "Beranda",
"Include debug logs": "Termasuk catatan pengawakutuan",
"Inspector": "Inspektur",
"Join call": "Bergabung ke panggilan",
"Join call now": "Bergabung ke panggilan sekarang",
"Join existing call?": "Bergabung ke panggilan yang sudah ada?",
@@ -49,7 +45,6 @@
"Sending…": "Mengirimkan…",
"Settings": "Pengaturan",
"Share screen": "Bagikan layar",
"Show call inspector": "Tampilkan inspektur panggilan",
"Sign in": "Masuk",
"Sign out": "Keluar",
"Speaker": "Pembicara",
@@ -103,11 +98,8 @@
"Microphone off": "Mikrofon dimatikan",
"Microphone on": "Mikrofon dinyalakan",
"Not encrypted": "Tidak terenkripsi",
"Share": "Bagikan",
"Share this call": "Bagikan panggilan ini",
"Sharing screen": "Berbagi layar",
"{{count, number}}|one": "{{count, number}}",
"{{names, list(style: short;)}}": "{{names, list(style: short;)}}",
"You": "Anda",
"Continue in browser": "Lanjutkan dalam peramban",
"Mute microphone": "Matikan mikrofon",
@@ -122,5 +114,10 @@
"Back to recents": "Kembali ke terkini",
"Call not found": "Panggilan tidak ditemukan",
"Calls are now end-to-end encrypted and need to be created from the home page. This helps make sure everyone's using the same encryption key.": "Panggilan sekarang terenkripsi secara ujung ke ujung dan harus dibuat dari laman beranda. Ini memastikan bahwa semuanya menggunakan kunci enkripsi yang sama.",
"Your web browser does not support media end-to-end encryption. Supported Browsers are Chrome, Safari, Firefox >=117": "Peramban web Anda tidak mendukung enkripsi media ujung ke ujung. Peramban yang didukung adalah Chrome, Safari, dan Firefox >=117"
"Your web browser does not support media end-to-end encryption. Supported Browsers are Chrome, Safari, Firefox >=117": "Peramban web Anda tidak mendukung enkripsi media ujung ke ujung. Peramban yang didukung adalah Chrome, Safari, dan Firefox >=117",
"Invite": "Undang",
"Invite to this call": "Undang ke panggilan ini",
"Participants": "Peserta",
"Copy link": "Salin tautan",
"Link copied to clipboard": "Tautan disalin ke papan klip"
}

View File

@@ -4,7 +4,6 @@
"{{count}} stars|one": "{{count}} stelle",
"{{count}} stars|other": "{{count}} stelle",
"{{displayName}} is presenting": "{{displayName}} sta presentando",
"{{names, list(style: short;)}}": "{{names, list(style: short;)}}",
"<0>Already have an account?</0><1><0>Log in</0> Or <2>Access as a guest</2></1>": "<0>Hai già un profilo?</0><1><0>Accedi</0> o <2>Accedi come ospite</2></1>",
"<0>Create an account</0> Or <2>Access as a guest</2>": "<0>Crea un profilo</0> o <2>Accedi come ospite</2>",
"<0>Oops, something's gone wrong.</0>": "<0>Ops, qualcosa è andato storto.</0>",
@@ -20,14 +19,11 @@
"Connectivity to the server has been lost.": "La connessione al server è stata persa.",
"Copied!": "Copiato!",
"Copy": "Copia",
"Copy and share this call link": "Copia e condividi questo collegamento alla chiamata",
"Create account": "Crea profilo",
"Debug log": "Registro di debug",
"Debug log request": "Richiesta registro di debug",
"Developer": "Sviluppatore",
"Developer Settings": "Impostazioni per sviluppatori",
"Display name": "Nome da mostrare",
"Download debug logs": "Scarica registri di debug",
"Display name": "Il tuo nome",
"Element Call Home": "Inizio di Element Call",
"Enable end-to-end encryption (password protected calls)": "Attiva crittografia end-to-end (chiamate protette da password)",
"Encrypted": "Cifrata",
@@ -54,7 +50,6 @@
"More": "Altro",
"No": "No",
"Not encrypted": "Non cifrata",
"Inspector": "Ispettore",
"Join existing call?": "Entrare in una chiamata esistente?",
"Not registered yet? <2>Create an account</2>": "Non hai ancora un profilo? <2>Creane uno</2>",
"Password": "Password",
@@ -73,9 +68,7 @@
"Sending debug logs…": "Invio dei registri di debug…",
"Sending…": "Invio…",
"Settings": "Impostazioni",
"Share": "Condividi",
"Share screen": "Condividi schermo",
"Share this call": "Condividi questa chiamata",
"Sharing screen": "Condivisione schermo",
"Show connection stats": "Mostra statistiche connessione",
"Sign in": "Accedi",
@@ -83,7 +76,6 @@
"Speaker": "Altoparlante",
"Submit": "Invia",
"Submit feedback": "Invia commento",
"Show call inspector": "Mostra ispettore della chiamata",
"Spotlight": "In primo piano",
"Thanks, we received your feedback!": "Grazie, abbiamo ricevuto il tuo commento!",
"Thanks!": "Grazie!",
@@ -119,7 +111,13 @@
"Stop video": "Ferma video",
"Unmute microphone": "Riaccendi il microfono",
"Back to recents": "Torna ai recenti",
"Start new call": "Inizia nuova chiamata",
"Start new call": "Inizia una nuova chiamata",
"Call not found": "Chiamata non trovata",
"Calls are now end-to-end encrypted and need to be created from the home page. This helps make sure everyone's using the same encryption key.": "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."
"Calls are now end-to-end encrypted and need to be created from the home page. This helps make sure everyone's using the same encryption key.": "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.",
"Your web browser does not support media end-to-end encryption. Supported Browsers are Chrome, Safari, Firefox >=117": "Il tuo browser non supporta la crittografia end-to-end dei media. I browser supportati sono Chrome, Safari, Firefox >=117",
"Copy link": "Copia collegamento",
"Invite": "Invita",
"Invite to this call": "Invita a questa chiamata",
"Participants": "Partecipanti",
"Link copied to clipboard": "Collegamento copiato negli appunti"
}

View File

@@ -8,13 +8,10 @@
"Confirm password": "パスワードを確認",
"Close": "閉じる",
"Copied!": "コピーしました!",
"Copy and share this call link": "通話リンクをコピーし共有",
"Copy": "コピー",
"Debug log": "デバッグログ",
"Create account": "アカウントを作成",
"Go": "続行",
"Element Call Home": "Element Call ホーム",
"Download debug logs": "デバッグログをダウンロード",
"Display name": "表示名",
"Developer": "開発者",
"Full screen": "全画面表示",

View File

@@ -16,14 +16,11 @@
"Connectivity to the server has been lost.": "Ir zaudēts savienojums ar serveri.",
"Copied!": "Ievietots starpliktuvē.",
"Copy": "Ievietot starpliktuvē",
"Copy and share this call link": "Ievietot starpliktuvē un kopīgot šo zvana saiti",
"Create account": "Izveidot kontu",
"Debug log": "Atkļūdošanas žurnāls",
"Debug log request": "Atkļūdošanas žurnāla pieprasījums",
"Developer": "Izstrādātājs",
"Developer Settings": "Izstrādātāja iestatījumi",
"Display name": "Attēlojamais vārds",
"Download debug logs": "Lejupielādēt atkļūdošanas žurnāla ierakstus",
"Element Call Home": "Element Call sākums",
"Exit full screen": "Iziet no pilnekrāna",
"Expose developer settings in the settings window.": "Izstādīt izstrādātāja iestatījumus iestatījumu logā.",
@@ -46,7 +43,6 @@
"Your feedback": "Tava atsauksme",
"How did it go?": "Kā Tev veicās?",
"Include debug logs": "Iekļaut atkļūdošanas žurnāla ierakstus",
"Inspector": "Inspektors",
"Join call": "Pievienoties zvanam",
"Join call now": "Pievienoties zvanam tagad",
"Join existing call?": "Pievienoties esošam zvanam?",
@@ -76,7 +72,6 @@
"Sending…": "Nosūta…",
"Settings": "Iestatījumi",
"Share screen": "Kopīgot ekrānu",
"Show call inspector": "Rādīt zvanu inspektoru",
"Show connection stats": "Rādīt savienojuma apkopojumu",
"Sign in": "Pieteikties",
"Sign out": "Atteikties",

View File

@@ -13,7 +13,6 @@
"Speaker": "Głośnik",
"Sign out": "Wyloguj się",
"Sign in": "Zaloguj się",
"Show call inspector": "Pokaż inspektora połączenia",
"Share screen": "Udostępnij ekran",
"Settings": "Ustawienia",
"Sending…": "Wysyłanie…",
@@ -41,18 +40,14 @@
"Join existing call?": "Dołączyć do istniejącego połączenia?",
"Join call now": "Dołącz do połączenia teraz",
"Join call": "Dołącz do połączenia",
"Inspector": "Inspektor",
"Include debug logs": "Dołącz dzienniki debugowania",
"Home": "Strona domowa",
"Full screen": "Pełny ekran",
"Exit full screen": "Opuść pełny ekran",
"Download debug logs": "Pobierz dzienniki debugowania",
"Display name": "Nazwa wyświetlana",
"Developer": "Programista",
"Debug log request": "Prośba o dzienniki debugowania",
"Debug log": "Dzienniki debugowania",
"Create account": "Utwórz konto",
"Copy and share this call link": "Skopiuj i udostępnij link do rozmowy",
"Copied!": "Skopiowano!",
"Confirm password": "Potwierdź hasło",
"Close": "Zamknij",
@@ -103,9 +98,26 @@
"Microphone off": "Mikrofon wyłączony",
"Microphone on": "Mikrofon włączony",
"Not encrypted": "Nie szyfrowane",
"Share": "Udostępnij",
"Share this call": "Udostępnij to połączenie",
"Sharing screen": "Udostępnianie ekranu",
"{{count, number}}|one": "{{count, number}}",
"{{names, list(style: short;)}}": "{{names, list(style: short;)}}"
"Continue in browser": "Kontynuuj w przeglądarce",
"Mute microphone": "Wycisz mikrofon",
"Name of call": "Nazwa połączenia",
"Open in the app": "Otwórz w aplikacji",
"Ready to join?": "Gotowy, by dołączyć?",
"Select app": "Wybierz aplikację",
"Start new call": "Rozpocznij nowe połączenie",
"Start video": "Rozpocznij wideo",
"Back to recents": "Wróć do ostatnie",
"Stop video": "Zakończ wideo",
"Unmute microphone": "Odcisz mikrofon",
"Call not found": "Nie znaleziono połączenia",
"Calls are now end-to-end encrypted and need to be created from the home page. This helps make sure everyone's using the same encryption key.": "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.",
"You": "Ty",
"Your web browser does not support media end-to-end encryption. Supported Browsers are Chrome, Safari, Firefox >=117": "Twoja przeglądarka nie wspiera szyfrowania end-to-end. Wspierane przeglądarki to Chrome, Safari, Firefox >=117",
"Invite": "Zaproś",
"Link copied to clipboard": "Skopiowano link do schowka",
"Participants": "Uczestnicy",
"Copy link": "Kopiuj link",
"Invite to this call": "Zaproś do połączenia"
}

View File

@@ -19,15 +19,12 @@
"Speaker": "Динамик",
"Sign out": "Выйти",
"Sign in": "Войти",
"Show call inspector": "Показать инспектор",
"Share screen": "Поделиться экраном",
"Settings": "Настройки",
"Sending…": "Отправка…",
"Local volume": "Местная громкость",
"Include debug logs": "Приложить журнал отладки",
"Download debug logs": "Скачать журнал отладки",
"Debug log request": "Запрос журнала отладки",
"Debug log": "Журнал отладки",
"Another user on this call is having an issue. In order to better diagnose these issues we'd like to collect a debug log.": "У одного из участников звонка есть неполадки. Чтобы лучше диагностировать похожие проблемы, нам нужен журнал отладки.",
"Send debug logs": "Отправить журнал отладки",
"Return to home screen": "Вернуться в Начало",
@@ -48,7 +45,6 @@
"Join existing call?": "Присоединиться к существующему звонку?",
"Join call now": "Присоединиться сейчас",
"Join call": "Присоединиться",
"Inspector": "Инспектор",
"Home": "Начало",
"Go": "Далее",
"Full screen": "Полноэкранный режим",
@@ -56,7 +52,6 @@
"Display name": "Видимое имя",
"Developer": "Разработчику",
"Create account": "Создать аккаунт",
"Copy and share this call link": "Скопируйте и поделитесь этой ссылкой на звонок",
"Copied!": "Скопировано!",
"Confirm password": "Подтвердите пароль",
"Close": "Закрыть",

View File

@@ -5,7 +5,6 @@
"Element Call Home": "Domov Element Call",
"Waiting for other participants…": "Čaká sa na ďalších účastníkov…",
"Submit feedback": "Odoslať spätnú väzbu",
"Show call inspector": "Zobraziť inšpektora hovorov",
"Share screen": "Zdieľať obrazovku",
"Sending…": "Odosielanie…",
"Sending debug logs…": "Odosielanie záznamov o ladení…",
@@ -32,12 +31,10 @@
"Join existing call?": "Pripojiť sa k existujúcemu hovoru?",
"Join call now": "Pripojiť sa k hovoru teraz",
"Join call": "Pripojiť sa k hovoru",
"Inspector": "Inšpektor",
"Home": "Domov",
"Go": "Prejsť",
"Full screen": "Zobrazenie na celú obrazovku",
"Exit full screen": "Ukončiť zobrazenie na celú obrazovku",
"Download debug logs": "Stiahnuť záznamy ladenia",
"Yes, join call": "Áno, pripojiť sa k hovoru",
"Video": "Video",
"Version: {{version}}": "Verzia: {{version}}",
@@ -51,9 +48,7 @@
"Display name": "Zobrazované meno",
"Developer": "Vývojár",
"Debug log request": "Žiadosť o záznam ladenia",
"Debug log": "Záznam o ladení",
"Create account": "Vytvoriť účet",
"Copy and share this call link": "Skopírovať a zdieľať tento odkaz na hovor",
"Copy": "Kopírovať",
"Copied!": "Skopírované!",
"Confirm password": "Potvrdiť heslo",
@@ -103,11 +98,8 @@
"Microphone on": "Mikrofón zapnutý",
"Grid": "Sieť",
"Not encrypted": "Nie je zašifrované",
"Share": "Zdieľať",
"Sharing screen": "Zdieľanie obrazovky",
"{{count, number}}|one": "{{count, number}}",
"Share this call": "Zdieľať tento hovor",
"{{names, list(style: short;)}}": "{{names, list(style: short;)}}",
"You": "Vy",
"Continue in browser": "Pokračovať v prehliadači",
"Mute microphone": "Stlmiť mikrofón",
@@ -122,5 +114,10 @@
"Unmute microphone": "Zrušiť stlmenie mikrofónu",
"Call not found": "Hovor nebol nájdený",
"Calls are now end-to-end encrypted and need to be created from the home page. This helps make sure everyone's using the same encryption key.": "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ľúč.",
"Your web browser does not support media end-to-end encryption. Supported Browsers are Chrome, Safari, Firefox >=117": "Váš webový prehliadač nepodporuje end-to-end šifrovanie médií. Podporované prehliadače sú Chrome, Safari, Firefox >=117"
"Your web browser does not support media end-to-end encryption. Supported Browsers are Chrome, Safari, Firefox >=117": "Váš webový prehliadač nepodporuje end-to-end šifrovanie médií. Podporované prehliadače sú Chrome, Safari, Firefox >=117",
"Invite": "Pozvať",
"Link copied to clipboard": "Odkaz skopírovaný do schránky",
"Participants": "Účastníci",
"Copy link": "Kopírovať odkaz",
"Invite to this call": "Pozvať na tento hovor"
}

View File

@@ -7,19 +7,15 @@
"Close": "Kapat",
"Confirm password": "Parolayı tekrar edin",
"Copied!": "Kopyalandı",
"Copy and share this call link": "Arama bağlantısını kopyala ve paylaş",
"Create account": "Hesap aç",
"Debug log": "Hata ayıklama kütüğü",
"Debug log request": "Hata ayıklama kütük istemi",
"Developer": "Geliştirici",
"Display name": "Ekran adı",
"Download debug logs": "Hata ayıklama kütüğünü indir",
"Exit full screen": "Tam ekranı terk et",
"Full screen": "Tam ekran",
"Go": "Git",
"Home": "Ev",
"Include debug logs": "Hata ayıklama kütüğünü dahil et",
"Inspector": "Denetçi",
"Join call": "Aramaya katıl",
"Join call now": "Aramaya katıl",
"Join existing call?": "Mevcut aramaya katıl?",
@@ -46,7 +42,6 @@
"Sending…": "Gönderiliyor…",
"Settings": "Ayarlar",
"Share screen": "Ekran paylaş",
"Show call inspector": "Arama denetçisini göster",
"Sign in": "Gir",
"Sign out": ık",
"Submit feedback": "Geri bildirim ver",

View File

@@ -12,7 +12,6 @@
"Speaker": "Динамік",
"Sign out": "Вийти",
"Sign in": "Увійти",
"Show call inspector": "Показати інспектора виклику",
"Share screen": "Поділитися екраном",
"Settings": "Налаштування",
"Sending…": "Надсилання…",
@@ -40,19 +39,15 @@
"Join existing call?": "Приєднатися до наявного виклику?",
"Join call now": "Приєднатися до виклику зараз",
"Join call": "Приєднатися до виклику",
"Inspector": "Інспектор",
"Include debug logs": "Долучити журнали налагодження",
"Home": "Домівка",
"Go": "Далі",
"Full screen": "Повноекранний режим",
"Exit full screen": "Вийти з повноекранного режиму",
"Download debug logs": "Завантажити журнали налагодження",
"Display name": "Псевдонім",
"Developer": "Розробнику",
"Debug log request": "Запит журналу налагодження",
"Debug log": "Журнал налагодження",
"Create account": "Створити обліковий запис",
"Copy and share this call link": "Скопіювати та поділитися цим посиланням на виклик",
"Copied!": "Скопійовано!",
"Confirm password": "Підтвердити пароль",
"Close": "Закрити",
@@ -97,17 +92,14 @@
"Enable end-to-end encryption (password protected calls)": "Увімкнути наскрізне шифрування (захищені паролем виклики)",
"End-to-end encryption isn't supported on your browser.": "Наскрізне шифрування не підтримується вашим переглядачем.",
"{{count, number}}|other": "{{count, number}}",
"{{names, list(style: short;)}}": "{{names, list(style: short;)}}",
"Encrypted": "Зашифровано",
"Microphone on": "Мікрофон увімкнено",
"Not encrypted": "Не зашифровано",
"Share": "Поділитися",
"Sharing screen": "Презентація екрана",
"{{count, number}}|one": "{{count, number}}",
"End call": "Завершити виклик",
"Grid": "Сітка",
"Microphone off": "Мікрофон вимкнено",
"Share this call": "Поділитися цим викликом",
"You": "Ви",
"Mute microphone": "Вимкнути мікрофон",
"Open in the app": "Відкрити у застосунку",
@@ -122,5 +114,10 @@
"Back to recents": "Повернутися до недавніх",
"Call not found": "Виклик не знайдено",
"Calls are now end-to-end encrypted and need to be created from the home page. This helps make sure everyone's using the same encryption key.": "Відтепер виклики захищено наскрізним шифруванням, і їх потрібно створювати з домашньої сторінки. Це допомагає переконатися, що всі користувачі використовують один і той самий ключ шифрування.",
"Your web browser does not support media end-to-end encryption. Supported Browsers are Chrome, Safari, Firefox >=117": "Ваш браузер не підтримує наскрізне шифрування мультимедійних даних. Підтримувані браузери: Chrome, Safari, Firefox >=117"
"Your web browser does not support media end-to-end encryption. Supported Browsers are Chrome, Safari, Firefox >=117": "Ваш браузер не підтримує наскрізне шифрування мультимедійних даних. Підтримувані браузери: Chrome, Safari, Firefox >=117",
"Invite": "Запросити",
"Link copied to clipboard": "Посилання скопійовано до буфера обміну",
"Participants": "Учасники",
"Copy link": "Скопіювати посилання",
"Invite to this call": "Запросити до цього виклику"
}

View File

@@ -27,13 +27,10 @@
"Copied!": "Đã sao chép!",
"Confirm password": "Xác nhận mật khẩu",
"Close": "Đóng",
"Debug log": "Nhật ký gỡ lỗi",
"Copy": "Sao chép",
"Copy and share this call link": "Sao chép và chia sẻ liên kết cuộc gọi này",
"Display name": "Tên hiển thị",
"Developer Settings": "Cài đặt phát triển",
"Developer": "Nhà phát triển",
"Download debug logs": "Tải xuống nhật ký gỡ lỗi",
"Feedback": "Phản hồi",
"Full screen": "Toàn màn hình",
"Include debug logs": "Kèm theo nhật ký gỡ lỗi",

View File

@@ -9,15 +9,13 @@
"Submit feedback": "提交反馈",
"Spotlight": "聚焦模式",
"Speaker": "发言人",
"Sign out": "注销登录",
"Sign out": "登出",
"Sign in": "登录",
"Audio": "音频",
"Another user on this call is having an issue. In order to better diagnose these issues we'd like to collect a debug log.": "这个通话中的另一个用户出现了问题。为了更好地诊断这些问题,我们想收集调试日志。",
"<0>Why not finish by setting up a password to keep your account?</0><1>You'll be able to keep your name and set an avatar for use on future calls</1>": "<0>为什么不设置一个密码来保留你的账户?</0><1>你将可以保留你的名字并设置一个头像,以便在未来的通话中使用。</1>",
"<0>Why not finish by setting up a password to keep your account?</0><1>You'll be able to keep your name and set an avatar for use on future calls</1>": "<0>为不设置密码来保留你的账户?</0><1>保留昵称并设置头像,以便在未来的通话中使用。</1>",
"<0>Create an account</0> Or <2>Access as a guest</2>": "<0>创建账户</0> Or <2>以访客身份继续</2>",
"<0>Already have an account?</0><1><0>Log in</0> Or <2>Access as a guest</2></1>": "<0>已有账户?</0><1><0>登录</0> Or <2>以访客身份继续</2></1>",
"Inspector": "检查器",
"Show call inspector": "显示通话检查器",
"Share screen": "屏幕共享",
"Settings": "设置",
"Sending…": "正在发送……",
@@ -28,13 +26,13 @@
"Remove": "移除",
"Registering…": "正在注册……",
"Register": "注册",
"Recaptcha not loaded": "reCaptcha未加载",
"Recaptcha dismissed": "reCaptcha验证失败",
"Recaptcha not loaded": "验证器未载入",
"Recaptcha dismissed": "人机验证失败",
"Profile": "个人信息",
"Passwords must match": "密码必须匹配",
"Password": "密码",
"Not registered yet? <2>Create an account</2>": "还没有注册? <2>创建账户<2>",
"Not now, return to home screen": "暂不,返回主页",
"Not now, return to home screen": "暂不,返回主页",
"No": "否",
"More": "更多",
"Microphone": "麦克风",
@@ -43,7 +41,7 @@
"Logging in…": "登录中……",
"Local volume": "本地音量",
"Loading…": "加载中……",
"Join existing call?": "加入现有的通话?",
"Join existing call?": "是否加入现有的通话?",
"Join call now": "现在加入通话",
"Join call": "加入通话",
"Include debug logs": "包含调试日志",
@@ -51,14 +49,11 @@
"Go": "开始",
"Full screen": "全屏",
"Exit full screen": "退出全屏",
"Element Call Home": "Element Call 主页",
"Download debug logs": "下载调试日志",
"Element Call Home": "Element 呼叫 主页",
"Display name": "显示名称",
"Developer": "开发者",
"Debug log request": "调试日志请求",
"Debug log": "调试日志",
"Debug log request": "请求调试日志",
"Create account": "创建账户",
"Copy and share this call link": "复制并分享该链接",
"Copy": "复制",
"Copied!": "已复制!",
"Confirm password": "确认密码",
@@ -66,5 +61,58 @@
"Camera": "摄像头",
"Avatar": "头像",
"<0>Oops, something's gone wrong.</0>": "<0>哎哟,出问题了。</0>",
"<0></0><1></1>You may withdraw consent by unchecking this box. If you are currently in a call, this setting will take effect at the end of the call.": ""
"<0></0><1></1>You may withdraw consent by unchecking this box. If you are currently in a call, this setting will take effect at the end of the call.": "<0></0><1></1>您可以取消选中复选框来撤回同意。如果正在通话中,此设置将在通话结束时生效。",
"Encrypted": "已加密",
"End call": "通话结束",
"Grid": "网格",
"Microphone off": "关闭麦克风",
"Microphone on": "开启麦克风",
"Not encrypted": "未加密",
"{{count, number}}|one": "{{count, number}}",
"{{count, number}}|other": "{{count, number}}",
"Sharing screen": "屏幕共享",
"You": "你",
"Continue in browser": "在浏览器中继续",
"Mute microphone": "麦克风静音",
"Name of call": "通话名称",
"Open in the app": "在应用中打开",
"Ready to join?": "准备好加入了吗?",
"Back to recents": "返回最近通话",
"Select app": "选择应用程序",
"Start new call": "开始新通话",
"Start video": "开始视频",
"Stop video": "停止视频",
"Unmute microphone": "取消麦克风静音",
"Call not found": "未找到通话",
"Calls are now end-to-end encrypted and need to be created from the home page. This helps make sure everyone's using the same encryption key.": "现在,通话是端对端加密的,需要从主页创建。这有助于确保每个人都使用相同的加密密钥。",
"Your web browser does not support media end-to-end encryption. Supported Browsers are Chrome, Safari, Firefox >=117": "您的浏览器不支持媒体端对端加密。支持的浏览器有 Chrome、Safari、Firefox >=117",
"{{count}} stars|other": "{{count}} 个星",
"{{displayName}} is presenting": "{{displayName}} 正在显示",
"{{displayName}}, your call has ended.": "{{displayName}},通话已结束。",
"<0>Submitting debug logs will help us track down the problem.</0>": "<0>提交日志以帮助我们修复问题。</0>",
"<0>We'd love to hear your feedback so we can improve your experience.</0>": "<0>我们需要您的反馈以提升用户体验。</0>",
"By participating in this beta, you consent to the collection of anonymous data, which we use to improve the product. You can find more information about which data we track in our <2>Privacy Policy</2> and our <5>Cookie Policy</5>.": "参与测试即表示您同意我们收集匿名数据,用于改进产品。您可以在我们的<2>隐私政策</2>和<5>Cookie政策</5>中找到有关我们跟踪哪些数据以及更多信息。",
"Expose developer settings in the settings window.": "在设置中显示开发者设置。",
"Show connection stats": "显示连接统计信息",
"Thanks, we received your feedback!": "谢谢,我们收到了反馈!",
"Element Call is temporarily not end-to-end encrypted while we test scalability.": "在我们测试扩展性时Element 通话 暂时不进行端对端加密。",
"By clicking \"Go\", you agree to our <2>End User Licensing Agreement (EULA)</2>": "点击 \"开始\",即表示您同意我们的<2>最终用户许可协议 (EULA)</2>",
"By clicking \"Join call now\", you agree to our <2>End User Licensing Agreement (EULA)</2>": "点击 \"加入通话\",即表示您同意我们的<2>最终用户许可协议 (EULA)</2>",
"{{count}} stars|one": "{{count}} 个星",
"<0>Thanks for your feedback!</0>": "<0>感谢反馈!</0>",
"Your feedback": "您的反馈",
"Connectivity to the server has been lost.": "与服务器的连接中断。",
"Developer Settings": "开发者设置",
"Feedback": "反馈",
"Submit": "提交",
"Reconnect": "断线重连",
"Enable end-to-end encryption (password protected calls)": "启用端对端加密(有密码保护的通话)",
"End-to-end encryption isn't supported on your browser.": "您的浏览器不支持端对端加密。",
"How did it go?": "进展如何?",
"If you are experiencing issues or simply would like to provide some feedback, please send us a short description below.": "如果遇到问题或想提供一些反馈意见,请在下面向我们发送简短描述。",
"Retry sending logs": "重传日志",
"Submitting…": "提交中…",
"Thanks!": "谢谢!",
"This site is protected by ReCAPTCHA and the Google <2>Privacy Policy</2> and <6>Terms of Service</6> apply.<9></9>By clicking \"Register\", you agree to our <12>End User Licensing Agreement (EULA)</12>": "该站点受 ReCAPTCHA 保护适用于Google的 <2>隐私政策</2>和 <6>服务条款</6>。 <9></9>点击 \"注册\",即表示您同意我们的 <12>最终用户许可协议 (EULA)</12>",
"You were disconnected from the call": "通话已中断"
}

View File

@@ -17,7 +17,6 @@
"Speaker": "發言者",
"Sign out": "登出",
"Sign in": "登入",
"Show call inspector": "顯示通話稽查員",
"Share screen": "分享畫面",
"Settings": "設定",
"Sending…": "傳送中…",
@@ -46,20 +45,16 @@
"Join existing call?": "加入已開始的通話嗎?",
"Join call now": "現在加入通話",
"Join call": "加入通話",
"Inspector": "稽查員",
"Include debug logs": "包含除錯紀錄",
"Home": "首頁",
"Go": "前往",
"Full screen": "全螢幕",
"Exit full screen": "退出全螢幕",
"Element Call Home": "Element Call 首頁",
"Download debug logs": "下載偵錯報告",
"Display name": "顯示名稱",
"Developer": "開發者",
"Debug log request": "請求偵錯報告",
"Debug log": "除錯紀錄",
"Create account": "建立帳號",
"Copy and share this call link": "複製並分享通話連結",
"Copy": "複製",
"Copied!": "已複製!",
"Confirm password": "確認密碼",
@@ -98,15 +93,12 @@
"End-to-end encryption isn't supported on your browser.": "您的瀏覽器不支援端到端加密。",
"{{count, number}}|one": "{{count, number}}",
"{{count, number}}|other": "{{count, number}}",
"{{names, list(style: short;)}}": "{{names, list(style: short;)}}",
"Encrypted": "已加密",
"End call": "結束通話",
"Grid": "網格",
"Microphone off": "麥克風關閉",
"Microphone on": "麥克風開啟",
"Not encrypted": "未加密",
"Share": "分享",
"Share this call": "分享此通話",
"Sharing screen": "分享畫面",
"You": "您",
"Continue in browser": "在瀏覽器中繼續",
@@ -122,5 +114,10 @@
"Unmute microphone": "將麥克風取消靜音",
"Call not found": "找不到通話",
"Calls are now end-to-end encrypted and need to be created from the home page. This helps make sure everyone's using the same encryption key.": "通話現在是端對端加密的,必須從首頁建立。這有助於確保每個人都使用相同的加密金鑰。",
"Your web browser does not support media end-to-end encryption. Supported Browsers are Chrome, Safari, Firefox >=117": "您的網路瀏覽器不支援媒體端到端加密。支援的瀏覽器包含了 Chrome、Safari、Firefox >=117"
"Your web browser does not support media end-to-end encryption. Supported Browsers are Chrome, Safari, Firefox >=117": "您的網路瀏覽器不支援媒體端到端加密。支援的瀏覽器包含了 Chrome、Safari、Firefox >=117",
"Copy link": "複製連結",
"Invite": "邀請",
"Invite to this call": "邀請到此通話",
"Link copied to clipboard": "連結已複製到剪貼簿",
"Participants": "參與者"
}

View File

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
import { Suspense, useEffect, useState } from "react";
import { FC, Suspense, useEffect, useState } from "react";
import {
BrowserRouter as Router,
Switch,
@@ -30,8 +30,6 @@ import { LoginPage } from "./auth/LoginPage";
import { RegisterPage } from "./auth/RegisterPage";
import { RoomPage } from "./room/RoomPage";
import { ClientProvider } from "./ClientContext";
import { SequenceDiagramViewerPage } from "./SequenceDiagramViewerPage";
import { InspectorContextProvider } from "./room/GroupCallInspector";
import { CrashView, LoadingView } from "./FullScreenView";
import { DisconnectedBanner } from "./DisconnectedBanner";
import { Initializer } from "./initializer";
@@ -43,7 +41,7 @@ interface BackgroundProviderProps {
children: JSX.Element;
}
const BackgroundProvider = ({ children }: BackgroundProviderProps) => {
const BackgroundProvider: FC<BackgroundProviderProps> = ({ children }) => {
const { pathname } = useLocation();
useEffect(() => {
@@ -63,7 +61,7 @@ interface AppProps {
history: History;
}
export default function App({ history }: AppProps) {
export const App: FC<AppProps> = ({ history }) => {
const [loaded, setLoaded] = useState(false);
useEffect(() => {
@@ -83,30 +81,25 @@ export default function App({ history }: AppProps) {
<Suspense fallback={null}>
<ClientProvider>
<MediaDevicesProvider>
<InspectorContextProvider>
<Sentry.ErrorBoundary fallback={errorPage}>
<OverlayProvider>
<DisconnectedBanner />
<Switch>
<SentryRoute exact path="/">
<HomePage />
</SentryRoute>
<SentryRoute exact path="/login">
<LoginPage />
</SentryRoute>
<SentryRoute exact path="/register">
<RegisterPage />
</SentryRoute>
<SentryRoute path="/inspector">
<SequenceDiagramViewerPage />
</SentryRoute>
<SentryRoute path="*">
<RoomPage />
</SentryRoute>
</Switch>
</OverlayProvider>
</Sentry.ErrorBoundary>
</InspectorContextProvider>
<Sentry.ErrorBoundary fallback={errorPage}>
<OverlayProvider>
<DisconnectedBanner />
<Switch>
<SentryRoute exact path="/">
<HomePage />
</SentryRoute>
<SentryRoute exact path="/login">
<LoginPage />
</SentryRoute>
<SentryRoute exact path="/register">
<RegisterPage />
</SentryRoute>
<SentryRoute path="*">
<RoomPage />
</SentryRoute>
</Switch>
</OverlayProvider>
</Sentry.ErrorBoundary>
</MediaDevicesProvider>
</ClientProvider>
</Suspense>
@@ -116,4 +109,4 @@ export default function App({ history }: AppProps) {
</BackgroundProvider>
</Router>
);
}
};

View File

@@ -58,7 +58,7 @@ export const Avatar: FC<Props> = ({
Object.values(Size).includes(size as Size)
? sizes.get(size as Size)
: (size as number),
[size]
[size],
);
const resolvedSrc = useMemo(() => {

View File

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
import { ReactNode } from "react";
import { FC, ReactNode } from "react";
import styles from "./Banner.module.css";
@@ -22,6 +22,6 @@ interface Props {
children: ReactNode;
}
export const Banner = ({ children }: Props) => {
export const Banner: FC<Props> = ({ children }) => {
return <div className={styles.banner}>{children}</div>;
};

View File

@@ -82,7 +82,8 @@ export type SetClientParams = {
const ClientContext = createContext<ClientState | undefined>(undefined);
export const useClientState = () => useContext(ClientContext);
export const useClientState = (): ClientState | undefined =>
useContext(ClientContext);
export function useClient(): {
client?: MatrixClient;
@@ -189,7 +190,7 @@ export const ClientProvider: FC<Props> = ({ children }) => {
user: session.user_id,
password: session.tempPassword,
},
password
password,
);
saveSession({ ...session, passwordlessUser: false });
@@ -199,7 +200,7 @@ export const ClientProvider: FC<Props> = ({ children }) => {
passwordlessUser: false,
});
},
[initClientState?.client]
[initClientState?.client],
);
const setClient = useCallback(
@@ -221,7 +222,7 @@ export const ClientProvider: FC<Props> = ({ children }) => {
setInitClientState(null);
}
},
[initClientState?.client]
[initClientState?.client],
);
const logout = useCallback(async () => {
@@ -249,7 +250,7 @@ export const ClientProvider: FC<Props> = ({ children }) => {
}, []);
const [alreadyOpenedErr, setAlreadyOpenedErr] = useState<Error | undefined>(
undefined
undefined,
);
useEventTarget(
loadChannel,
@@ -257,9 +258,9 @@ export const ClientProvider: FC<Props> = ({ children }) => {
useCallback(() => {
initClientState?.client.stopClient();
setAlreadyOpenedErr(
translatedError("This application has been opened in another tab.", t)
translatedError("This application has been opened in another tab.", t),
);
}, [initClientState?.client, setAlreadyOpenedErr, t])
}, [initClientState?.client, setAlreadyOpenedErr, t]),
);
const [isDisconnected, setIsDisconnected] = useState(false);
@@ -300,7 +301,7 @@ export const ClientProvider: FC<Props> = ({ children }) => {
(state: SyncState, _old: SyncState | null, data?: ISyncStateData) => {
setIsDisconnected(clientIsDisconnected(state, data));
},
[]
[],
);
useEffect(() => {
@@ -386,7 +387,7 @@ async function loadClient(): Promise<InitResult | null> {
logger.warn(
"The previous session was lost, and we couldn't log it out, " +
err +
"either"
"either",
);
}
}
@@ -408,8 +409,8 @@ export interface Session {
tempPassword?: string;
}
const clearSession = () => localStorage.removeItem("matrix-auth-store");
const saveSession = (s: Session) =>
const clearSession = (): void => localStorage.removeItem("matrix-auth-store");
const saveSession = (s: Session): void =>
localStorage.setItem("matrix-auth-store", JSON.stringify(s));
const loadSession = (): Session | undefined => {
const data = localStorage.getItem("matrix-auth-store");
@@ -422,5 +423,6 @@ const loadSession = (): Session | undefined => {
const clientIsDisconnected = (
syncState: SyncState,
syncData?: ISyncStateData
) => syncState === "ERROR" && syncData?.error?.name === "ConnectionError";
syncData?: ISyncStateData,
): boolean =>
syncState === "ERROR" && syncData?.error?.name === "ConnectionError";

View File

@@ -15,22 +15,22 @@ limitations under the License.
*/
import classNames from "classnames";
import { HTMLAttributes, ReactNode } from "react";
import { FC, HTMLAttributes, ReactNode } from "react";
import { useTranslation } from "react-i18next";
import styles from "./DisconnectedBanner.module.css";
import { ValidClientState, useClientState } from "./ClientContext";
interface DisconnectedBannerProps extends HTMLAttributes<HTMLElement> {
interface Props extends HTMLAttributes<HTMLElement> {
children?: ReactNode;
className?: string;
}
export function DisconnectedBanner({
export const DisconnectedBanner: FC<Props> = ({
children,
className,
...rest
}: DisconnectedBannerProps) {
}) => {
const { t } = useTranslation();
const clientState = useClientState();
let shouldShowBanner = false;
@@ -50,4 +50,4 @@ export function DisconnectedBanner({
)}
</>
);
}
};

View File

@@ -15,13 +15,14 @@ limitations under the License.
*/
import { Trans } from "react-i18next";
import { FC } from "react";
import { Banner } from "./Banner";
import styles from "./E2EEBanner.module.css";
import { ReactComponent as LockOffIcon } from "./icons/LockOff.svg";
import LockOffIcon from "./icons/LockOff.svg?react";
import { useEnableE2EE } from "./settings/useSetting";
export const E2EEBanner = () => {
export const E2EEBanner: FC = () => {
const [e2eeEnabled] = useEnableE2EE();
if (e2eeEnabled) return null;

View File

@@ -1,66 +0,0 @@
/*
Copyright 2022 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.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
import { HTMLAttributes } from "react";
import { MatrixClient } from "matrix-js-sdk/src/client";
import { RoomMember } from "matrix-js-sdk/src/models/room-member";
import { useTranslation } from "react-i18next";
import { AvatarStack } from "@vector-im/compound-web";
import { Avatar, Size } from "./Avatar";
interface Props extends HTMLAttributes<HTMLDivElement> {
className?: string;
client: MatrixClient;
members: RoomMember[];
max?: number;
size?: Size | number;
}
export function Facepile({
className,
client,
members,
max = 3,
size = Size.XS,
...rest
}: Props) {
const { t } = useTranslation();
const displayedMembers = members.slice(0, max);
return (
<AvatarStack
title={t("{{names, list(style: short;)}}", {
list: displayedMembers.map((m) => m.name),
})}
{...rest}
>
{displayedMembers.map((member, i) => {
const avatarUrl = member.getMxcAvatarUrl();
return (
<Avatar
key={i}
id={member.userId}
name={member.name}
size={size}
src={avatarUrl ?? undefined}
/>
);
})}
</AvatarStack>
);
}

View File

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
import { ReactNode, useCallback, useEffect } from "react";
import { FC, ReactNode, useCallback, useEffect } from "react";
import { useLocation } from "react-router-dom";
import classNames from "classnames";
import { Trans, useTranslation } from "react-i18next";
@@ -33,7 +33,10 @@ interface FullScreenViewProps {
children: ReactNode;
}
export function FullScreenView({ className, children }: FullScreenViewProps) {
export const FullScreenView: FC<FullScreenViewProps> = ({
className,
children,
}) => {
return (
<div className={classNames(styles.page, className)}>
<Header>
@@ -47,13 +50,13 @@ export function FullScreenView({ className, children }: FullScreenViewProps) {
</div>
</div>
);
}
};
interface ErrorViewProps {
error: Error;
}
export function ErrorView({ error }: ErrorViewProps) {
export const ErrorView: FC<ErrorViewProps> = ({ error }) => {
const location = useLocation();
const { t } = useTranslation();
@@ -96,9 +99,9 @@ export function ErrorView({ error }: ErrorViewProps) {
)}
</FullScreenView>
);
}
};
export function CrashView() {
export const CrashView: FC = () => {
const { t } = useTranslation();
const onReload = useCallback(() => {
@@ -127,9 +130,9 @@ export function CrashView() {
</Button>
</FullScreenView>
);
}
};
export function LoadingView() {
export const LoadingView: FC = () => {
const { t } = useTranslation();
return (
@@ -137,4 +140,4 @@ export function LoadingView() {
<h1>{t("Loading…")}</h1>
</FullScreenView>
);
}
};

View File

@@ -48,5 +48,5 @@ export const Glass = forwardRef<HTMLDivElement, Props>(
>
{Children.only(children)}
</div>
)
),
);

View File

@@ -111,7 +111,6 @@ limitations under the License.
display: flex;
align-items: center;
gap: var(--cpd-space-1-5x);
font: var(--cpd-font-body-sm-medium);
}
@media (min-width: 800px) {

View File

@@ -18,13 +18,12 @@ import classNames from "classnames";
import { FC, HTMLAttributes, ReactNode } from "react";
import { Link } from "react-router-dom";
import { useTranslation } from "react-i18next";
import { MatrixClient, RoomMember } from "matrix-js-sdk/src/matrix";
import { Heading } from "@vector-im/compound-web";
import { Heading, Text } from "@vector-im/compound-web";
import UserProfileIcon from "@vector-im/compound-design-tokens/icons/user-profile.svg?react";
import styles from "./Header.module.css";
import { ReactComponent as Logo } from "./icons/Logo.svg";
import Logo from "./icons/Logo.svg?react";
import { Avatar, Size } from "./Avatar";
import { Facepile } from "./Facepile";
import { EncryptionLock } from "./room/EncryptionLock";
import { useMediaQuery } from "./useMediaQuery";
@@ -33,13 +32,13 @@ interface HeaderProps extends HTMLAttributes<HTMLElement> {
className?: string;
}
export function Header({ children, className, ...rest }: HeaderProps) {
export const Header: FC<HeaderProps> = ({ children, className, ...rest }) => {
return (
<header className={classNames(styles.header, className)} {...rest}>
{children}
</header>
);
}
};
interface LeftNavProps extends HTMLAttributes<HTMLElement> {
children: ReactNode;
@@ -47,26 +46,26 @@ interface LeftNavProps extends HTMLAttributes<HTMLElement> {
hideMobile?: boolean;
}
export function LeftNav({
export const LeftNav: FC<LeftNavProps> = ({
children,
className,
hideMobile,
...rest
}: LeftNavProps) {
}) => {
return (
<div
className={classNames(
styles.nav,
styles.leftNav,
{ [styles.hideMobile]: hideMobile },
className
className,
)}
{...rest}
>
{children}
</div>
);
}
};
interface RightNavProps extends HTMLAttributes<HTMLElement> {
children?: ReactNode;
@@ -74,32 +73,32 @@ interface RightNavProps extends HTMLAttributes<HTMLElement> {
hideMobile?: boolean;
}
export function RightNav({
export const RightNav: FC<RightNavProps> = ({
children,
className,
hideMobile,
...rest
}: RightNavProps) {
}) => {
return (
<div
className={classNames(
styles.nav,
styles.rightNav,
{ [styles.hideMobile]: hideMobile },
className
className,
)}
{...rest}
>
{children}
</div>
);
}
};
interface HeaderLogoProps {
className?: string;
}
export function HeaderLogo({ className }: HeaderLogoProps) {
export const HeaderLogo: FC<HeaderLogoProps> = ({ className }) => {
const { t } = useTranslation();
return (
@@ -111,15 +110,14 @@ export function HeaderLogo({ className }: HeaderLogoProps) {
<Logo />
</Link>
);
}
};
interface RoomHeaderInfoProps {
id: string;
name: string;
avatarUrl: string | null;
encrypted: boolean;
participants: RoomMember[];
client: MatrixClient;
participantCount: number;
}
export const RoomHeaderInfo: FC<RoomHeaderInfoProps> = ({
@@ -127,8 +125,7 @@ export const RoomHeaderInfo: FC<RoomHeaderInfoProps> = ({
name,
avatarUrl,
encrypted,
participants,
client,
participantCount,
}) => {
const { t } = useTranslation();
const size = useMediaQuery("(max-width: 550px)") ? "sm" : "lg";
@@ -153,10 +150,16 @@ export const RoomHeaderInfo: FC<RoomHeaderInfoProps> = ({
</Heading>
<EncryptionLock encrypted={encrypted} />
</div>
{participants.length > 0 && (
{participantCount > 0 && (
<div className={styles.participantsLine}>
<Facepile client={client} members={participants} size={20} />
{t("{{count, number}}", { count: participants.length })}
<UserProfileIcon
width={20}
height={20}
aria-label={t("Participants")}
/>
<Text as="span" size="sm" weight="medium">
{t("{{count, number}}", { count: participantCount })}
</Text>
</div>
)}
</div>

View File

@@ -63,7 +63,7 @@ export class LazyEventEmitter extends EventEmitter {
public addListener(
type: string | symbol,
// eslint-disable-next-line @typescript-eslint/no-explicit-any
listener: (...args: any[]) => void
listener: (...args: any[]) => void,
): this {
return this.on(type, listener);
}

View File

@@ -14,7 +14,13 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
import { MutableRefObject, PointerEvent, useCallback, useRef } from "react";
import {
MutableRefObject,
PointerEvent,
ReactNode,
useCallback,
useRef,
} from "react";
import { useListBox, useOption, AriaListBoxOptions } from "@react-aria/listbox";
import { ListState } from "@react-stately/list";
import { Node } from "@react-types/shared";
@@ -35,7 +41,7 @@ export function ListBox<T>({
className,
listBoxRef,
...rest
}: ListBoxProps<T>) {
}: ListBoxProps<T>): ReactNode {
const ref = useRef<HTMLUListElement>(null);
const listRef = listBoxRef ?? ref;
@@ -66,12 +72,12 @@ interface OptionProps<T> {
item: Node<T>;
}
function Option<T>({ item, state, className }: OptionProps<T>) {
function Option<T>({ item, state, className }: OptionProps<T>): ReactNode {
const ref = useRef(null);
const { optionProps, isSelected, isFocused, isDisabled } = useOption(
{ key: item.key },
state,
ref
ref,
);
// Hack: remove the onPointerUp event handler and re-wire it to
@@ -91,7 +97,7 @@ function Option<T>({ item, state, className }: OptionProps<T>) {
// @ts-ignore
origPointerUp(e as unknown as PointerEvent<HTMLElement>);
},
[origPointerUp]
[origPointerUp],
);
return (

View File

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
import { Key, useRef, useState } from "react";
import { Key, ReactNode, useRef, useState } from "react";
import { AriaMenuOptions, useMenu, useMenuItem } from "@react-aria/menu";
import { TreeState, useTreeState } from "@react-stately/tree";
import { mergeProps } from "@react-aria/utils";
@@ -37,7 +37,7 @@ export function Menu<T extends object>({
onClose,
label,
...rest
}: MenuProps<T>) {
}: MenuProps<T>): ReactNode {
const state = useTreeState<T>({ ...rest, selectionMode: "none" });
const menuRef = useRef(null);
const { menuProps } = useMenu<T>(rest, state, menuRef);
@@ -68,7 +68,12 @@ interface MenuItemProps<T> {
onClose: () => void;
}
function MenuItem<T>({ item, state, onAction, onClose }: MenuItemProps<T>) {
function MenuItem<T>({
item,
state,
onAction,
onClose,
}: MenuItemProps<T>): ReactNode {
const ref = useRef(null);
const { menuItemProps } = useMenuItem(
{
@@ -77,7 +82,7 @@ function MenuItem<T>({ item, state, onAction, onClose }: MenuItemProps<T>) {
onClose,
},
state,
ref
ref,
);
const [isFocused, setFocused] = useState(false);

View File

@@ -14,96 +14,18 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
.overlay {
position: fixed;
z-index: 100;
inset: 0;
background: rgba(3, 12, 27, 0.528);
}
@keyframes fade-in {
from {
opacity: 0;
}
to {
opacity: 1;
}
}
.dialogOverlay[data-state="open"] {
animation: fade-in 200ms;
}
@keyframes fade-out {
from {
opacity: 1;
}
to {
opacity: 0;
}
}
.dialogOverlay[data-state="closed"] {
animation: fade-out 130ms;
}
.modal {
position: fixed;
z-index: 101;
display: flex;
flex-direction: column;
}
.dialog {
left: 50%;
top: 50%;
transform: translate(-50%, -50%);
box-sizing: border-box;
inline-size: 520px;
max-inline-size: 90%;
max-block-size: 600px;
}
@keyframes zoom-in {
from {
opacity: 0;
transform: translate(-50%, -50%) scale(80%);
}
to {
opacity: 1;
transform: translate(-50%, -50%) scale(100%);
}
}
@keyframes zoom-out {
from {
opacity: 1;
transform: translate(-50%, -50%) scale(100%);
}
to {
opacity: 0;
transform: translate(-50%, -50%) scale(80%);
}
}
.dialog[data-state="open"] {
animation: zoom-in 200ms;
}
.dialog[data-state="closed"] {
animation: zoom-out 130ms;
}
@media (prefers-reduced-motion) {
.dialog[data-state="open"] {
animation-name: fade-in;
}
.dialog[data-state="closed"] {
animation-name: fade-out;
}
}
.content {
display: flex;
flex-direction: column;

View File

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
import { ReactNode, useCallback } from "react";
import { FC, ReactNode, useCallback } from "react";
import { AriaDialogProps } from "@react-types/dialog";
import { useTranslation } from "react-i18next";
import {
@@ -27,16 +27,17 @@ import {
} from "@radix-ui/react-dialog";
import { Drawer } from "vaul";
import { VisuallyHidden } from "@radix-ui/react-visually-hidden";
import { ReactComponent as CloseIcon } from "@vector-im/compound-design-tokens/icons/close.svg";
import CloseIcon from "@vector-im/compound-design-tokens/icons/close.svg?react";
import classNames from "classnames";
import { Heading } from "@vector-im/compound-web";
import styles from "./Modal.module.css";
import overlayStyles from "./Overlay.module.css";
import { useMediaQuery } from "./useMediaQuery";
import { Glass } from "./Glass";
// TODO: Support tabs
export interface ModalProps extends AriaDialogProps {
export interface Props extends AriaDialogProps {
title: string;
children: ReactNode;
className?: string;
@@ -58,14 +59,14 @@ export interface ModalProps extends AriaDialogProps {
* A modal, taking the form of a drawer / bottom sheet on touchscreen devices,
* and a dialog box on desktop.
*/
export function Modal({
export const Modal: FC<Props> = ({
title,
children,
className,
open,
onDismiss,
...rest
}: ModalProps) {
}) => {
const { t } = useTranslation();
// Empirically, Chrome on Android can end up not matching (hover: none), but
// still matching (pointer: coarse) :/
@@ -74,7 +75,7 @@ export function Modal({
(open: boolean) => {
if (!open) onDismiss?.();
},
[onDismiss]
[onDismiss],
);
if (touchscreen) {
@@ -85,9 +86,14 @@ export function Modal({
dismissible={onDismiss !== undefined}
>
<Drawer.Portal>
<Drawer.Overlay className={styles.overlay} />
<Drawer.Overlay className={classNames(overlayStyles.bg)} />
<Drawer.Content
className={classNames(className, styles.modal, styles.drawer)}
className={classNames(
className,
overlayStyles.overlay,
styles.modal,
styles.drawer,
)}
{...rest}
>
<div className={styles.content}>
@@ -108,12 +114,18 @@ export function Modal({
<DialogRoot open={open} onOpenChange={onOpenChange}>
<DialogPortal>
<DialogOverlay
className={classNames(styles.overlay, styles.dialogOverlay)}
className={classNames(overlayStyles.bg, overlayStyles.animate)}
/>
<DialogContent asChild {...rest}>
<Glass
frosted
className={classNames(className, styles.modal, styles.dialog)}
className={classNames(
className,
overlayStyles.overlay,
overlayStyles.animate,
styles.modal,
styles.dialog,
)}
>
<div className={styles.content}>
<div className={styles.header}>
@@ -140,4 +152,4 @@ export function Modal({
</DialogRoot>
);
}
}
};

99
src/Overlay.module.css Normal file
View File

@@ -0,0 +1,99 @@
/*
Copyright 2023 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.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
.bg {
position: fixed;
z-index: 100;
inset: 0;
background: rgba(3, 12, 27, 0.528);
}
@keyframes fade-in {
from {
opacity: 0;
}
to {
opacity: 1;
}
}
.bg.animate[data-state="open"] {
animation: fade-in 200ms;
}
@keyframes fade-out {
from {
opacity: 1;
}
to {
opacity: 0;
}
}
.bg.animate[data-state="closed"] {
animation: fade-out 130ms;
}
.overlay {
position: fixed;
z-index: 101;
}
.overlay.animate {
left: 50%;
top: 50%;
transform: translate(-50%, -50%);
}
@keyframes zoom-in {
from {
opacity: 0;
transform: translate(-50%, -50%) scale(80%);
}
to {
opacity: 1;
transform: translate(-50%, -50%) scale(100%);
}
}
@keyframes zoom-out {
from {
opacity: 1;
transform: translate(-50%, -50%) scale(100%);
}
to {
opacity: 0;
transform: translate(-50%, -50%) scale(80%);
}
}
.overlay.animate[data-state="open"] {
animation: zoom-in 200ms;
}
.overlay.animate[data-state="closed"] {
animation: zoom-out 130ms;
}
@media (prefers-reduced-motion) {
.overlay.animate[data-state="open"] {
animation-name: fade-in;
}
.overlay.animate[data-state="closed"] {
animation-name: fade-out;
}
}

View File

@@ -1,72 +0,0 @@
/*
Copyright 2022 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.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
import { useCallback, useState } from "react";
import { useTranslation } from "react-i18next";
import {
SequenceDiagramViewer,
SequenceDiagramMatrixEvent,
} from "./room/GroupCallInspector";
import { FieldRow, InputField } from "./input/Input";
import { usePageTitle } from "./usePageTitle";
interface DebugLog {
localUserId: string;
eventsByUserId: { [userId: string]: SequenceDiagramMatrixEvent[] };
remoteUserIds: string[];
}
export function SequenceDiagramViewerPage() {
const { t } = useTranslation();
usePageTitle(t("Inspector"));
const [debugLog, setDebugLog] = useState<DebugLog>();
const [selectedUserId, setSelectedUserId] = useState<string>();
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
// @ts-ignore
const onChangeDebugLog = useCallback((e) => {
if (e.target.files && e.target.files.length > 0) {
e.target.files[0].text().then((text: string) => {
setDebugLog(JSON.parse(text));
});
}
}, []);
return (
<div style={{ marginTop: 20 }}>
<FieldRow>
<InputField
type="file"
id="debugLog"
name="debugLog"
label={t("Debug log")}
onChange={onChangeDebugLog}
/>
</FieldRow>
{debugLog && selectedUserId && (
<SequenceDiagramViewer
localUserId={debugLog.localUserId}
selectedUserId={selectedUserId}
onSelectUserId={setSelectedUserId}
remoteUserIds={debugLog.remoteUserIds}
events={debugLog.eventsByUserId[selectedUserId]}
/>
)}
</div>
);
}

38
src/Toast.module.css Normal file
View File

@@ -0,0 +1,38 @@
/*
Copyright 2023 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.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
.toast {
color: var(--cpd-color-text-on-solid-primary);
background: var(--cpd-color-alpha-gray-1200);
padding-inline: var(--cpd-space-3x);
padding-block: var(--cpd-space-1x);
border: none;
border-radius: var(--cpd-radius-pill-effect);
box-shadow: var(--small-drop-shadow);
display: flex;
align-items: center;
gap: var(--cpd-space-1x);
}
.toast > h3 {
margin: 0;
}
.toast > svg {
color: var(--cpd-color-icon-on-solid-primary);
flex-shrink: 0;
margin-inline-end: calc(-1 * var(--cpd-space-1x));
}

108
src/Toast.tsx Normal file
View File

@@ -0,0 +1,108 @@
/*
Copyright 2023 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.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
import {
ComponentType,
FC,
SVGAttributes,
useCallback,
useEffect,
} from "react";
import {
Root as DialogRoot,
Portal as DialogPortal,
Overlay as DialogOverlay,
Content as DialogContent,
Close as DialogClose,
Title as DialogTitle,
} from "@radix-ui/react-dialog";
import classNames from "classnames";
import { Text } from "@vector-im/compound-web";
import styles from "./Toast.module.css";
import overlayStyles from "./Overlay.module.css";
interface Props {
/**
* The controlled open state of the toast.
*/
open: boolean;
/**
* Callback for when the user dismisses the toast.
*/
onDismiss: () => void;
/**
* A number of milliseconds after which the toast should be automatically
* dismissed.
*/
autoDismiss?: number;
children: string;
/**
* A supporting icon to display within the toast.
*/
Icon?: ComponentType<SVGAttributes<SVGElement>>;
}
/**
* A temporary message shown in an overlay in the center of the screen.
*/
export const Toast: FC<Props> = ({
open,
onDismiss,
autoDismiss,
children,
Icon,
}) => {
const onOpenChange = useCallback(
(open: boolean) => {
if (!open) onDismiss();
},
[onDismiss],
);
useEffect(() => {
if (open && autoDismiss !== undefined) {
const timeout = setTimeout(onDismiss, autoDismiss);
return () => clearTimeout(timeout);
}
}, [open, autoDismiss, onDismiss]);
return (
<DialogRoot open={open} onOpenChange={onOpenChange}>
<DialogPortal>
<DialogOverlay
className={classNames(overlayStyles.bg, overlayStyles.animate)}
/>
<DialogContent asChild>
<DialogClose
className={classNames(
overlayStyles.overlay,
overlayStyles.animate,
styles.toast,
)}
>
<DialogTitle asChild>
<Text as="h3" size="sm" weight="semibold">
{children}
</Text>
</DialogTitle>
{Icon && <Icon width={20} height={20} aria-hidden />}
</DialogClose>
</DialogContent>
</DialogPortal>
</DialogRoot>
);
};

View File

@@ -43,7 +43,7 @@ interface TooltipProps {
const Tooltip = forwardRef<HTMLDivElement, TooltipProps>(
(
{ state, className, children, ...rest }: TooltipProps,
ref: ForwardedRef<HTMLDivElement>
ref: ForwardedRef<HTMLDivElement>,
) => {
const { tooltipProps } = useTooltip(rest, state);
@@ -56,7 +56,7 @@ const Tooltip = forwardRef<HTMLDivElement, TooltipProps>(
{children}
</div>
);
}
},
);
interface TooltipTriggerProps {
@@ -69,7 +69,7 @@ interface TooltipTriggerProps {
export const TooltipTrigger = forwardRef<HTMLElement, TooltipTriggerProps>(
(
{ children, placement, tooltip, ...rest }: TooltipTriggerProps,
ref: ForwardedRef<HTMLElement>
ref: ForwardedRef<HTMLElement>,
) => {
const tooltipTriggerProps = { delay: 250, ...rest };
const tooltipState = useTooltipTriggerState(tooltipTriggerProps);
@@ -78,7 +78,7 @@ export const TooltipTrigger = forwardRef<HTMLElement, TooltipTriggerProps>(
const { triggerProps, tooltipProps } = useTooltipTrigger(
tooltipTriggerProps,
tooltipState,
triggerRef
triggerRef,
);
const { overlayProps } = useOverlayPosition({
@@ -94,7 +94,7 @@ export const TooltipTrigger = forwardRef<HTMLElement, TooltipTriggerProps>(
<children.type
{...mergeProps<typeof children.props | typeof rest>(
children.props,
rest
rest,
)}
/>
{tooltipState.isOpen && (
@@ -110,5 +110,5 @@ export const TooltipTrigger = forwardRef<HTMLElement, TooltipTriggerProps>(
)}
</FocusableProvider>
);
}
},
);

View File

@@ -37,5 +37,7 @@ class TranslatedErrorImpl extends TranslatedError {}
// i18next-parser can't detect calls to a constructor, so we expose a bare
// function instead
export const translatedError = (messageKey: string, t: typeof i18n.t) =>
new TranslatedErrorImpl(messageKey, t);
export const translatedError = (
messageKey: string,
t: typeof i18n.t,
): TranslatedError => new TranslatedErrorImpl(messageKey, t);

View File

@@ -33,6 +33,9 @@ interface RoomIdentifier {
// clearer what each flag means, and helps us avoid coupling Element Call's
// behavior to the needs of specific consumers.
interface UrlParams {
// Widget api related params
widgetId: string | null;
parentUrl: string | null;
/**
* Anything about what room we're pointed to should be from useRoomIdentifier which
* parses the path and resolves alias with respect to the default server name, however
@@ -116,17 +119,17 @@ interface UrlParams {
// file.
export function editFragmentQuery(
hash: string,
edit: (params: URLSearchParams) => URLSearchParams
edit: (params: URLSearchParams) => URLSearchParams,
): string {
const fragmentQueryStart = hash.indexOf("?");
const fragmentParams = edit(
new URLSearchParams(
fragmentQueryStart === -1 ? "" : hash.substring(fragmentQueryStart)
)
fragmentQueryStart === -1 ? "" : hash.substring(fragmentQueryStart),
),
);
return `${hash.substring(
0,
fragmentQueryStart
fragmentQueryStart,
)}?${fragmentParams.toString()}`;
}
@@ -134,30 +137,30 @@ class ParamParser {
private fragmentParams: URLSearchParams;
private queryParams: URLSearchParams;
constructor(search: string, hash: string) {
public constructor(search: string, hash: string) {
this.queryParams = new URLSearchParams(search);
const fragmentQueryStart = hash.indexOf("?");
this.fragmentParams = new URLSearchParams(
fragmentQueryStart === -1 ? "" : hash.substring(fragmentQueryStart)
fragmentQueryStart === -1 ? "" : hash.substring(fragmentQueryStart),
);
}
// Normally, URL params should be encoded in the fragment so as to avoid
// leaking them to the server. However, we also check the normal query
// string for backwards compatibility with versions that only used that.
getParam(name: string): string | null {
public getParam(name: string): string | null {
return this.fragmentParams.get(name) ?? this.queryParams.get(name);
}
getAllParams(name: string): string[] {
public getAllParams(name: string): string[] {
return [
...this.fragmentParams.getAll(name),
...this.queryParams.getAll(name),
];
}
getFlagParam(name: string, defaultValue = false): boolean {
public getFlagParam(name: string, defaultValue = false): boolean {
const param = this.getParam(name);
return param === null ? defaultValue : param !== "false";
}
@@ -171,13 +174,16 @@ class ParamParser {
*/
export const getUrlParams = (
search = window.location.search,
hash = window.location.hash
hash = window.location.hash,
): UrlParams => {
const parser = new ParamParser(search, hash);
const fontScale = parseFloat(parser.getParam("fontScale") ?? "");
return {
widgetId: parser.getParam("widgetId"),
parentUrl: parser.getParam("parentUrl"),
// NB. we don't validate roomId here as we do in getRoomIdentifierFromUrl:
// what would we do if it were invalid? If the widget API says that's what
// the room ID is, then that's what it is.
@@ -215,36 +221,42 @@ export const useUrlParams = (): UrlParams => {
export function getRoomIdentifierFromUrl(
pathname: string,
search: string,
hash: string
hash: string,
): RoomIdentifier {
let roomAlias: string | null = null;
pathname = pathname.substring(1); // Strip the "/"
const pathComponents = pathname.split("/");
const pathHasRoom = pathComponents[0] == "room";
const hasRoomAlias = pathComponents.length > 1;
// Here we handle the beginning of the alias and make sure it starts with a "#"
// What type is our url: roomAlias in hash, room alias as the search path, roomAlias after /room/
if (hash === "" || hash.startsWith("#?")) {
roomAlias = pathname.substring(1); // Strip the "/"
// Delete "/room/", if present
if (roomAlias.startsWith("room/")) {
roomAlias = roomAlias.substring("room/".length);
if (hasRoomAlias && pathHasRoom) {
roomAlias = pathComponents[1];
}
// Add "#", if not present
if (!roomAlias.startsWith("#")) {
roomAlias = `#${roomAlias}`;
if (!pathHasRoom) {
roomAlias = pathComponents[0];
}
} else {
roomAlias = hash;
}
// Delete "?" and what comes afterwards
roomAlias = roomAlias.split("?")[0];
roomAlias = roomAlias?.split("?")[0] ?? null;
if (roomAlias.length <= 1) {
if (roomAlias) {
// Make roomAlias is null, if it only is a "#"
roomAlias = null;
} else {
// Add server part, if not present
if (!roomAlias.includes(":")) {
roomAlias = `${roomAlias}:${Config.defaultServerName()}`;
if (roomAlias.length <= 1) {
roomAlias = null;
} else {
// Add "#", if not present
if (!roomAlias.startsWith("#")) {
roomAlias = `#${roomAlias}`;
}
// Add server part, if not present
if (!roomAlias.includes(":")) {
roomAlias = `${roomAlias}:${Config.defaultServerName()}`;
}
}
}
@@ -269,6 +281,6 @@ export const useRoomIdentifier = (): RoomIdentifier => {
const { pathname, search, hash } = useLocation();
return useMemo(
() => getRoomIdentifierFromUrl(pathname, search, hash),
[pathname, search, hash]
[pathname, search, hash],
);
};

View File

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
import { useCallback, useMemo } from "react";
import { FC, ReactNode, useCallback, useMemo } from "react";
import { Item } from "@react-stately/collections";
import { useLocation } from "react-router-dom";
import { useTranslation } from "react-i18next";
@@ -24,14 +24,14 @@ import { PopoverMenuTrigger } from "./popover/PopoverMenu";
import { Menu } from "./Menu";
import { TooltipTrigger } from "./Tooltip";
import { Avatar, Size } from "./Avatar";
import { ReactComponent as UserIcon } from "./icons/User.svg";
import { ReactComponent as SettingsIcon } from "./icons/Settings.svg";
import { ReactComponent as LoginIcon } from "./icons/Login.svg";
import { ReactComponent as LogoutIcon } from "./icons/Logout.svg";
import UserIcon from "./icons/User.svg?react";
import SettingsIcon from "./icons/Settings.svg?react";
import LoginIcon from "./icons/Login.svg?react";
import LogoutIcon from "./icons/Logout.svg?react";
import { Body } from "./typography/Typography";
import styles from "./UserMenu.module.css";
interface UserMenuProps {
interface Props {
preventNavigation: boolean;
isAuthenticated: boolean;
isPasswordlessUser: boolean;
@@ -41,7 +41,7 @@ interface UserMenuProps {
onAction: (value: string) => void;
}
export function UserMenu({
export const UserMenu: FC<Props> = ({
preventNavigation,
isAuthenticated,
isPasswordlessUser,
@@ -49,7 +49,7 @@ export function UserMenu({
displayName,
avatarUrl,
onAction,
}: UserMenuProps) {
}) => {
const { t } = useTranslation();
const location = useLocation();
@@ -123,7 +123,7 @@ export function UserMenu({
</TooltipTrigger>
{
// eslint-disable-next-line @typescript-eslint/no-explicit-any
(props: any) => (
(props: any): ReactNode => (
<Menu {...props} label={t("User menu")} onAction={onAction}>
{items.map(({ key, icon: Icon, label, dataTestid }) => (
<Item key={key} textValue={label}>
@@ -141,4 +141,4 @@ export function UserMenu({
}
</PopoverMenuTrigger>
);
}
};

View File

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
import { useCallback, useState } from "react";
import { FC, useCallback, useState } from "react";
import { useHistory, useLocation } from "react-router-dom";
import { useClientLegacy } from "./ClientContext";
@@ -26,7 +26,7 @@ interface Props {
preventNavigation?: boolean;
}
export function UserMenuContainer({ preventNavigation = false }: Props) {
export const UserMenuContainer: FC<Props> = ({ preventNavigation = false }) => {
const location = useLocation();
const history = useHistory();
const { client, logout, authenticated, passwordlessUser } = useClientLegacy();
@@ -34,7 +34,7 @@ export function UserMenuContainer({ preventNavigation = false }: Props) {
const [settingsModalOpen, setSettingsModalOpen] = useState(false);
const onDismissSettingsModal = useCallback(
() => setSettingsModalOpen(false),
[setSettingsModalOpen]
[setSettingsModalOpen],
);
const [defaultSettingsTab, setDefaultSettingsTab] = useState<string>();
@@ -58,7 +58,7 @@ export function UserMenuContainer({ preventNavigation = false }: Props) {
break;
}
},
[history, location, logout, setSettingsModalOpen]
[history, location, logout, setSettingsModalOpen],
);
const userName = client?.getUserIdLocalpart() ?? "";
@@ -83,4 +83,4 @@ export function UserMenuContainer({ preventNavigation = false }: Props) {
)}
</>
);
}
};

View File

@@ -1,3 +1,19 @@
/*
Copyright 2023 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.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
import { FC } from "react";
import { Trans } from "react-i18next";

View File

@@ -117,7 +117,7 @@ export class PosthogAnalytics {
return this.internalInstance;
}
constructor(private readonly posthog: PostHog) {
private constructor(private readonly posthog: PostHog) {
const posthogConfig: PosthogSettings = {
project_api_key: Config.get().posthog?.api_key,
api_host: Config.get().posthog?.api_host,
@@ -146,7 +146,7 @@ export class PosthogAnalytics {
this.enabled = true;
} else {
logger.info(
"Posthog is not enabled because there is no api key or no host given in the config"
"Posthog is not enabled because there is no api key or no host given in the config",
);
this.enabled = false;
}
@@ -157,7 +157,7 @@ export class PosthogAnalytics {
private sanitizeProperties = (
properties: Properties,
_eventName: string
_eventName: string,
): Properties => {
// Callback from posthog to sanitize properties before sending them to the server.
// Here we sanitize posthog's built in properties which leak PII e.g. url reporting.
@@ -183,7 +183,7 @@ export class PosthogAnalytics {
return properties;
};
private registerSuperProperties(properties: Properties) {
private registerSuperProperties(properties: Properties): void {
if (this.enabled) {
this.posthog.register(properties);
}
@@ -201,8 +201,8 @@ export class PosthogAnalytics {
private capture(
eventName: string,
properties: Properties,
options?: CaptureOptions
) {
options?: CaptureOptions,
): void {
if (!this.enabled) {
return;
}
@@ -213,7 +213,7 @@ export class PosthogAnalytics {
return this.enabled;
}
setAnonymity(anonymity: Anonymity): void {
private setAnonymity(anonymity: Anonymity): void {
// Update this.anonymity.
// To update the anonymity typically you want to call updateAnonymityFromSettings
// to ensure this value is in step with the user's settings.
@@ -236,7 +236,9 @@ export class PosthogAnalytics {
.join("");
}
private async identifyUser(analyticsIdGenerator: () => string) {
private async identifyUser(
analyticsIdGenerator: () => string,
): Promise<void> {
if (this.anonymity == Anonymity.Pseudonymous && this.enabled) {
// Check the user's account_data for an analytics ID to use. Storing the ID in account_data allows
// different devices to send the same ID.
@@ -258,27 +260,27 @@ export class PosthogAnalytics {
// The above could fail due to network requests, but not essential to starting the application,
// so swallow it.
logger.log(
"Unable to identify user for tracking" + (e as Error)?.toString()
"Unable to identify user for tracking" + (e as Error)?.toString(),
);
}
if (analyticsID) {
this.posthog.identify(analyticsID);
} else {
logger.info(
"No analyticsID is availble. Should not try to setup posthog"
"No analyticsID is availble. Should not try to setup posthog",
);
}
}
}
async getAnalyticsId() {
private async getAnalyticsId(): Promise<string | null> {
const client: MatrixClient = window.matrixclient;
let accountAnalyticsId;
if (widget) {
accountAnalyticsId = getUrlParams().analyticsID;
} else {
const accountData = await client.getAccountDataFromServer(
PosthogAnalytics.ANALYTICS_EVENT_TYPE
PosthogAnalytics.ANALYTICS_EVENT_TYPE,
);
accountAnalyticsId = accountData?.id;
}
@@ -291,12 +293,14 @@ export class PosthogAnalytics {
return null;
}
async hashedEcAnalyticsId(accountAnalyticsId: string): Promise<string> {
private async hashedEcAnalyticsId(
accountAnalyticsId: string,
): Promise<string> {
const client: MatrixClient = window.matrixclient;
const posthogIdMaterial = "ec" + accountAnalyticsId + client.getUserId();
const bufferForPosthogId = await crypto.subtle.digest(
"sha-256",
Buffer.from(posthogIdMaterial, "utf-8")
Buffer.from(posthogIdMaterial, "utf-8"),
);
const view = new Int32Array(bufferForPosthogId);
return Array.from(view)
@@ -304,17 +308,17 @@ export class PosthogAnalytics {
.join("");
}
async setAccountAnalyticsId(analyticsID: string) {
private async setAccountAnalyticsId(analyticsID: string): Promise<void> {
if (!widget) {
const client = window.matrixclient;
// the analytics ID only needs to be set in the standalone version.
const accountData = await client.getAccountDataFromServer(
PosthogAnalytics.ANALYTICS_EVENT_TYPE
PosthogAnalytics.ANALYTICS_EVENT_TYPE,
);
await client.setAccountData(
PosthogAnalytics.ANALYTICS_EVENT_TYPE,
Object.assign({ id: analyticsID }, accountData)
Object.assign({ id: analyticsID }, accountData),
);
}
}
@@ -335,7 +339,7 @@ export class PosthogAnalytics {
this.updateAnonymityAndIdentifyUser(optInAnalytics);
}
private updateSuperProperties() {
private updateSuperProperties(): void {
// Update super properties in posthog with our platform (app version, platform).
// These properties will be subsequently passed in every event.
//
@@ -356,7 +360,7 @@ export class PosthogAnalytics {
}
private async updateAnonymityAndIdentifyUser(
pseudonymousOptIn: boolean
pseudonymousOptIn: boolean,
): Promise<void> {
// Update this.anonymity based on the user's analytics opt-in settings
const anonymity = pseudonymousOptIn
@@ -372,11 +376,11 @@ export class PosthogAnalytics {
this.setRegistrationType(
window.matrixclient.isGuest() || window.passwordlessUser
? RegistrationType.Guest
: RegistrationType.Registered
: RegistrationType.Registered,
);
// store the promise to await posthog-tracking-events until the identification is done.
this.identificationPromise = this.identifyUser(
PosthogAnalytics.getRandomAnalyticsId
PosthogAnalytics.getRandomAnalyticsId,
);
await this.identificationPromise;
if (this.userRegisteredInThisSession()) {
@@ -391,7 +395,7 @@ export class PosthogAnalytics {
public async trackEvent<E extends IPosthogEvent>(
{ eventName, ...properties }: E,
options?: CaptureOptions
options?: CaptureOptions,
): Promise<void> {
if (this.identificationPromise) {
// only make calls to posthog after the identificaion is done

View File

@@ -36,18 +36,22 @@ export class CallEndedTracker {
maxParticipantsCount: 0,
};
cacheStartCall(time: Date) {
public cacheStartCall(time: Date): void {
this.cache.startTime = time;
}
cacheParticipantCountChanged(count: number) {
public cacheParticipantCountChanged(count: number): void {
this.cache.maxParticipantsCount = Math.max(
count,
this.cache.maxParticipantsCount
this.cache.maxParticipantsCount,
);
}
track(callId: string, callParticipantsNow: number, sendInstantly: boolean) {
public track(
callId: string,
callParticipantsNow: number,
sendInstantly: boolean,
): void {
PosthogAnalytics.instance.trackEvent<CallEnded>(
{
eventName: "CallEnded",
@@ -56,7 +60,7 @@ export class CallEndedTracker {
callParticipantsOnLeave: callParticipantsNow,
callDuration: (Date.now() - this.cache.startTime.getTime()) / 1000,
},
{ send_instantly: sendInstantly }
{ send_instantly: sendInstantly },
);
}
}
@@ -67,7 +71,7 @@ interface CallStarted extends IPosthogEvent {
}
export class CallStartedTracker {
track(callId: string) {
public track(callId: string): void {
PosthogAnalytics.instance.trackEvent<CallStarted>({
eventName: "CallStarted",
callId: callId,
@@ -86,19 +90,19 @@ export class SignupTracker {
signupEnd: new Date(0),
};
cacheSignupStart(time: Date) {
public cacheSignupStart(time: Date): void {
this.cache.signupStart = time;
}
getSignupEndTime() {
public getSignupEndTime(): Date {
return this.cache.signupEnd;
}
cacheSignupEnd(time: Date) {
public cacheSignupEnd(time: Date): void {
this.cache.signupEnd = time;
}
track() {
public track(): void {
PosthogAnalytics.instance.trackEvent<Signup>({
eventName: "Signup",
signupDuration: Date.now() - this.cache.signupStart.getTime(),
@@ -112,7 +116,7 @@ interface Login extends IPosthogEvent {
}
export class LoginTracker {
track() {
public track(): void {
PosthogAnalytics.instance.trackEvent<Login>({
eventName: "Login",
});
@@ -127,7 +131,7 @@ interface MuteMicrophone {
}
export class MuteMicrophoneTracker {
track(targetIsMute: boolean, callId: string) {
public track(targetIsMute: boolean, callId: string): void {
PosthogAnalytics.instance.trackEvent<MuteMicrophone>({
eventName: "MuteMicrophone",
targetMuteState: targetIsMute ? "mute" : "unmute",
@@ -143,7 +147,7 @@ interface MuteCamera {
}
export class MuteCameraTracker {
track(targetIsMute: boolean, callId: string) {
public track(targetIsMute: boolean, callId: string): void {
PosthogAnalytics.instance.trackEvent<MuteCamera>({
eventName: "MuteCamera",
targetMuteState: targetIsMute ? "mute" : "unmute",
@@ -158,7 +162,7 @@ interface UndecryptableToDeviceEvent {
}
export class UndecryptableToDeviceEventTracker {
track(callId: string) {
public track(callId: string): void {
PosthogAnalytics.instance.trackEvent<UndecryptableToDeviceEvent>({
eventName: "UndecryptableToDeviceEvent",
callId,
@@ -174,7 +178,7 @@ interface QualitySurveyEvent {
}
export class QualitySurveyEventTracker {
track(callId: string, feedbackText: string, stars: number) {
public track(callId: string, feedbackText: string, stars: number): void {
PosthogAnalytics.instance.trackEvent<QualitySurveyEvent>({
eventName: "QualitySurvey",
callId,
@@ -190,7 +194,7 @@ interface CallDisconnectedEvent {
}
export class CallDisconnectedEventTracker {
track(reason?: DisconnectReason) {
public track(reason?: DisconnectReason): void {
PosthogAnalytics.instance.trackEvent<CallDisconnectedEvent>({
eventName: "CallDisconnected",
reason,

View File

@@ -39,9 +39,9 @@ const maxRejoinMs = 2 * 60 * 1000; // 2 minutes
* Span processor that extracts certain metrics from spans to send to PostHog
*/
export class PosthogSpanProcessor implements SpanProcessor {
async forceFlush(): Promise<void> {}
public async forceFlush(): Promise<void> {}
onStart(span: Span): void {
public onStart(span: Span): void {
// Hack: Yield to allow attributes to be set before processing
Promise.resolve().then(() => {
switch (span.name) {
@@ -55,7 +55,7 @@ export class PosthogSpanProcessor implements SpanProcessor {
});
}
onEnd(span: ReadableSpan): void {
public onEnd(span: ReadableSpan): void {
switch (span.name) {
case "matrix.groupCallMembership":
this.onGroupCallMembershipEnd(span);
@@ -148,7 +148,7 @@ export class PosthogSpanProcessor implements SpanProcessor {
ratioPeerConnectionToDevices: ratioPeerConnectionToDevices,
},
// Send instantly because the window might be closing
{ send_instantly: true }
{ send_instantly: true },
);
}
}
@@ -157,7 +157,7 @@ export class PosthogSpanProcessor implements SpanProcessor {
/**
* Shutdown the processor.
*/
shutdown(): Promise<void> {
public shutdown(): Promise<void> {
return Promise.resolve();
}
}

View File

@@ -1,4 +1,20 @@
import { Attributes } from "@opentelemetry/api";
/*
Copyright 2023 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.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
import { AttributeValue, Attributes } from "@opentelemetry/api";
import { hrTimeToMicroseconds } from "@opentelemetry/core";
import {
SpanProcessor,
@@ -6,7 +22,21 @@ import {
Span,
} from "@opentelemetry/sdk-trace-base";
const dumpAttributes = (attr: Attributes) =>
const dumpAttributes = (
attr: Attributes,
): {
key: string;
type:
| "string"
| "number"
| "bigint"
| "boolean"
| "symbol"
| "undefined"
| "object"
| "function";
value: AttributeValue | undefined;
}[] =>
Object.entries(attr).map(([key, value]) => ({
key,
type: typeof value,
@@ -20,13 +50,13 @@ const dumpAttributes = (attr: Attributes) =>
export class RageshakeSpanProcessor implements SpanProcessor {
private readonly spans: ReadableSpan[] = [];
async forceFlush(): Promise<void> {}
public async forceFlush(): Promise<void> {}
onStart(span: Span): void {
public onStart(span: Span): void {
this.spans.push(span);
}
onEnd(): void {}
public onEnd(): void {}
/**
* Dumps the spans collected so far as Jaeger-compatible JSON.
@@ -110,5 +140,5 @@ export class RageshakeSpanProcessor implements SpanProcessor {
});
}
async shutdown(): Promise<void> {}
public async shutdown(): Promise<void> {}
}

View File

@@ -22,7 +22,7 @@ limitations under the License.
// Array.prototype.findLastIndex
export function findLastIndex<T>(
array: T[],
predicate: (item: T, index: number) => boolean
predicate: (item: T, index: number) => boolean,
): number | null {
for (let i = array.length - 1; i >= 0; i--) {
if (predicate(array[i], i)) return i;
@@ -36,9 +36,9 @@ export function findLastIndex<T>(
*/
export const count = <T>(
array: T[],
predicate: (item: T, index: number) => boolean
predicate: (item: T, index: number) => boolean,
): number =>
array.reduce(
(acc, item, index) => (predicate(item, index) ? acc + 1 : acc),
0
0,
);

View File

@@ -18,7 +18,7 @@ import { FC, FormEvent, useCallback, useRef, useState } from "react";
import { useHistory, useLocation, Link } from "react-router-dom";
import { Trans, useTranslation } from "react-i18next";
import { ReactComponent as Logo } from "../icons/LogoLarge.svg";
import Logo from "../icons/LogoLarge.svg?react";
import { useClient } from "../ClientContext";
import { FieldRow, InputField, ErrorMessage } from "../input/Input";
import { Button } from "../button";
@@ -80,7 +80,7 @@ export const LoginPage: FC = () => {
setLoading(false);
});
},
[login, location, history, homeserver, setClient]
[login, location, history, homeserver, setClient],
);
return (

View File

@@ -34,7 +34,7 @@ import { Button } from "../button";
import { useClientLegacy } from "../ClientContext";
import { useInteractiveRegistration } from "./useInteractiveRegistration";
import styles from "./LoginPage.module.css";
import { ReactComponent as Logo } from "../icons/LogoLarge.svg";
import Logo from "../icons/LogoLarge.svg?react";
import { LoadingView } from "../FullScreenView";
import { useRecaptcha } from "./useRecaptcha";
import { Caption, Link } from "../typography/Typography";
@@ -69,7 +69,7 @@ export const RegisterPage: FC = () => {
if (password !== passwordConfirmation) return;
const submit = async () => {
const submit = async (): Promise<void> => {
setRegistering(true);
const recaptchaResponse = await execute();
@@ -78,7 +78,7 @@ export const RegisterPage: FC = () => {
password,
userName,
recaptchaResponse,
passwordlessUser
passwordlessUser,
);
if (client && client?.groupCallEventHandler && passwordlessUser) {
@@ -135,7 +135,7 @@ export const RegisterPage: FC = () => {
execute,
client,
setClient,
]
],
);
useEffect(() => {
@@ -184,7 +184,7 @@ export const RegisterPage: FC = () => {
required
name="password"
type="password"
onChange={(e: ChangeEvent<HTMLInputElement>) =>
onChange={(e: ChangeEvent<HTMLInputElement>): void =>
setPassword(e.target.value)
}
value={password}
@@ -198,7 +198,7 @@ export const RegisterPage: FC = () => {
required
type="password"
name="passwordConfirmation"
onChange={(e: ChangeEvent<HTMLInputElement>) =>
onChange={(e: ChangeEvent<HTMLInputElement>): void =>
setPasswordConfirmation(e.target.value)
}
value={passwordConfirmation}

View File

@@ -21,12 +21,16 @@ import { createClient, MatrixClient } from "matrix-js-sdk/src/matrix";
import { initClient } from "../matrix-utils";
import { Session } from "../ClientContext";
export const useInteractiveLogin = () =>
useCallback<
export function useInteractiveLogin(): (
homeserver: string,
username: string,
password: string,
) => Promise<[MatrixClient, Session]> {
return useCallback<
(
homeserver: string,
username: string,
password: string
password: string,
) => Promise<[MatrixClient, Session]>
>(async (homeserver: string, username: string, password: string) => {
const authClient = createClient({ baseUrl: homeserver });
@@ -41,8 +45,8 @@ export const useInteractiveLogin = () =>
},
password,
}),
stateUpdated: (...args) => {},
requestEmailToken: (...args): Promise<{ sid: string }> => {
stateUpdated: (): void => {},
requestEmailToken: (): Promise<{ sid: string }> => {
return Promise.resolve({ sid: "" });
},
});
@@ -66,9 +70,9 @@ export const useInteractiveLogin = () =>
userId: user_id,
deviceId: device_id,
},
false
false,
);
/* eslint-enable camelcase */
return [client, session];
}, []);
}

View File

@@ -30,14 +30,14 @@ export const useInteractiveRegistration = (): {
password: string,
displayName: string,
recaptchaResponse: string,
passwordlessUser: boolean
passwordlessUser: boolean,
) => Promise<[MatrixClient, Session]>;
} => {
const [privacyPolicyUrl, setPrivacyPolicyUrl] = useState<string | undefined>(
undefined
undefined,
);
const [recaptchaKey, setRecaptchaKey] = useState<string | undefined>(
undefined
undefined,
);
const authClient = useRef<MatrixClient>();
@@ -50,7 +50,7 @@ export const useInteractiveRegistration = (): {
useEffect(() => {
authClient.current!.registerRequest({}).catch((error) => {
setPrivacyPolicyUrl(
error.data?.params["m.login.terms"]?.policies?.privacy_policy?.en?.url
error.data?.params["m.login.terms"]?.policies?.privacy_policy?.en?.url,
);
setRecaptchaKey(error.data?.params["m.login.recaptcha"]?.public_key);
});
@@ -62,7 +62,7 @@ export const useInteractiveRegistration = (): {
password: string,
displayName: string,
recaptchaResponse: string,
passwordlessUser: boolean
passwordlessUser: boolean,
): Promise<[MatrixClient, Session]> => {
const interactiveAuth = new InteractiveAuth({
matrixClient: authClient.current!,
@@ -72,7 +72,7 @@ export const useInteractiveRegistration = (): {
password,
auth: auth || undefined,
}),
stateUpdated: (nextStage, status) => {
stateUpdated: (nextStage, status): void => {
if (status.error) {
throw new Error(status.error);
}
@@ -88,7 +88,7 @@ export const useInteractiveRegistration = (): {
});
}
},
requestEmailToken: (...args) => {
requestEmailToken: (): Promise<{ sid: string }> => {
return Promise.resolve({ sid: "dummy" });
},
});
@@ -106,7 +106,7 @@ export const useInteractiveRegistration = (): {
userId: user_id,
deviceId: device_id,
},
false
false,
);
await client.setDisplayName(displayName);
@@ -129,7 +129,7 @@ export const useInteractiveRegistration = (): {
return [client, session];
},
[]
[],
);
return { privacyPolicyUrl, recaptchaKey, register };

View File

@@ -35,7 +35,11 @@ interface RecaptchaPromiseRef {
reject: (error: Error) => void;
}
export const useRecaptcha = (sitekey?: string) => {
export function useRecaptcha(sitekey?: string): {
execute: () => Promise<string>;
reset: () => void;
recaptchaId: string;
} {
const { t } = useTranslation();
const [recaptchaId] = useState(() => randomString(16));
const promiseRef = useRef<RecaptchaPromiseRef>();
@@ -43,7 +47,7 @@ export const useRecaptcha = (sitekey?: string) => {
useEffect(() => {
if (!sitekey) return;
const onRecaptchaLoaded = () => {
const onRecaptchaLoaded = (): void => {
if (!document.getElementById(recaptchaId)) return;
window.grecaptcha.render(recaptchaId, {
@@ -91,11 +95,11 @@ export const useRecaptcha = (sitekey?: string) => {
});
promiseRef.current = {
resolve: (value) => {
resolve: (value): void => {
resolve(value);
observer.disconnect();
},
reject: (error) => {
reject: (error): void => {
reject(error);
observer.disconnect();
},
@@ -104,7 +108,7 @@ export const useRecaptcha = (sitekey?: string) => {
window.grecaptcha.execute();
const iframe = document.querySelector<HTMLIFrameElement>(
'iframe[src*="recaptcha/api2/bframe"]'
'iframe[src*="recaptcha/api2/bframe"]',
);
if (iframe?.parentNode?.parentNode) {
@@ -120,4 +124,4 @@ export const useRecaptcha = (sitekey?: string) => {
}, []);
return { execute, reset, recaptchaId };
};
}

View File

@@ -48,7 +48,7 @@ export function useRegisterPasswordlessUser(): UseRegisterPasswordlessUserType {
randomString(16),
displayName,
recaptchaResponse,
true
true,
);
setClient({ client, session });
} catch (e) {
@@ -56,7 +56,7 @@ export function useRegisterPasswordlessUser(): UseRegisterPasswordlessUserType {
throw e;
}
},
[execute, reset, register, setClient]
[execute, reset, register, setClient],
);
return { privacyPolicyUrl, registerPasswordlessUser, recaptchaId };

View File

@@ -146,7 +146,9 @@ limitations under the License.
.copyButton {
width: 100%;
height: 40px;
transition: border-color 250ms, background-color 250ms;
transition:
border-color 250ms,
background-color 250ms;
}
.copyButton span {

View File

@@ -13,25 +13,25 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
import { forwardRef } from "react";
import { FC, forwardRef } from "react";
import { PressEvent } from "@react-types/shared";
import classNames from "classnames";
import { useButton } from "@react-aria/button";
import { mergeProps, useObjectRef } from "@react-aria/utils";
import { useTranslation } from "react-i18next";
import { Tooltip } from "@vector-im/compound-web";
import { ReactComponent as MicOnSolidIcon } from "@vector-im/compound-design-tokens/icons/mic-on-solid.svg";
import { ReactComponent as MicOffSolidIcon } from "@vector-im/compound-design-tokens/icons/mic-off-solid.svg";
import { ReactComponent as VideoCallIcon } from "@vector-im/compound-design-tokens/icons/video-call.svg";
import { ReactComponent as VideoCallOffIcon } from "@vector-im/compound-design-tokens/icons/video-call-off.svg";
import { ReactComponent as EndCallIcon } from "@vector-im/compound-design-tokens/icons/end-call.svg";
import { ReactComponent as ShareScreenSolidIcon } from "@vector-im/compound-design-tokens/icons/share-screen-solid.svg";
import { ReactComponent as SettingsSolidIcon } from "@vector-im/compound-design-tokens/icons/settings-solid.svg";
import { ReactComponent as ChevronDownIcon } from "@vector-im/compound-design-tokens/icons/chevron-down.svg";
import MicOnSolidIcon from "@vector-im/compound-design-tokens/icons/mic-on-solid.svg?react";
import MicOffSolidIcon from "@vector-im/compound-design-tokens/icons/mic-off-solid.svg?react";
import VideoCallIcon from "@vector-im/compound-design-tokens/icons/video-call.svg?react";
import VideoCallOffIcon from "@vector-im/compound-design-tokens/icons/video-call-off.svg?react";
import EndCallIcon from "@vector-im/compound-design-tokens/icons/end-call.svg?react";
import ShareScreenSolidIcon from "@vector-im/compound-design-tokens/icons/share-screen-solid.svg?react";
import SettingsSolidIcon from "@vector-im/compound-design-tokens/icons/settings-solid.svg?react";
import ChevronDownIcon from "@vector-im/compound-design-tokens/icons/chevron-down.svg?react";
import styles from "./Button.module.css";
import { ReactComponent as Fullscreen } from "../icons/Fullscreen.svg";
import { ReactComponent as FullscreenExit } from "../icons/FullscreenExit.svg";
import Fullscreen from "../icons/Fullscreen.svg?react";
import FullscreenExit from "../icons/FullscreenExit.svg?react";
import { VolumeIcon } from "./VolumeIcon";
export type ButtonVariant =
@@ -94,12 +94,12 @@ export const Button = forwardRef<HTMLButtonElement, Props>(
onPressStart,
...rest
},
ref
ref,
) => {
const buttonRef = useObjectRef<HTMLButtonElement>(ref);
const { buttonProps } = useButton(
{ onPress, onPressStart, ...rest },
buttonRef
buttonRef,
);
// TODO: react-aria's useButton hook prevents form submission via keyboard
@@ -121,7 +121,7 @@ export const Button = forwardRef<HTMLButtonElement, Props>(
{
[styles.on]: on,
[styles.off]: off,
}
},
)}
{...mergeProps(rest, filteredButtonProps)}
ref={buttonRef}
@@ -132,17 +132,14 @@ export const Button = forwardRef<HTMLButtonElement, Props>(
</>
</button>
);
}
},
);
export function MicButton({
muted,
...rest
}: {
export const MicButton: FC<{
muted: boolean;
// TODO: add all props for <Button>
[index: string]: unknown;
}) {
}> = ({ muted, ...rest }) => {
const { t } = useTranslation();
const Icon = muted ? MicOffSolidIcon : MicOnSolidIcon;
const label = muted ? t("Unmute microphone") : t("Mute microphone");
@@ -154,16 +151,13 @@ export function MicButton({
</Button>
</Tooltip>
);
}
};
export function VideoButton({
muted,
...rest
}: {
export const VideoButton: FC<{
muted: boolean;
// TODO: add all props for <Button>
[index: string]: unknown;
}) {
}> = ({ muted, ...rest }) => {
const { t } = useTranslation();
const Icon = muted ? VideoCallOffIcon : VideoCallIcon;
const label = muted ? t("Start video") : t("Stop video");
@@ -175,18 +169,14 @@ export function VideoButton({
</Button>
</Tooltip>
);
}
};
export function ScreenshareButton({
enabled,
className,
...rest
}: {
export const ScreenshareButton: FC<{
enabled: boolean;
className?: string;
// TODO: add all props for <Button>
[index: string]: unknown;
}) {
}> = ({ enabled, className, ...rest }) => {
const { t } = useTranslation();
const label = enabled ? t("Sharing screen") : t("Share screen");
@@ -197,16 +187,13 @@ export function ScreenshareButton({
</Button>
</Tooltip>
);
}
};
export function HangupButton({
className,
...rest
}: {
export const HangupButton: FC<{
className?: string;
// TODO: add all props for <Button>
[index: string]: unknown;
}) {
}> = ({ className, ...rest }) => {
const { t } = useTranslation();
return (
@@ -220,16 +207,13 @@ export function HangupButton({
</Button>
</Tooltip>
);
}
};
export function SettingsButton({
className,
...rest
}: {
export const SettingsButton: FC<{
className?: string;
// TODO: add all props for <Button>
[index: string]: unknown;
}) {
}> = ({ className, ...rest }) => {
const { t } = useTranslation();
return (
@@ -239,7 +223,7 @@ export function SettingsButton({
</Button>
</Tooltip>
);
}
};
interface AudioButtonProps extends Omit<Props, "variant"> {
/**
@@ -248,7 +232,7 @@ interface AudioButtonProps extends Omit<Props, "variant"> {
volume: number;
}
export function AudioButton({ volume, ...rest }: AudioButtonProps) {
export const AudioButton: FC<AudioButtonProps> = ({ volume, ...rest }) => {
const { t } = useTranslation();
return (
@@ -258,16 +242,16 @@ export function AudioButton({ volume, ...rest }: AudioButtonProps) {
</Button>
</Tooltip>
);
}
};
interface FullscreenButtonProps extends Omit<Props, "variant"> {
fullscreen?: boolean;
}
export function FullscreenButton({
export const FullscreenButton: FC<FullscreenButtonProps> = ({
fullscreen,
...rest
}: FullscreenButtonProps) {
}) => {
const { t } = useTranslation();
const Icon = fullscreen ? FullscreenExit : Fullscreen;
const label = fullscreen ? t("Exit full screen") : t("Full screen");
@@ -279,4 +263,4 @@ export function FullscreenButton({
</Button>
</Tooltip>
);
}
};

View File

@@ -16,9 +16,10 @@ limitations under the License.
import { useTranslation } from "react-i18next";
import useClipboard from "react-use-clipboard";
import { FC } from "react";
import { ReactComponent as CheckIcon } from "../icons/Check.svg";
import { ReactComponent as CopyIcon } from "../icons/Copy.svg";
import CheckIcon from "../icons/Check.svg?react";
import CopyIcon from "../icons/Copy.svg?react";
import { Button, ButtonVariant } from "./Button";
interface Props {
@@ -28,14 +29,15 @@ interface Props {
variant?: ButtonVariant;
copiedMessage?: string;
}
export function CopyButton({
export const CopyButton: FC<Props> = ({
value,
children,
className,
variant,
copiedMessage,
...rest
}: Props) {
}) => {
const { t } = useTranslation();
const [isCopied, setCopied] = useClipboard(value, { successDuration: 3000 });
@@ -62,4 +64,4 @@ export function CopyButton({
)}
</Button>
);
}
};

View File

@@ -17,15 +17,15 @@ limitations under the License.
import { ComponentPropsWithoutRef, FC } from "react";
import { Button } from "@vector-im/compound-web";
import { useTranslation } from "react-i18next";
import { ReactComponent as UserAddSolidIcon } from "@vector-im/compound-design-tokens/icons/user-add-solid.svg";
import UserAddSolidIcon from "@vector-im/compound-design-tokens/icons/user-add-solid.svg?react";
export const ShareButton: FC<
export const InviteButton: FC<
Omit<ComponentPropsWithoutRef<"button">, "children">
> = (props) => {
const { t } = useTranslation();
return (
<Button kind="secondary" size="sm" Icon={UserAddSolidIcon} {...props}>
{t("Share")}
{t("Invite")}
</Button>
);
};

View File

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
import { HTMLAttributes } from "react";
import { FC, HTMLAttributes } from "react";
import { Link } from "react-router-dom";
import classNames from "classnames";
import * as H from "history";
@@ -34,20 +34,20 @@ interface Props extends HTMLAttributes<HTMLAnchorElement> {
className?: string;
}
export function LinkButton({
export const LinkButton: FC<Props> = ({
children,
to,
size,
variant,
className,
...rest
}: Props) {
}) => {
return (
<Link
className={classNames(
variantToClassName[variant || "secondary"],
size ? sizeToClassName[size] : [],
className
className,
)}
to={to}
{...rest}
@@ -55,4 +55,4 @@ export function LinkButton({
{children}
</Link>
);
}
};

View File

@@ -17,9 +17,9 @@ limitations under the License.
import { ComponentPropsWithoutRef, FC } from "react";
import { ReactComponent as AudioMuted } from "../icons/AudioMuted.svg";
import { ReactComponent as AudioLow } from "../icons/AudioLow.svg";
import { ReactComponent as Audio } from "../icons/Audio.svg";
import AudioMuted from "../icons/AudioMuted.svg?react";
import AudioLow from "../icons/AudioLow.svg?react";
import Audio from "../icons/Audio.svg?react";
interface Props extends ComponentPropsWithoutRef<"svg"> {
/**

View File

@@ -57,7 +57,7 @@ export class Config {
}
async function downloadConfig(
configJsonFilename: string
configJsonFilename: string,
): Promise<ConfigOptions> {
const url = new URL(configJsonFilename, window.location.href);
url.searchParams.set("cachebuster", Date.now().toString());

View File

@@ -19,14 +19,14 @@ import { useEffect, useMemo } from "react";
import { useEnableE2EE } from "../settings/useSetting";
import { useLocalStorage } from "../useLocalStorage";
import { useClient } from "../ClientContext";
import { PASSWORD_STRING, useUrlParams } from "../UrlParams";
import { useUrlParams } from "../UrlParams";
import { widget } from "../widget";
export const getRoomSharedKeyLocalStorageKey = (roomId: string): string =>
`room-shared-key-${roomId}`;
const useInternalRoomSharedKey = (
roomId: string
roomId: string,
): [string | null, (value: string) => void] => {
const key = useMemo(() => getRoomSharedKeyLocalStorageKey(roomId), [roomId]);
const [e2eeEnabled] = useEnableE2EE();
@@ -60,29 +60,6 @@ export const useRoomSharedKey = (roomId: string): string | null => {
return useInternalRoomSharedKey(roomId)[0] ?? passwordFormUrl;
};
export const useManageRoomSharedKey = (roomId: string): string | null => {
const urlParams = useUrlParams();
const urlPassword = useKeyFromUrl(roomId);
const [e2eeSharedKey] = useInternalRoomSharedKey(roomId);
useEffect(() => {
const hash = location.hash;
if (!hash.includes("?")) return;
if (!hash.includes(PASSWORD_STRING)) return;
if (urlParams.password !== e2eeSharedKey) return;
const [hashStart, passwordStart] = hash.split(PASSWORD_STRING);
const hashEnd = passwordStart.split("&").slice(1).join("&");
location.replace((hashStart ?? "") + (hashEnd ?? ""));
}, [urlParams, e2eeSharedKey]);
return e2eeSharedKey ?? urlPassword;
};
export const useIsRoomE2EE = (roomId: string): boolean | null => {
const { client } = useClient();
const room = useMemo(() => client?.getRoom(roomId) ?? null, [roomId, client]);
@@ -91,6 +68,6 @@ export const useIsRoomE2EE = (roomId: string): boolean | null => {
// should inspect the e2eEnabled URL parameter here?
return useMemo(
() => widget === null && (room === null || !room.getCanonicalAlias()),
[room]
[room],
);
};

View File

@@ -36,5 +36,5 @@ export const Form = forwardRef<HTMLFormElement, FormProps>(
{children}
</form>
);
}
},
);

View File

@@ -18,6 +18,7 @@ import { Link } from "react-router-dom";
import { MatrixClient } from "matrix-js-sdk/src/client";
import { RoomMember } from "matrix-js-sdk/src/models/room-member";
import { Room } from "matrix-js-sdk/src/models/room";
import { FC } from "react";
import { CopyButton } from "../button";
import { Avatar, Size } from "../Avatar";
@@ -31,7 +32,8 @@ interface CallListProps {
rooms: GroupCallRoom[];
client: MatrixClient;
}
export function CallList({ rooms, client }: CallListProps) {
export const CallList: FC<CallListProps> = ({ rooms, client }) => {
return (
<>
<div className={styles.callList}>
@@ -54,7 +56,7 @@ export function CallList({ rooms, client }: CallListProps) {
</div>
</>
);
}
};
interface CallTileProps {
name: string;
avatarUrl: string;
@@ -62,15 +64,18 @@ interface CallTileProps {
participants: RoomMember[];
client: MatrixClient;
}
function CallTile({ name, avatarUrl, room }: CallTileProps) {
const CallTile: FC<CallTileProps> = ({ name, avatarUrl, room }) => {
const roomSharedKey = useRoomSharedKey(room.roomId);
return (
<div className={styles.callTile}>
<Link
// note we explicitly omit the password here as we don't want it on this link because
// it's just for the user to navigate around and not for sharing
to={getRelativeRoomUrl(room.roomId, room.name)}
to={getRelativeRoomUrl(
room.roomId,
room.name,
roomSharedKey ?? undefined,
)}
className={styles.callTileLink}
>
<Avatar id={room.roomId} name={name} size={Size.LG} src={avatarUrl} />
@@ -87,9 +92,9 @@ function CallTile({ name, avatarUrl, room }: CallTileProps) {
value={getAbsoluteRoomUrl(
room.roomId,
room.name,
roomSharedKey ?? undefined
roomSharedKey ?? undefined,
)}
/>
</div>
);
}
};

View File

@@ -15,6 +15,7 @@ limitations under the License.
*/
import { useTranslation } from "react-i18next";
import { FC } from "react";
import { useClientState } from "../ClientContext";
import { ErrorView, LoadingView } from "../FullScreenView";
@@ -22,7 +23,7 @@ import { UnauthenticatedView } from "./UnauthenticatedView";
import { RegisteredView } from "./RegisteredView";
import { usePageTitle } from "../usePageTitle";
export function HomePage() {
export const HomePage: FC = () => {
const { t } = useTranslation();
usePageTitle(t("Home"));
@@ -39,4 +40,4 @@ export function HomePage() {
<UnauthenticatedView />
);
}
}
};

View File

@@ -16,6 +16,7 @@ limitations under the License.
import { PressEvent } from "@react-types/shared";
import { useTranslation } from "react-i18next";
import { FC } from "react";
import { Modal } from "../Modal";
import { Button } from "../button";
@@ -28,7 +29,11 @@ interface Props {
onJoin: (e: PressEvent) => void;
}
export function JoinExistingCallModal({ onJoin, open, onDismiss }: Props) {
export const JoinExistingCallModal: FC<Props> = ({
onJoin,
open,
onDismiss,
}) => {
const { t } = useTranslation();
return (
@@ -42,4 +47,4 @@ export function JoinExistingCallModal({ onJoin, open, onDismiss }: Props) {
</FieldRow>
</Modal>
);
}
};

View File

@@ -14,10 +14,9 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
import { useState, useCallback, FormEvent, FormEventHandler } from "react";
import { useState, useCallback, FormEvent, FormEventHandler, FC } from "react";
import { useHistory } from "react-router-dom";
import { MatrixClient } from "matrix-js-sdk/src/client";
import { randomString } from "matrix-js-sdk/src/randomstring";
import { useTranslation } from "react-i18next";
import { Heading } from "@vector-im/compound-web";
import { logger } from "matrix-js-sdk/src/logger";
@@ -42,14 +41,12 @@ import { Form } from "../form/Form";
import { useEnableE2EE, useOptInAnalytics } from "../settings/useSetting";
import { AnalyticsNotice } from "../analytics/AnalyticsNotice";
import { E2EEBanner } from "../E2EEBanner";
import { setLocalStorageItem } from "../useLocalStorage";
import { getRoomSharedKeyLocalStorageKey } from "../e2ee/sharedKeyManagement";
interface Props {
client: MatrixClient;
}
export function RegisteredView({ client }: Props) {
export const RegisteredView: FC<Props> = ({ client }) => {
const [loading, setLoading] = useState(false);
const [error, setError] = useState<Error>();
const [optInAnalytics] = useOptInAnalytics();
@@ -59,7 +56,7 @@ export function RegisteredView({ client }: Props) {
useState(false);
const onDismissJoinExistingCallModal = useCallback(
() => setJoinExistingCallModalOpen(false),
[setJoinExistingCallModalOpen]
[setJoinExistingCallModalOpen],
);
const [e2eeEnabled] = useEnableE2EE();
@@ -73,22 +70,23 @@ export function RegisteredView({ client }: Props) {
? sanitiseRoomNameInput(roomNameData)
: "";
async function submit() {
async function submit(): Promise<void> {
setError(undefined);
setLoading(true);
const roomId = (
await createRoom(client, roomName, e2eeEnabled ?? false)
)[1];
const createRoomResult = await createRoom(
client,
roomName,
e2eeEnabled ?? false,
);
if (e2eeEnabled) {
setLocalStorageItem(
getRoomSharedKeyLocalStorageKey(roomId),
randomString(32)
);
}
history.push(getRelativeRoomUrl(roomId, roomName));
history.push(
getRelativeRoomUrl(
createRoomResult.roomId,
roomName,
createRoomResult.password,
),
);
}
submit().catch((error) => {
@@ -104,7 +102,7 @@ export function RegisteredView({ client }: Props) {
}
});
},
[client, history, setJoinExistingCallModalOpen, e2eeEnabled]
[client, history, setJoinExistingCallModalOpen, e2eeEnabled],
);
const recentRooms = useGroupCallRooms(client);
@@ -177,4 +175,4 @@ export function RegisteredView({ client }: Props) {
/>
</>
);
}
};

View File

@@ -44,8 +44,6 @@ import { AnalyticsNotice } from "../analytics/AnalyticsNotice";
import { useEnableE2EE, useOptInAnalytics } from "../settings/useSetting";
import { Config } from "../config/Config";
import { E2EEBanner } from "../E2EEBanner";
import { getRoomSharedKeyLocalStorageKey } from "../e2ee/sharedKeyManagement";
import { setLocalStorageItem } from "../useLocalStorage";
export const UnauthenticatedView: FC = () => {
const { setClient } = useClient();
@@ -59,7 +57,7 @@ export const UnauthenticatedView: FC = () => {
useState(false);
const onDismissJoinExistingCallModal = useCallback(
() => setJoinExistingCallModalOpen(false),
[setJoinExistingCallModalOpen]
[setJoinExistingCallModalOpen],
);
const [onFinished, setOnFinished] = useState<() => void>();
const history = useHistory();
@@ -74,7 +72,7 @@ export const UnauthenticatedView: FC = () => {
const roomName = sanitiseRoomNameInput(data.get("callName") as string);
const displayName = data.get("displayName") as string;
async function submit() {
async function submit(): Promise<void> {
setError(undefined);
setLoading(true);
const recaptchaResponse = await execute();
@@ -84,21 +82,16 @@ export const UnauthenticatedView: FC = () => {
randomString(16),
displayName,
recaptchaResponse,
true
true,
);
let roomId: string;
let createRoomResult;
try {
roomId = (
await createRoom(client, roomName, e2eeEnabled ?? false)
)[1];
if (e2eeEnabled) {
setLocalStorageItem(
getRoomSharedKeyLocalStorageKey(roomId),
randomString(32)
);
}
createRoomResult = await createRoom(
client,
roomName,
e2eeEnabled ?? false,
);
} catch (error) {
if (!setClient) {
throw error;
@@ -127,7 +120,13 @@ export const UnauthenticatedView: FC = () => {
}
setClient({ client, session });
history.push(getRelativeRoomUrl(roomId, roomName));
history.push(
getRelativeRoomUrl(
createRoomResult.roomId,
roomName,
createRoomResult.password,
),
);
}
submit().catch((error) => {
@@ -145,7 +144,7 @@ export const UnauthenticatedView: FC = () => {
setJoinExistingCallModalOpen,
setClient,
e2eeEnabled,
]
],
);
return (

View File

@@ -31,7 +31,7 @@ export interface GroupCallRoom {
}
const tsCache: { [index: string]: number } = {};
function getLastTs(client: MatrixClient, r: Room) {
function getLastTs(client: MatrixClient, r: Room): number {
if (tsCache[r.roomId]) {
return tsCache[r.roomId];
}
@@ -47,7 +47,7 @@ function getLastTs(client: MatrixClient, r: Room) {
if (r.getMyMembership() !== "join") {
const membershipEvent = r.currentState.getStateEvents(
"m.room.member",
myUserId
myUserId,
);
if (membershipEvent && !Array.isArray(membershipEvent)) {
@@ -82,7 +82,7 @@ export function useGroupCallRooms(client: MatrixClient): GroupCallRoom[] {
const [rooms, setRooms] = useState<GroupCallRoom[]>([]);
useEffect(() => {
function updateRooms() {
function updateRooms(): void {
if (!client.groupCallEventHandler) {
return;
}
@@ -115,7 +115,7 @@ export function useGroupCallRooms(client: MatrixClient): GroupCallRoom[] {
client.removeListener(GroupCallEventHandlerEvent.Incoming, updateRooms);
client.removeListener(
GroupCallEventHandlerEvent.Participants,
updateRooms
updateRooms,
);
};
}, [client]);

View File

@@ -41,8 +41,12 @@ limitations under the License.
--cpd-color-border-accent: var(--cpd-color-green-800);
/* The distance to inset non-full-width content from the edge of the window
along the inline axis */
--inline-content-inset: max(var(--cpd-space-4x), calc((100vw - 1180px) / 2));
along the inline axis. This ramps up from 16px for typical mobile windows, to
96px for typical desktop windows. */
--inline-content-inset: min(
var(--cpd-space-24x),
max(var(--cpd-space-4x), calc((100vw - 900px) / 3))
);
--small-drop-shadow: 0px 1.2px 2.4px 0px rgba(0, 0, 0, 0.15);
--subtle-drop-shadow: 0px 1px 2px 0px rgba(16, 24, 40, 0.05);
--background-gradient: url("graphics/backgroundGradient.svg");
@@ -64,7 +68,8 @@ limitations under the License.
font-weight: 400;
font-display: swap;
unicode-range: var(--inter-unicode-range);
src: url("/fonts/Inter/Inter-Regular.woff2") format("woff2"),
src:
url("/fonts/Inter/Inter-Regular.woff2") format("woff2"),
url("/fonts/Inter/Inter-Regular.woff") format("woff");
}
@@ -74,7 +79,8 @@ limitations under the License.
font-weight: 400;
font-display: swap;
unicode-range: var(--inter-unicode-range);
src: url("/fonts/Inter/Inter-Italic.woff2") format("woff2"),
src:
url("/fonts/Inter/Inter-Italic.woff2") format("woff2"),
url("/fonts/Inter/Inter-Italic.woff") format("woff");
}
@@ -84,7 +90,8 @@ limitations under the License.
font-weight: 500;
font-display: swap;
unicode-range: var(--inter-unicode-range);
src: url("/fonts/Inter/Inter-Medium.woff2") format("woff2"),
src:
url("/fonts/Inter/Inter-Medium.woff2") format("woff2"),
url("/fonts/Inter/Inter-Medium.woff") format("woff");
}
@@ -94,7 +101,8 @@ limitations under the License.
font-weight: 500;
font-display: swap;
unicode-range: var(--inter-unicode-range);
src: url("/fonts/Inter/Inter-MediumItalic.woff2") format("woff2"),
src:
url("/fonts/Inter/Inter-MediumItalic.woff2") format("woff2"),
url("/fonts/Inter/Inter-MediumItalic.woff") format("woff");
}
@@ -104,7 +112,8 @@ limitations under the License.
font-weight: 600;
font-display: swap;
unicode-range: var(--inter-unicode-range);
src: url("/fonts/Inter/Inter-SemiBold.woff2") format("woff2"),
src:
url("/fonts/Inter/Inter-SemiBold.woff2") format("woff2"),
url("/fonts/Inter/Inter-SemiBold.woff") format("woff");
}
@@ -114,7 +123,8 @@ limitations under the License.
font-weight: 600;
font-display: swap;
unicode-range: var(--inter-unicode-range);
src: url("/fonts/Inter/Inter-SemiBoldItalic.woff2") format("woff2"),
src:
url("/fonts/Inter/Inter-SemiBoldItalic.woff2") format("woff2"),
url("/fonts/Inter/Inter-SemiBoldItalic.woff") format("woff");
}
@@ -124,7 +134,8 @@ limitations under the License.
font-weight: 700;
font-display: swap;
unicode-range: var(--inter-unicode-range);
src: url("/fonts/Inter/Inter-Bold.woff2") format("woff2"),
src:
url("/fonts/Inter/Inter-Bold.woff2") format("woff2"),
url("/fonts/Inter/Inter-Bold.woff") format("woff");
}
@@ -134,7 +145,8 @@ limitations under the License.
font-weight: 700;
font-display: swap;
unicode-range: var(--inter-unicode-range);
src: url("/fonts/Inter/Inter-BoldItalic.woff2") format("woff2"),
src:
url("/fonts/Inter/Inter-BoldItalic.woff2") format("woff2"),
url("/fonts/Inter/Inter-BoldItalic.woff") format("woff");
}

View File

@@ -35,11 +35,11 @@ enum LoadState {
class DependencyLoadStates {
// TODO: decide where olm should be initialized (see TODO comment below)
// olm: LoadState = LoadState.None;
config: LoadState = LoadState.None;
sentry: LoadState = LoadState.None;
openTelemetry: LoadState = LoadState.None;
public config: LoadState = LoadState.None;
public sentry: LoadState = LoadState.None;
public openTelemetry: LoadState = LoadState.None;
allDepsAreLoaded() {
public allDepsAreLoaded(): boolean {
return !Object.values(this).some((s) => s !== LoadState.Loaded);
}
}
@@ -52,7 +52,7 @@ export class Initializer {
return Initializer.internalInstance?.isInitialized;
}
public static initBeforeReact() {
public static initBeforeReact(): void {
// this maybe also needs to return a promise in the future,
// if we have to do async inits before showing the loading screen
// but this should be avioded if possible
@@ -99,13 +99,13 @@ export class Initializer {
if (fontScale !== null) {
document.documentElement.style.setProperty(
"--font-scale",
fontScale.toString()
fontScale.toString(),
);
}
if (fonts.length > 0) {
document.documentElement.style.setProperty(
"--font-family",
fonts.map((f) => `"${f}"`).join(", ")
fonts.map((f) => `"${f}"`).join(", "),
);
}
@@ -126,9 +126,9 @@ export class Initializer {
return Initializer.internalInstance.initPromise;
}
loadStates = new DependencyLoadStates();
private loadStates = new DependencyLoadStates();
initStep(resolve: (value: void | PromiseLike<void>) => void) {
private initStep(resolve: (value: void | PromiseLike<void>) => void): void {
// TODO: Olm is initialized with the client currently (see `initClient()` and `olm.ts`)
// we need to decide if we want to init it here or keep it in initClient
// if (this.loadStates.olm === LoadState.None) {

View File

@@ -28,7 +28,7 @@ import { useTranslation } from "react-i18next";
import { Avatar, Size } from "../Avatar";
import { Button } from "../button";
import { ReactComponent as EditIcon } from "../icons/Edit.svg";
import EditIcon from "../icons/Edit.svg?react";
import styles from "./AvatarInputField.module.css";
interface Props extends AllHTMLAttributes<HTMLInputElement> {
@@ -52,7 +52,7 @@ export const AvatarInputField = forwardRef<HTMLInputElement, Props>(
onRemoveAvatar,
...rest
},
ref
ref,
) => {
const { t } = useTranslation();
@@ -64,7 +64,7 @@ export const AvatarInputField = forwardRef<HTMLInputElement, Props>(
useEffect(() => {
const currentInput = fileInputRef.current;
const onChange = (e: Event) => {
const onChange = (e: Event): void => {
const inputEvent = e as unknown as ChangeEvent<HTMLInputElement>;
if (inputEvent.target.files && inputEvent.target.files.length > 0) {
setObjUrl(URL.createObjectURL(inputEvent.target.files[0]));
@@ -76,7 +76,7 @@ export const AvatarInputField = forwardRef<HTMLInputElement, Props>(
currentInput.addEventListener("change", onChange);
return () => {
return (): void => {
currentInput?.removeEventListener("change", onChange);
};
});
@@ -120,5 +120,5 @@ export const AvatarInputField = forwardRef<HTMLInputElement, Props>(
)}
</div>
);
}
},
);

View File

@@ -85,8 +85,11 @@ limitations under the License.
}
.inputField label {
transition: font-size 0.25s ease-out 0.1s, color 0.25s ease-out 0.1s,
top 0.25s ease-out 0.1s, background-color 0.25s ease-out 0.1s;
transition:
font-size 0.25s ease-out 0.1s,
color 0.25s ease-out 0.1s,
top 0.25s ease-out 0.1s,
background-color 0.25s ease-out 0.1s;
color: var(--cpd-color-text-secondary);
background-color: transparent;
font-size: var(--font-size-body);
@@ -118,8 +121,11 @@ limitations under the License.
.inputField textarea:not(:placeholder-shown) + label,
.inputField.prefix textarea + label {
background-color: var(--cpd-color-bg-canvas-default);
transition: font-size 0.25s ease-out 0s, color 0.25s ease-out 0s,
top 0.25s ease-out 0s, background-color 0.25s ease-out 0s;
transition:
font-size 0.25s ease-out 0s,
color 0.25s ease-out 0s,
top 0.25s ease-out 0s,
background-color 0.25s ease-out 0s;
font-size: var(--font-size-micro);
top: -13px;
padding: 0 2px;

View File

@@ -25,7 +25,7 @@ import {
import classNames from "classnames";
import styles from "./Input.module.css";
import { ReactComponent as CheckIcon } from "../icons/Check.svg";
import CheckIcon from "../icons/Check.svg?react";
import { TranslatedError } from "../TranslatedError";
interface FieldRowProps {
@@ -44,7 +44,7 @@ export function FieldRow({
className={classNames(
styles.fieldRow,
{ [styles.rightAlign]: rightAlign },
className
className,
)}
>
{children}
@@ -102,7 +102,7 @@ export const InputField = forwardRef<
disabled,
...rest
},
ref
ref,
) => {
const descriptionId = useId();
@@ -114,7 +114,7 @@ export const InputField = forwardRef<
[styles.prefix]: !!prefix,
[styles.disabled]: disabled,
},
className
className,
)}
>
{prefix && <span>{prefix}</span>}
@@ -163,7 +163,7 @@ export const InputField = forwardRef<
)}
</Field>
);
}
},
);
interface ErrorMessageProps {

View File

@@ -24,7 +24,7 @@ import { useTranslation } from "react-i18next";
import { Popover } from "../popover/Popover";
import { ListBox } from "../ListBox";
import styles from "./SelectInput.module.css";
import { ReactComponent as ArrowDownIcon } from "../icons/ArrowDown.svg";
import ArrowDownIcon from "../icons/ArrowDown.svg?react";
interface Props extends AriaSelectOptions<object> {
className?: string;
@@ -38,7 +38,7 @@ export function SelectInput(props: Props): JSX.Element {
const { labelProps, triggerProps, valueProps, menuProps } = useSelect(
props,
state,
ref
ref,
);
const { buttonProps } = useButton(triggerProps, ref);

View File

@@ -17,8 +17,8 @@ import { useState } from "react";
import { useTranslation } from "react-i18next";
import styles from "./StarRatingInput.module.css";
import { ReactComponent as StarSelected } from "../icons/StarSelected.svg";
import { ReactComponent as StarUnselected } from "../icons/StarUnselected.svg";
import StarSelected from "../icons/StarSelected.svg?react";
import StarUnselected from "../icons/StarUnselected.svg?react";
interface Props {
starCount: number;
@@ -41,8 +41,8 @@ export function StarRatingInput({
return (
<div
className={styles.inputContainer}
onMouseEnter={() => setHover(index)}
onMouseLeave={() => setHover(rating)}
onMouseEnter={(): void => setHover(index)}
onMouseLeave={(): void => setHover(rating)}
key={index}
>
<input
@@ -51,7 +51,7 @@ export function StarRatingInput({
id={"starInput" + String(index)}
value={String(index) + "Star"}
name="star rating"
onChange={(_ev) => {
onChange={(_ev): void => {
setRating(index);
onChange(index);
}}

View File

@@ -51,8 +51,8 @@ export interface MediaDevices {
// Cargo-culted from @livekit/components-react
function useObservableState<T>(
observable: Observable<T> | undefined,
startWith: T
) {
startWith: T,
): T {
const [state, setState] = useState<T>(startWith);
useEffect(() => {
// observable state doesn't run in SSR
@@ -67,7 +67,7 @@ function useMediaDevice(
kind: MediaDeviceKind,
fallbackDevice: string | undefined,
usingNames: boolean,
alwaysDefault: boolean = false
alwaysDefault: boolean = false,
): MediaDevice {
// Make sure we don't needlessly reset to a device observer without names,
// once permissions are already given
@@ -83,7 +83,7 @@ function useMediaDevice(
// kind, which then results in multiple permissions requests.
const deviceObserver = useMemo(
() => createMediaDeviceObserver(kind, requestPermissions),
[kind, requestPermissions]
[kind, requestPermissions],
);
const available = useObservableState(deviceObserver, []);
const [selectedId, select] = useState(fallbackDevice);
@@ -143,18 +143,18 @@ export const MediaDevicesProvider: FC<Props> = ({ children }) => {
const audioInput = useMediaDevice(
"audioinput",
audioInputSetting,
usingNames
usingNames,
);
const audioOutput = useMediaDevice(
"audiooutput",
audioOutputSetting,
useOutputNames,
alwaysUseDefaultAudio
alwaysUseDefaultAudio,
);
const videoInput = useMediaDevice(
"videoinput",
videoInputSetting,
usingNames
usingNames,
);
useEffect(() => {
@@ -176,11 +176,11 @@ export const MediaDevicesProvider: FC<Props> = ({ children }) => {
const startUsingDeviceNames = useCallback(
() => setNumCallersUsingNames((n) => n + 1),
[setNumCallersUsingNames]
[setNumCallersUsingNames],
);
const stopUsingDeviceNames = useCallback(
() => setNumCallersUsingNames((n) => n - 1),
[setNumCallersUsingNames]
[setNumCallersUsingNames],
);
const context: MediaDevices = useMemo(
@@ -197,7 +197,7 @@ export const MediaDevicesProvider: FC<Props> = ({ children }) => {
videoInput,
startUsingDeviceNames,
stopUsingDeviceNames,
]
],
);
return (
@@ -207,7 +207,8 @@ export const MediaDevicesProvider: FC<Props> = ({ children }) => {
);
};
export const useMediaDevices = () => useContext(MediaDevicesContext);
export const useMediaDevices = (): MediaDevices =>
useContext(MediaDevicesContext);
/**
* React hook that requests for the media devices context to be populated with
@@ -215,7 +216,10 @@ export const useMediaDevices = () => useContext(MediaDevicesContext);
* default because it may involve requesting additional permissions from the
* user.
*/
export const useMediaDeviceNames = (context: MediaDevices, enabled = true) =>
export const useMediaDeviceNames = (
context: MediaDevices,
enabled = true,
): void =>
useEffect(() => {
if (enabled) {
context.startUsingDeviceNames();

View File

@@ -42,14 +42,14 @@ export type OpenIDClientParts = Pick<
export function useOpenIDSFU(
client: OpenIDClientParts,
rtcSession: MatrixRTCSession
) {
rtcSession: MatrixRTCSession,
): SFUConfig | undefined {
const [sfuConfig, setSFUConfig] = useState<SFUConfig | undefined>(undefined);
const activeFocus = useActiveFocus(rtcSession);
useEffect(() => {
(async () => {
(async (): Promise<void> => {
const sfuConfig = activeFocus
? await getSFUConfigWithOpenID(client, activeFocus)
: undefined;
@@ -62,20 +62,20 @@ export function useOpenIDSFU(
export async function getSFUConfigWithOpenID(
client: OpenIDClientParts,
activeFocus: LivekitFocus
activeFocus: LivekitFocus,
): Promise<SFUConfig | undefined> {
const openIdToken = await client.getOpenIdToken();
logger.debug("Got openID token", openIdToken);
try {
logger.info(
`Trying to get JWT from call's active focus URL of ${activeFocus.livekit_service_url}...`
`Trying to get JWT from call's active focus URL of ${activeFocus.livekit_service_url}...`,
);
const sfuConfig = await getLiveKitJWT(
client,
activeFocus.livekit_service_url,
activeFocus.livekit_alias,
openIdToken
openIdToken,
);
logger.info(`Got JWT from call's active focus URL.`);
@@ -83,7 +83,7 @@ export async function getSFUConfigWithOpenID(
} catch (e) {
logger.warn(
`Failed to get JWT from RTC session's active focus URL of ${activeFocus.livekit_service_url}.`,
e
e,
);
return undefined;
}
@@ -93,7 +93,7 @@ async function getLiveKitJWT(
client: OpenIDClientParts,
livekitServiceURL: string,
roomName: string,
openIDToken: IOpenIDToken
openIDToken: IOpenIDToken,
): Promise<SFUConfig> {
try {
const res = await fetch(livekitServiceURL + "/sfu/get", {

View File

@@ -1,3 +1,19 @@
/*
Copyright 2023 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.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
import {
AudioPresets,
DefaultReconnectPolicy,

View File

@@ -51,7 +51,7 @@ async function doConnect(
livekitRoom: Room,
sfuConfig: SFUConfig,
audioEnabled: boolean,
audioOptions: AudioCaptureOptions
audioOptions: AudioCaptureOptions,
): Promise<void> {
await livekitRoom!.connect(sfuConfig!.url, sfuConfig!.jwt);
@@ -76,12 +76,12 @@ export function useECConnectionState(
initialAudioOptions: AudioCaptureOptions,
initialAudioEnabled: boolean,
livekitRoom?: Room,
sfuConfig?: SFUConfig
sfuConfig?: SFUConfig,
): ECConnectionState {
const [connState, setConnState] = useState(
sfuConfig && livekitRoom
? livekitRoom.state
: ECAddonConnectionState.ECWaiting
: ECAddonConnectionState.ECWaiting,
);
const [isSwitchingFocus, setSwitchingFocus] = useState(false);
@@ -116,10 +116,10 @@ export function useECConnectionState(
!sfuConfigEquals(currentSFUConfig.current, sfuConfig)
) {
logger.info(
`SFU config changed! URL was ${currentSFUConfig.current?.url} now ${sfuConfig?.url}`
`SFU config changed! URL was ${currentSFUConfig.current?.url} now ${sfuConfig?.url}`,
);
(async () => {
(async (): Promise<void> => {
setSwitchingFocus(true);
await livekitRoom?.disconnect();
setIsInDoConnect(true);
@@ -128,7 +128,7 @@ export function useECConnectionState(
livekitRoom!,
sfuConfig!,
initialAudioEnabled,
initialAudioOptions
initialAudioOptions,
);
} finally {
setIsInDoConnect(false);
@@ -149,7 +149,7 @@ export function useECConnectionState(
livekitRoom!,
sfuConfig!,
initialAudioEnabled,
initialAudioOptions
initialAudioOptions,
).finally(() => setIsInDoConnect(false));
}

View File

@@ -20,6 +20,7 @@ import {
ExternalE2EEKeyProvider,
Room,
RoomOptions,
Track,
} from "livekit-client";
import { useLiveKitRoom } from "@livekit/components-react";
import { useEffect, useMemo, useRef, useState } from "react";
@@ -51,7 +52,7 @@ interface UseLivekitResult {
export function useLiveKit(
muteStates: MuteStates,
sfuConfig?: SFUConfig,
e2eeConfig?: E2EEConfig
e2eeConfig?: E2EEConfig,
): UseLivekitResult {
const e2eeOptions = useMemo(() => {
if (!e2eeConfig?.sharedKey) return undefined;
@@ -66,7 +67,7 @@ export function useLiveKit(
if (!e2eeConfig?.sharedKey || !e2eeOptions) return;
(e2eeOptions.keyProvider as ExternalE2EEKeyProvider).setKey(
e2eeConfig?.sharedKey
e2eeConfig?.sharedKey,
);
}, [e2eeOptions, e2eeConfig?.sharedKey]);
@@ -92,7 +93,7 @@ export function useLiveKit(
},
e2ee: e2eeOptions,
}),
[e2eeOptions]
[e2eeOptions],
);
// useECConnectionState creates and publishes an audio track by hand. To keep
@@ -100,6 +101,17 @@ export function useLiveKit(
// block audio from being enabled until the connection is finished.
const [blockAudio, setBlockAudio] = useState(true);
// Store if audio/video are currently updating. If to prohibit unnecessary calls
// to setMicrophoneEnabled/setCameraEnabled
const audioMuteUpdating = useRef(false);
const videoMuteUpdating = useRef(false);
// Store the current button mute state that gets passed to this hook via props.
// We need to store it for awaited code that relies on the current value.
const buttonEnabled = useRef({
audio: initialMuteStates.current.audio.enabled,
video: initialMuteStates.current.video.enabled,
});
// We have to create the room manually here due to a bug inside
// @livekit/components-react. JSON.stringify() is used in deps of a
// useEffect() with an argument that references itself, if E2EE is enabled
@@ -119,7 +131,7 @@ export function useLiveKit(
},
initialMuteStates.current.audio.enabled,
room,
sfuConfig
sfuConfig,
);
// Unblock audio once the connection is finished
@@ -136,34 +148,114 @@ export function useLiveKit(
// and setting tracks to be enabled during this time causes errors.
if (room !== undefined && connectionState === ConnectionState.Connected) {
const participant = room.localParticipant;
if (participant.isMicrophoneEnabled !== muteStates.audio.enabled) {
participant
.setMicrophoneEnabled(muteStates.audio.enabled)
.catch((e) =>
logger.error("Failed to sync audio mute state with LiveKit", e)
);
}
if (participant.isCameraEnabled !== muteStates.video.enabled) {
participant
.setCameraEnabled(muteStates.video.enabled)
.catch((e) =>
logger.error("Failed to sync video mute state with LiveKit", e)
);
}
// Always update the muteButtonState Ref so that we can read the current
// state in awaited blocks.
buttonEnabled.current = {
audio: muteStates.audio.enabled,
video: muteStates.video.enabled,
};
const syncMuteStateAudio = async (): Promise<void> => {
if (
participant.isMicrophoneEnabled !== buttonEnabled.current.audio &&
!audioMuteUpdating.current
) {
audioMuteUpdating.current = true;
try {
await participant.setMicrophoneEnabled(buttonEnabled.current.audio);
} catch (e) {
logger.error("Failed to sync audio mute state with LiveKit", e);
}
audioMuteUpdating.current = false;
// await participant.setMicrophoneEnabled can return immediately in some instances,
// so that participant.isMicrophoneEnabled !== buttonEnabled.current.audio still holds true.
// This happens if the device is still in a pending state
// "sleeping" here makes sure we let react do its thing so that participant.isMicrophoneEnabled is updated,
// so we do not end up in a recursion loop.
await new Promise((r) => setTimeout(r, 20));
// Run the check again after the change is done. Because the user
// can update the state (presses mute button) while the device is enabling
// itself we need might need to update the mute state right away.
// This async recursion makes sure that setCamera/MicrophoneEnabled is
// called as little times as possible.
syncMuteStateAudio();
}
};
const syncMuteStateVideo = async (): Promise<void> => {
if (
participant.isCameraEnabled !== buttonEnabled.current.video &&
!videoMuteUpdating.current
) {
videoMuteUpdating.current = true;
try {
await participant.setCameraEnabled(buttonEnabled.current.video);
} catch (e) {
logger.error("Failed to sync audio mute state with LiveKit", e);
}
videoMuteUpdating.current = false;
// see above
await new Promise((r) => setTimeout(r, 20));
// see above
syncMuteStateVideo();
}
};
syncMuteStateAudio();
syncMuteStateVideo();
}
}, [room, muteStates, connectionState]);
useEffect(() => {
// Sync the requested devices with LiveKit's devices
if (room !== undefined && connectionState === ConnectionState.Connected) {
const syncDevice = (kind: MediaDeviceKind, device: MediaDevice) => {
const syncDevice = (kind: MediaDeviceKind, device: MediaDevice): void => {
const id = device.selectedId;
if (id !== undefined && room.getActiveDevice(kind) !== id) {
room
.switchActiveDevice(kind, id)
.catch((e) =>
logger.error(`Failed to sync ${kind} device with LiveKit`, e)
);
// Detect if we're trying to use chrome's default device, in which case
// we need to to see if the default device has changed to a different device
// by comparing the group ID of the device we're using against the group ID
// of what the default device is *now*.
// This is special-cased for only audio inputs because we need to dig around
// in the LocalParticipant object for the track object and there's not a nice
// way to do that generically. There is usually no OS-level default video capture
// device anyway, and audio outputs work differently.
if (
id === "default" &&
kind === "audioinput" &&
room.options.audioCaptureDefaults?.deviceId === "default"
) {
const activeMicTrack = Array.from(
room.localParticipant.audioTracks.values(),
).find((d) => d.source === Track.Source.Microphone)?.track;
const defaultDevice = device.available.find(
(d) => d.deviceId === "default",
);
if (
defaultDevice &&
activeMicTrack &&
// only restart if the stream is still running: LiveKit will detect
// when a track stops & restart appropriately, so this is not our job.
// Plus, we need to avoid restarting again if the track is already in
// the process of being restarted.
activeMicTrack.mediaStreamTrack.readyState !== "ended" &&
defaultDevice.groupId !==
activeMicTrack.mediaStreamTrack.getSettings().groupId
) {
// It's different, so restart the track, ie. cause Livekit to do another
// getUserMedia() call with deviceId: default to get the *new* default device.
// Note that room.switchActiveDevice() won't work: Livekit will ignore it because
// the deviceId hasn't changed (was & still is default).
room.localParticipant
.getTrack(Track.Source.Microphone)
?.audioTrack?.restartTrack();
}
} else {
if (id !== undefined && room.getActiveDevice(kind) !== id) {
room
.switchActiveDevice(kind, id)
.catch((e) =>
logger.error(`Failed to sync ${kind} device with LiveKit`, e),
);
}
}
};

View File

@@ -30,7 +30,7 @@ import {
setLogLevel,
} from "livekit-client";
import App from "./App";
import { App } from "./App";
import { init as initRageshake } from "./settings/rageshake";
import { Initializer } from "./initializer";
@@ -48,7 +48,7 @@ if (!window.isSecureContext) {
fatalError = new Error(
"This app cannot run in an insecure context. To fix this, access the app " +
"via a local loopback address, or serve it over HTTPS.\n" +
"https://developer.mozilla.org/en-US/docs/Web/Security/Secure_Contexts"
"https://developer.mozilla.org/en-US/docs/Web/Security/Secure_Contexts",
);
} else if (!navigator.mediaDevices) {
fatalError = new Error("Your browser does not support WebRTC.");
@@ -66,5 +66,5 @@ const history = createBrowserHistory();
root.render(
<StrictMode>
<App history={history} />
</StrictMode>
</StrictMode>,
);

View File

@@ -1,5 +1,5 @@
/*
Copyright 2022 New Vector Ltd
Copyright 2022-2023 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.
@@ -35,12 +35,14 @@ import IndexedDBWorker from "./IndexedDBWorker?worker";
import { getUrlParams, PASSWORD_STRING } from "./UrlParams";
import { loadOlm } from "./olm";
import { Config } from "./config/Config";
import { setLocalStorageItem } from "./useLocalStorage";
import { getRoomSharedKeyLocalStorageKey } from "./e2ee/sharedKeyManagement";
export const fallbackICEServerAllowed =
import.meta.env.VITE_FALLBACK_STUN_ALLOWED === "true";
export class CryptoStoreIntegrityError extends Error {
constructor() {
public constructor() {
super("Crypto store data was expected, but none was found");
}
}
@@ -52,13 +54,13 @@ const SYNC_STORE_NAME = "element-call-sync";
// (It's a good opportunity to make the database names consistent.)
const CRYPTO_STORE_NAME = "element-call-crypto";
function waitForSync(client: MatrixClient) {
function waitForSync(client: MatrixClient): Promise<void> {
return new Promise<void>((resolve, reject) => {
const onSync = (
state: SyncState,
_old: SyncState | null,
data?: ISyncStateData
) => {
data?: ISyncStateData,
): void => {
if (state === "PREPARED") {
client.removeListener(ClientEvent.Sync, onSync);
resolve();
@@ -71,6 +73,23 @@ function waitForSync(client: MatrixClient) {
});
}
function secureRandomString(entropyBytes: number): string {
const key = new Uint8Array(entropyBytes);
crypto.getRandomValues(key);
// encode to base64url as this value goes into URLs
// base64url is just base64 with thw two non-alphanum characters swapped out for
// ones that can be put in a URL without encoding. Browser JS has a native impl
// for base64 encoding but only a string (there isn't one that takes a UInt8Array
// yet) so just use the built-in one and convert, replace the chars and strip the
// padding from the end (otherwise we'd need to pull in another dependency).
return btoa(
key.reduce((acc, current) => acc + String.fromCharCode(current), ""),
)
.replace("+", "-")
.replace("/", "_")
.replace(/=*$/, "");
}
/**
* Initialises and returns a new standalone Matrix Client.
* If true is passed for the 'restore' parameter, a check will be made
@@ -82,7 +101,7 @@ function waitForSync(client: MatrixClient) {
*/
export async function initClient(
clientOptions: ICreateClientOpts,
restore: boolean
restore: boolean,
): Promise<MatrixClient> {
await loadOlm();
@@ -108,7 +127,7 @@ export async function initClient(
// Chrome supports it. (It bundles them fine in production mode.)
workerFactory: import.meta.env.DEV
? undefined
: () => new IndexedDBWorker(),
: (): Worker => new IndexedDBWorker(),
});
} else if (localStorage) {
baseOpts.store = new MemoryStore({ localStorage });
@@ -129,7 +148,7 @@ export async function initClient(
if (indexedDB) {
const cryptoStoreExists = await IndexedDBCryptoStore.exists(
indexedDB,
CRYPTO_STORE_NAME
CRYPTO_STORE_NAME,
);
if (!cryptoStoreExists) throw new CryptoStoreIntegrityError();
} else if (localStorage) {
@@ -145,7 +164,7 @@ export async function initClient(
if (indexedDB) {
baseOpts.cryptoStore = new IndexedDBCryptoStore(
indexedDB,
CRYPTO_STORE_NAME
CRYPTO_STORE_NAME,
);
} else if (localStorage) {
baseOpts.cryptoStore = new LocalStorageCryptoStore(localStorage);
@@ -179,7 +198,7 @@ export async function initClient(
} catch (error) {
logger.error(
"Error starting matrix client store. Falling back to memory store.",
error
error,
);
client.store = new MemoryStore({ localStorage });
await client.store.startup();
@@ -249,7 +268,7 @@ export function roomNameFromRoomId(roomId: string): string {
.substring(1)
.split("-")
.map((part) =>
part.length > 0 ? part.charAt(0).toUpperCase() + part.slice(1) : part
part.length > 0 ? part.charAt(0).toUpperCase() + part.slice(1) : part,
)
.join(" ")
.toLowerCase();
@@ -269,11 +288,17 @@ export function isLocalRoomId(roomId: string, client: MatrixClient): boolean {
return parts[1] === client.getDomain();
}
interface CreateRoomResult {
roomId: string;
alias?: string;
password?: string;
}
export async function createRoom(
client: MatrixClient,
name: string,
e2ee: boolean
): Promise<[string, string]> {
e2ee: boolean,
): Promise<CreateRoomResult> {
logger.log(`Creating room for group call`);
const createPromise = client.createRoom({
visibility: Visibility.Private,
@@ -307,7 +332,7 @@ export async function createRoom(
// Wait for the room to arrive
await new Promise<void>((resolve, reject) => {
const onRoom = async (room: Room) => {
const onRoom = async (room: Room): Promise<void> => {
if (room.roomId === (await createPromise).room_id) {
resolve();
cleanUp();
@@ -318,7 +343,7 @@ export async function createRoom(
cleanUp();
});
const cleanUp = () => {
const cleanUp = (): void => {
client.off(ClientEvent.Room, onRoom);
};
client.on(ClientEvent.Room, onRoom);
@@ -333,10 +358,23 @@ export async function createRoom(
GroupCallType.Video,
false,
GroupCallIntent.Room,
true
true,
);
return [fullAliasFromRoomName(name, client), result.room_id];
let password;
if (e2ee) {
password = secureRandomString(16);
setLocalStorageItem(
getRoomSharedKeyLocalStorageKey(result.room_id),
password,
);
}
return {
roomId: result.room_id,
alias: e2ee ? undefined : fullAliasFromRoomName(name, client),
password,
};
}
/**
@@ -348,7 +386,7 @@ export async function createRoom(
export function getAbsoluteRoomUrl(
roomId: string,
roomName?: string,
password?: string
password?: string,
): string {
return `${window.location.protocol}//${
window.location.host
@@ -364,17 +402,24 @@ export function getAbsoluteRoomUrl(
export function getRelativeRoomUrl(
roomId: string,
roomName?: string,
password?: string
password?: string,
): string {
// The password shouldn't need URL encoding here (we generate URL-safe ones) but encode
// it in case it came from another client that generated a non url-safe one
const encodedPassword = password ? encodeURIComponent(password) : undefined;
if (password && encodedPassword !== password) {
logger.info("Encoded call password used non URL-safe chars: buggy client?");
}
return `/room/#${
roomName ? "/" + roomAliasLocalpartFromRoomName(roomName) : ""
}?roomId=${roomId}${password ? "&" + PASSWORD_STRING + password : ""}`;
}?roomId=${roomId}${password ? "&" + PASSWORD_STRING + encodedPassword : ""}`;
}
export function getAvatarUrl(
client: MatrixClient,
mxcUrl: string,
avatarSize = 96
avatarSize = 96,
): string {
const width = Math.floor(avatarSize * window.devicePixelRatio);
const height = Math.floor(avatarSize * window.devicePixelRatio);

View File

@@ -23,10 +23,10 @@ limitations under the License.
export async function findDeviceByName(
deviceName: string,
kind: MediaDeviceKind,
devices: MediaDeviceInfo[]
devices: MediaDeviceInfo[],
): Promise<string | undefined> {
const deviceInfo = devices.find(
(d) => d.kind === kind && d.label === deviceName
(d) => d.kind === kind && d.label === deviceName,
);
return deviceInfo?.deviceId;
}

View File

@@ -44,65 +44,65 @@ export class OTelCall {
OTelCallAbstractMediaStreamSpan
>();
constructor(
public constructor(
public userId: string,
public deviceId: string,
public call: MatrixCall,
public span: Span
public span: Span,
) {
if (call.peerConn) {
this.addCallPeerConnListeners();
} else {
this.call.once(
CallEvent.PeerConnectionCreated,
this.addCallPeerConnListeners
this.addCallPeerConnListeners,
);
}
}
public dispose() {
public dispose(): void {
this.call.peerConn?.removeEventListener(
"connectionstatechange",
this.onCallConnectionStateChanged
this.onCallConnectionStateChanged,
);
this.call.peerConn?.removeEventListener(
"signalingstatechange",
this.onCallSignalingStateChanged
this.onCallSignalingStateChanged,
);
this.call.peerConn?.removeEventListener(
"iceconnectionstatechange",
this.onIceConnectionStateChanged
this.onIceConnectionStateChanged,
);
this.call.peerConn?.removeEventListener(
"icegatheringstatechange",
this.onIceGatheringStateChanged
this.onIceGatheringStateChanged,
);
this.call.peerConn?.removeEventListener(
"icecandidateerror",
this.onIceCandidateError
this.onIceCandidateError,
);
}
private addCallPeerConnListeners = (): void => {
this.call.peerConn?.addEventListener(
"connectionstatechange",
this.onCallConnectionStateChanged
this.onCallConnectionStateChanged,
);
this.call.peerConn?.addEventListener(
"signalingstatechange",
this.onCallSignalingStateChanged
this.onCallSignalingStateChanged,
);
this.call.peerConn?.addEventListener(
"iceconnectionstatechange",
this.onIceConnectionStateChanged
this.onIceConnectionStateChanged,
);
this.call.peerConn?.addEventListener(
"icegatheringstatechange",
this.onIceGatheringStateChanged
this.onIceGatheringStateChanged,
);
this.call.peerConn?.addEventListener(
"icecandidateerror",
this.onIceCandidateError
this.onIceCandidateError,
);
};
@@ -147,8 +147,8 @@ export class OTelCall {
new OTelCallFeedMediaStreamSpan(
ElementCallOpenTelemetry.instance,
this.span,
feed
)
feed,
),
);
}
this.trackFeedSpan.get(feed.stream)?.update(feed);
@@ -171,13 +171,13 @@ export class OTelCall {
new OTelCallTransceiverMediaStreamSpan(
ElementCallOpenTelemetry.instance,
this.span,
transStats
)
transStats,
),
);
}
this.trackTransceiverSpan.get(transStats.mid)?.update(transStats);
prvTransSpan = prvTransSpan.filter(
(prvStreamId) => prvStreamId !== transStats.mid
(prvStreamId) => prvStreamId !== transStats.mid,
);
});
@@ -190,7 +190,7 @@ export class OTelCall {
public end(): void {
this.trackFeedSpan.forEach((feedSpan) => feedSpan.end());
this.trackTransceiverSpan.forEach((transceiverSpan) =>
transceiverSpan.end()
transceiverSpan.end(),
);
this.span.end();
}

View File

@@ -1,3 +1,19 @@
/*
Copyright 2023 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.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
import opentelemetry, { Span } from "@opentelemetry/api";
import { TrackStats } from "matrix-js-sdk/src/webrtc/stats/statsReport";
@@ -14,13 +30,13 @@ export abstract class OTelCallAbstractMediaStreamSpan {
public readonly span;
public constructor(
readonly oTel: ElementCallOpenTelemetry,
readonly callSpan: Span,
protected readonly type: string
protected readonly oTel: ElementCallOpenTelemetry,
protected readonly callSpan: Span,
protected readonly type: string,
) {
const ctx = opentelemetry.trace.setSpan(
opentelemetry.context.active(),
callSpan
callSpan,
);
const options = {
links: [
@@ -32,13 +48,13 @@ export abstract class OTelCallAbstractMediaStreamSpan {
this.span = oTel.tracer.startSpan(this.type, options, ctx);
}
protected upsertTrackSpans(tracks: TrackStats[]) {
protected upsertTrackSpans(tracks: TrackStats[]): void {
let prvTracks: TrackId[] = [...this.trackSpans.keys()];
tracks.forEach((t) => {
if (!this.trackSpans.has(t.id)) {
this.trackSpans.set(
t.id,
new OTelCallMediaStreamTrackSpan(this.oTel, this.span, t)
new OTelCallMediaStreamTrackSpan(this.oTel, this.span, t),
);
}
this.trackSpans.get(t.id)?.update(t);

View File

@@ -1,3 +1,19 @@
/*
Copyright 2023 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.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
import { Span } from "@opentelemetry/api";
import {
CallFeedStats,
@@ -10,10 +26,10 @@ import { OTelCallAbstractMediaStreamSpan } from "./OTelCallAbstractMediaStreamSp
export class OTelCallFeedMediaStreamSpan extends OTelCallAbstractMediaStreamSpan {
private readonly prev: { isAudioMuted: boolean; isVideoMuted: boolean };
constructor(
readonly oTel: ElementCallOpenTelemetry,
readonly callSpan: Span,
callFeed: CallFeedStats
public constructor(
protected readonly oTel: ElementCallOpenTelemetry,
protected readonly callSpan: Span,
callFeed: CallFeedStats,
) {
const postFix =
callFeed.type === "local" && callFeed.prefix === "from-call-feed"

View File

@@ -1,3 +1,19 @@
/*
Copyright 2023 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.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
import { TrackStats } from "matrix-js-sdk/src/webrtc/stats/statsReport";
import opentelemetry, { Span } from "@opentelemetry/api";
@@ -8,13 +24,13 @@ export class OTelCallMediaStreamTrackSpan {
private prev: TrackStats;
public constructor(
readonly oTel: ElementCallOpenTelemetry,
readonly streamSpan: Span,
data: TrackStats
protected readonly oTel: ElementCallOpenTelemetry,
protected readonly streamSpan: Span,
data: TrackStats,
) {
const ctx = opentelemetry.trace.setSpan(
opentelemetry.context.active(),
streamSpan
streamSpan,
);
const options = {
links: [

Some files were not shown because too many files have changed in this diff Show More