From 431680d8b9eb3ae88dc30279fdb4ec480b84479e Mon Sep 17 00:00:00 2001 From: Aaron Raimist Date: Fri, 29 Nov 2019 19:43:09 -0600 Subject: [PATCH 1/3] Update riot.im enable_presence_by_hs_url for new matrix.org client URL Ideally you would update enable_presence_by_hs_url work based on the homeserver name instead of the client URL. --- riot.im/app/config.json | 3 ++- riot.im/develop/config.json | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/riot.im/app/config.json b/riot.im/app/config.json index 68651de6984..3fbdbc99d86 100644 --- a/riot.im/app/config.json +++ b/riot.im/app/config.json @@ -26,7 +26,8 @@ ] }, "enable_presence_by_hs_url": { - "https://matrix.org": false + "https://matrix.org": false, + "https://matrix-client.matrix.org": false }, "terms_and_conditions_links": [ { diff --git a/riot.im/develop/config.json b/riot.im/develop/config.json index 40c3d29698e..16ebbc3a17e 100644 --- a/riot.im/develop/config.json +++ b/riot.im/develop/config.json @@ -35,7 +35,8 @@ ] }, "enable_presence_by_hs_url": { - "https://matrix.org": false + "https://matrix.org": false, + "https://matrix-client.matrix.org": false }, "terms_and_conditions_links": [ { From 30230645f4e1ec97c795841ec153acbd2c6c3d19 Mon Sep 17 00:00:00 2001 From: Aaron Raimist Date: Fri, 29 Nov 2019 19:44:16 -0600 Subject: [PATCH 2/3] Update Electron too Signed-off-by: Aaron Raimist --- electron_app/riot.im/config.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/electron_app/riot.im/config.json b/electron_app/riot.im/config.json index 9887e025bcf..cedb4ccddeb 100644 --- a/electron_app/riot.im/config.json +++ b/electron_app/riot.im/config.json @@ -34,6 +34,7 @@ "feature_lazyloading": "enable" }, "enable_presence_by_hs_url": { - "https://matrix.org": false + "https://matrix.org": false, + "https://matrix-client.matrix.org": false } } From 942b29c6d75275790e8eea991525107b59a6b490 Mon Sep 17 00:00:00 2001 From: Aaron Raimist Date: Fri, 29 Nov 2019 20:17:15 -0600 Subject: [PATCH 3/3] Update sample config Signed-off-by: Aaron Raimist --- config.sample.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/config.sample.json b/config.sample.json index 88c0e3a92c2..69dc3968849 100644 --- a/config.sample.json +++ b/config.sample.json @@ -47,7 +47,8 @@ "siteId": 1 }, "enable_presence_by_hs_url": { - "https://matrix.org": false + "https://matrix.org": false, + "https://matrix-client.matrix.org": false }, "settingDefaults": { "breadcrumbs": true