Remove all mentions of Piwik (#22556)

* Remove all mentions of Piwik

* Simplify ModalManager interface

* Maintain privacy_policy_url
pull/22577/head
Michael Telatynski 2022-06-14 16:14:09 +01:00 committed by GitHub
parent b69d4b6346
commit 6c37574857
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 10 additions and 36 deletions

View File

@ -34,12 +34,6 @@
"matrix.org" "matrix.org"
] ]
}, },
"piwik": {
"url": "https://piwik.riot.im/",
"whitelisted_hs_urls": ["https://matrix.org"],
"whitelisted_is_urls": ["https://vector.im", "https://matrix.org"],
"siteId": 1
},
"enable_presence_by_hs_url": { "enable_presence_by_hs_url": {
"https://matrix.org": false, "https://matrix.org": false,
"https://matrix-client.matrix.org": false "https://matrix-client.matrix.org": false

View File

@ -206,7 +206,7 @@ Together, the options might look like this in your config:
"auth_header_logo_url": "https://example.org/assets/logo.svg", "auth_header_logo_url": "https://example.org/assets/logo.svg",
"auth_footer_links": [ "auth_footer_links": [
{"text": "FAQ", "url": "https://example.org/faq"}, {"text": "FAQ", "url": "https://example.org/faq"},
{"text": "Donate", "url": "https://example.org/donate"}, {"text": "Donate", "url": "https://example.org/donate"}
] ]
}, },
"embedded_pages": { "embedded_pages": {
@ -393,25 +393,19 @@ To add additional "terms and conditions" links throughout the app, use the follo
## Analytics ## Analytics
Analytics are currently possible with two systems: `posthog` (preferred) and <del>`piwik`</del> (matomo; deprecated). When
these configuration options are not present, analytics are deemed impossible and the user won't be asked to opt-in to the
system.
To configure [Posthog](https://posthog.com/), add the following under `posthog` in your config: To configure [Posthog](https://posthog.com/), add the following under `posthog` in your config:
1. `api_host`: The hostname of the posthog server. 1. `api_host`: The hostname of the posthog server.
2. `project_api_key`: The API key from posthog. 2. `project_api_key`: The API key from posthog.
To configure Piwik (***DEPRECATED***), add the following under `piwik` in your config: When these configuration options are not present,
analytics are deemed impossible and the user won't be asked to opt in to the system.
1. `url`: The URL of the piwik server. There are additional root-level options which can be specified:
2. `site_id`: The site ID to use.
3. `policy_url`: URL to the analytics collection policy.
4. `whitelisted_hs_urls`: A list of homeserver client-server URLs to *not* redact from analytics.
Additionally, you may set `"piwik": false` to disable piwik configuration too. An `analytics_owner` can also be specified in your 1. `analytics_owner`: the company name used in dialogs talking about analytics - this defaults to `brand`,
config to replace the company name used in dialogs talking about analytics - this defaults to `brand`, and is useful when the and is useful when the provider of analytics is different from the provider of the Element instance.
provider of analytics is different from the provider of the Element instance. 2. `privacy_policy_url`: URL to the privacy policy including the analytics collection policy.
## Server hosting links ## Server hosting links

View File

@ -70,12 +70,6 @@ Then you can deploy it to your cluster with something like `kubectl apply -f my-
"matrix.org" "matrix.org"
] ]
}, },
"piwik": {
"url": "https://piwik.riot.im/",
"whitelistedHSUrls": ["https://matrix.org"],
"whitelistedISUrls": ["https://vector.im", "https://matrix.org"],
"siteId": 1
},
"enable_presence_by_hs_url": { "enable_presence_by_hs_url": {
"https://matrix.org": false, "https://matrix.org": false,
"https://matrix-client.matrix.org": false "https://matrix-client.matrix.org": false

View File

@ -14,11 +14,6 @@
"bug_report_endpoint_url": "https://element.io/bugreports/submit", "bug_report_endpoint_url": "https://element.io/bugreports/submit",
"uisi_autorageshake_app": "element-auto-uisi", "uisi_autorageshake_app": "element-auto-uisi",
"showLabsSettings": false, "showLabsSettings": false,
"piwik": {
"url": "https://piwik.riot.im/",
"siteId": 1,
"policyUrl": "https://element.io/cookie-policy"
},
"roomDirectory": { "roomDirectory": {
"servers": [ "servers": [
"matrix.org", "matrix.org",
@ -54,5 +49,6 @@
"projectApiKey": "phc_Jzsm6DTm6V2705zeU5dcNvQDlonOR68XvX2sh1sEOHO", "projectApiKey": "phc_Jzsm6DTm6V2705zeU5dcNvQDlonOR68XvX2sh1sEOHO",
"apiHost": "https://posthog.element.io" "apiHost": "https://posthog.element.io"
}, },
"privacy_policy_url": "https://element.io/cookie-policy",
"map_style_url": "https://api.maptiler.com/maps/streets/style.json?key=fU3vlMsMn4Jb6dnEIFsx" "map_style_url": "https://api.maptiler.com/maps/streets/style.json?key=fU3vlMsMn4Jb6dnEIFsx"
} }

View File

@ -14,11 +14,6 @@
"bug_report_endpoint_url": "https://element.io/bugreports/submit", "bug_report_endpoint_url": "https://element.io/bugreports/submit",
"uisi_autorageshake_app": "element-auto-uisi", "uisi_autorageshake_app": "element-auto-uisi",
"showLabsSettings": true, "showLabsSettings": true,
"piwik": {
"url": "https://piwik.riot.im/",
"siteId": 1,
"policyUrl": "https://element.io/cookie-policy"
},
"roomDirectory": { "roomDirectory": {
"servers": [ "servers": [
"matrix.org", "matrix.org",
@ -58,6 +53,7 @@
"projectApiKey": "phc_Jzsm6DTm6V2705zeU5dcNvQDlonOR68XvX2sh1sEOHO", "projectApiKey": "phc_Jzsm6DTm6V2705zeU5dcNvQDlonOR68XvX2sh1sEOHO",
"apiHost": "https://posthog.element.io" "apiHost": "https://posthog.element.io"
}, },
"privacy_policy_url": "https://element.io/cookie-policy",
"features": { "features": {
"feature_spotlight": true, "feature_spotlight": true,
"feature_video_rooms": true "feature_video_rooms": true

View File

@ -339,7 +339,7 @@ export default class ElectronPlatform extends VectorBasePlatform {
) { ) {
// this will get intercepted by electron-main will-navigate // this will get intercepted by electron-main will-navigate
super.startSingleSignOn(mxClient, loginType, fragmentAfterLogin, idpId); super.startSingleSignOn(mxClient, loginType, fragmentAfterLogin, idpId);
Modal.createTrackedDialog('Electron', 'SSO', InfoDialog, { Modal.createDialog(InfoDialog, {
title: _t("Go to your browser to complete Sign In"), title: _t("Go to your browser to complete Sign In"),
description: <Spinner />, description: <Spinner />,
}); });