From e441185cb8da6e6dca56e69a4d23005d31b5fe67 Mon Sep 17 00:00:00 2001 From: Robin Townsend Date: Fri, 9 Sep 2022 01:08:24 -0400 Subject: [PATCH 1/3] Add an element_call_url config option --- config.sample.json | 1 + docs/config.md | 7 +++++-- element.io/develop/config.json | 1 + 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/config.sample.json b/config.sample.json index 6f662d0831b..b638200c069 100644 --- a/config.sample.json +++ b/config.sample.json @@ -44,5 +44,6 @@ "jitsi": { "preferred_domain": "meet.element.io" }, + "element_call_url": "https://call.element.io", "map_style_url": "https://api.maptiler.com/maps/streets/style.json?key=fU3vlMsMn4Jb6dnEIFsx" } diff --git a/docs/config.md b/docs/config.md index 6bcb1b6f938..361582703e6 100644 --- a/docs/config.md +++ b/docs/config.md @@ -243,8 +243,9 @@ When Element is deployed alongside a homeserver with SSO-only login, some option ## VoIP / Jitsi calls -Currently, Element uses Jitsi to offer conference calls in rooms. A set of defaults are applied, pointing at our Jitsi instance, -to ensure conference calling works, however you can point Element at your own Jitsi if you prefer. +Currently, Element uses Jitsi to offer conference calls in rooms, with an experimental Element Call implementation in the works. +A set of defaults are applied, pointing at our Jitsi and Element Call instances, to ensure conference calling works, however you +can point Element at your own if you prefer. More information about the Jitsi setup can be found [here](./jitsi.md). @@ -313,6 +314,8 @@ The VoIP and Jitsi options are: as defined by the `io.element.widgets.layout` state event. 5. `audio_stream_url`: Optional URL to pass to Jitsi to enable live streaming. This option is considered experimental and may be removed at any time without notice. +6. `element_call_url`: Optional URL of the Element Call instance to use for native group calls. This option is considered experimental + and may be removed at any time without notice. Defaults to `https://call.element.io`. ## Bug reporting diff --git a/element.io/develop/config.json b/element.io/develop/config.json index 8cbeddbec86..347b5a40ee4 100644 --- a/element.io/develop/config.json +++ b/element.io/develop/config.json @@ -58,5 +58,6 @@ "feature_spotlight": true, "feature_video_rooms": true }, + "element_call_url": "https://element-call.netlify.app", "map_style_url": "https://api.maptiler.com/maps/streets/style.json?key=fU3vlMsMn4Jb6dnEIFsx" } From 826aec025ad4826d81ff13a6e3150839be504422 Mon Sep 17 00:00:00 2001 From: Robin Townsend Date: Fri, 9 Sep 2022 01:09:09 -0400 Subject: [PATCH 2/3] Document feature_element_call_video_rooms --- docs/labs.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/docs/labs.md b/docs/labs.md index e2907156ed1..902ebae5dc9 100644 --- a/docs/labs.md +++ b/docs/labs.md @@ -162,6 +162,12 @@ This feature might work in degraded mode if the homeserver a user is connected t Enables support for creating and joining video rooms, which are persistent video chats that users can jump in and out of. +## Element Call video rooms (`feature_element_call_video_rooms`) [In Development] + +Enables support for video rooms that use Element Call rather than Jitsi, and causes the 'New video room' option to create Element Call video rooms rather than Jitsi ones. + +This flag will not have any effect unless `feature_video_rooms` is also enabled. + ## Rich text in room topics (`feature_html_topic`) [In Development] Enables rendering of MD / HTML in room topics. From 2e6b762f8578c4991d0d6092d192172192981d34 Mon Sep 17 00:00:00 2001 From: Robin Townsend Date: Wed, 14 Sep 2022 09:36:52 -0400 Subject: [PATCH 3/3] Turn element_call_url into a map To allow us to add other Element Call config keys in the future --- config.sample.json | 4 +++- docs/config.md | 5 +++-- element.io/develop/config.json | 4 +++- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/config.sample.json b/config.sample.json index b638200c069..0a8e56ad4ac 100644 --- a/config.sample.json +++ b/config.sample.json @@ -44,6 +44,8 @@ "jitsi": { "preferred_domain": "meet.element.io" }, - "element_call_url": "https://call.element.io", + "element_call": { + "url": "https://call.element.io" + }, "map_style_url": "https://api.maptiler.com/maps/streets/style.json?key=fU3vlMsMn4Jb6dnEIFsx" } diff --git a/docs/config.md b/docs/config.md index f26de70a1de..22e8683c9b1 100644 --- a/docs/config.md +++ b/docs/config.md @@ -318,8 +318,9 @@ The VoIP and Jitsi options are: as defined by the `io.element.widgets.layout` state event. 5. `audio_stream_url`: Optional URL to pass to Jitsi to enable live streaming. This option is considered experimental and may be removed at any time without notice. -6. `element_call_url`: Optional URL of the Element Call instance to use for native group calls. This option is considered experimental - and may be removed at any time without notice. Defaults to `https://call.element.io`. +6. `element_call`: Optional configuration for native group calls using Element Call, with the following subkeys: + - `url`: The URL of the Element Call instance to use for native group calls. This option is considered experimental + and may be removed at any time without notice. Defaults to `https://call.element.io`. ## Bug reporting diff --git a/element.io/develop/config.json b/element.io/develop/config.json index 347b5a40ee4..feec8a1be02 100644 --- a/element.io/develop/config.json +++ b/element.io/develop/config.json @@ -58,6 +58,8 @@ "feature_spotlight": true, "feature_video_rooms": true }, - "element_call_url": "https://element-call.netlify.app", + "element_call": { + "url": "https://element-call.netlify.app" + }, "map_style_url": "https://api.maptiler.com/maps/streets/style.json?key=fU3vlMsMn4Jb6dnEIFsx" }