From 5564e2fde609ca822a834d5f80a1e3a43da86dcf Mon Sep 17 00:00:00 2001
From: fkwp <github-fkwp@w4ve.de>
Date: Wed, 24 Jul 2024 10:18:16 +0200
Subject: [PATCH 1/3] cleanup config files

---
 .github/workflows/netlify.yaml                |  2 +-
 ...eview.json => config_netlify_preview.json} |  0
 config/element_io_develop.json                | 19 -------------------
 3 files changed, 1 insertion(+), 20 deletions(-)
 rename config/{element_io_preview.json => config_netlify_preview.json} (100%)
 delete mode 100644 config/element_io_develop.json

diff --git a/.github/workflows/netlify.yaml b/.github/workflows/netlify.yaml
index f90d9c1f..fda3cf42 100644
--- a/.github/workflows/netlify.yaml
+++ b/.github/workflows/netlify.yaml
@@ -58,7 +58,7 @@ jobs:
         run: curl -s https://raw.githubusercontent.com/element-hq/element-call/main/config/netlify_redirects > webapp/_redirects
 
       - name: Add config file
-        run: curl -s "https://raw.githubusercontent.com/${{ inputs.pr_head_full_name }}/${{ inputs.pr_head_ref }}/config/element_io_preview.json" > webapp/config.json
+        run: curl -s "https://raw.githubusercontent.com/${{ inputs.pr_head_full_name }}/${{ inputs.pr_head_ref }}/config/config_netlify_preview.json" > webapp/config.json
 
       - name: ☁️ Deploy to Netlify
         id: netlify
diff --git a/config/element_io_preview.json b/config/config_netlify_preview.json
similarity index 100%
rename from config/element_io_preview.json
rename to config/config_netlify_preview.json
diff --git a/config/element_io_develop.json b/config/element_io_develop.json
deleted file mode 100644
index 3e7b409c..00000000
--- a/config/element_io_develop.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "default_server_config": {
-    "m.homeserver": {
-      "base_url": "https://call.ems.host",
-      "server_name": "call.ems.host"
-    }
-  },
-  "posthog": {
-    "api_key": "phc_rXGHx9vDmyEvyRxPziYtdVIv0ahEv8A9uLWFcCi1WcU",
-    "api_host": "https://posthog-element-call.element.io"
-  },
-  "sentry": {
-    "environment": "main-branch-cd",
-    "DSN": "https://b1e328d49be3402ba96101338989fb35@sentry.matrix.org/41"
-  },
-  "rageshake": {
-    "submit_url": "https://element.io/bugreports/submit"
-  }
-}

From 2b92ce8af2cd996a991ee7803eb32748e84e4889 Mon Sep 17 00:00:00 2001
From: fkwp <github-fkwp@w4ve.de>
Date: Wed, 24 Jul 2024 12:19:36 +0200
Subject: [PATCH 2/3] enable new m.call.member format

---
 config/config.sample.json          | 3 +++
 config/config_netlify_preview.json | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/config/config.sample.json b/config/config.sample.json
index e0f0decf..f6989743 100644
--- a/config/config.sample.json
+++ b/config/config.sample.json
@@ -8,5 +8,8 @@
   "livekit": {
     "livekit_service_url": "http://localhost:7881"
   },
+  "features": {
+     "feature_use_device_session_member_events": true
+  },
   "eula": "https://static.element.io/legal/online-EULA.pdf"
 }
diff --git a/config/config_netlify_preview.json b/config/config_netlify_preview.json
index 5653d276..351a8317 100644
--- a/config/config_netlify_preview.json
+++ b/config/config_netlify_preview.json
@@ -8,6 +8,9 @@
   "livekit": {
     "livekit_service_url": "https://livekit-jwt.call.element.dev"
   },
+  "features": {
+     "feature_use_device_session_member_events": true
+  },
   "posthog": {
     "api_key": "phc_rXGHx9vDmyEvyRxPziYtdVIv0ahEv8A9uLWFcCi1WcU",
     "api_host": "https://posthog-element-call.element.io"

From a3773c0a9ad052e009a3d050e3ac9d02fd8091ed Mon Sep 17 00:00:00 2001
From: Timo <toger5@hotmail.de>
Date: Wed, 24 Jul 2024 13:00:13 +0200
Subject: [PATCH 3/3] prettier

---
 config/config.sample.json          | 2 +-
 config/config_netlify_preview.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/config.sample.json b/config/config.sample.json
index f6989743..12381a66 100644
--- a/config/config.sample.json
+++ b/config/config.sample.json
@@ -9,7 +9,7 @@
     "livekit_service_url": "http://localhost:7881"
   },
   "features": {
-     "feature_use_device_session_member_events": true
+    "feature_use_device_session_member_events": true
   },
   "eula": "https://static.element.io/legal/online-EULA.pdf"
 }
diff --git a/config/config_netlify_preview.json b/config/config_netlify_preview.json
index 351a8317..de9600d4 100644
--- a/config/config_netlify_preview.json
+++ b/config/config_netlify_preview.json
@@ -9,7 +9,7 @@
     "livekit_service_url": "https://livekit-jwt.call.element.dev"
   },
   "features": {
-     "feature_use_device_session_member_events": true
+    "feature_use_device_session_member_events": true
   },
   "posthog": {
     "api_key": "phc_rXGHx9vDmyEvyRxPziYtdVIv0ahEv8A9uLWFcCi1WcU",