From 73b11445cebba336bb0a8e2ee55bdf6fbb433532 Mon Sep 17 00:00:00 2001
From: Ox Cart <ox.to.a.cart@gmail.com>
Date: Thu, 8 Sep 2022 10:42:26 -0500
Subject: [PATCH] Temporarily disabling shortcut and detour globally to
 eliminate a confounding variable when trying to determine how well service is
 working, especially in China

---
 config/features_test.go         |  4 ++--
 config_v6/features_test.go      |  4 ++--
 embeddedconfig/global.yaml.tmpl | 18 +++++++++---------
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/config/features_test.go b/config/features_test.go
index 7cc82589b..6f2627aae 100644
--- a/config/features_test.go
+++ b/config/features_test.go
@@ -138,7 +138,7 @@ func TestDetour(t *testing.T) {
 	gl := globalFromTemplate(t)
 	for _, country := range []string{"cn"} {
 		for _, os := range []string{"android", "windows", "darwin", "linux"} {
-			assert.True(t, gl.FeatureEnabled(FeatureDetour, os, common.DefaultAppName, common.Version, 1, false, country), fmt.Sprintf("detour is enabled for %s in %s", os, country))
+			assert.False(t, gl.FeatureEnabled(FeatureDetour, os, common.DefaultAppName, common.Version, 1, false, country), fmt.Sprintf("detour is disabled for %s in %s", os, country))
 		}
 	}
 }
@@ -148,7 +148,7 @@ func TestShortcut(t *testing.T) {
 	for _, country := range []string{"cn", "ir"} {
 		for _, os := range []string{"android", "windows", "darwin", "linux"} {
 			if country != "ir" || os != "android" {
-				assert.True(t, gl.FeatureEnabled(FeatureShortcut, os, common.DefaultAppName, common.Version, 1, false, country), fmt.Sprintf("shortcut is enabled for %s in %s", os, country))
+				assert.False(t, gl.FeatureEnabled(FeatureShortcut, os, common.DefaultAppName, common.Version, 1, false, country), fmt.Sprintf("shortcut is disabled for %s in %s", os, country))
 			}
 		}
 	}
diff --git a/config_v6/features_test.go b/config_v6/features_test.go
index 6505937ef..1c70eb705 100644
--- a/config_v6/features_test.go
+++ b/config_v6/features_test.go
@@ -138,7 +138,7 @@ func TestDetour(t *testing.T) {
 	gl := globalFromTemplate(t)
 	for _, country := range []string{"cn"} {
 		for _, os := range []string{"android", "windows", "darwin", "linux"} {
-			assert.True(t, gl.FeatureEnabled(FeatureDetour, os, common.DefaultAppName, common.Version, 1, false, country), fmt.Sprintf("detour is enabled for %s in %s", os, country))
+			assert.False(t, gl.FeatureEnabled(FeatureDetour, os, common.DefaultAppName, common.Version, 1, false, country), fmt.Sprintf("detour is disabled for %s in %s", os, country))
 		}
 	}
 }
@@ -148,7 +148,7 @@ func TestShortcut(t *testing.T) {
 	for _, country := range []string{"cn", "ir"} {
 		for _, os := range []string{"android", "windows", "darwin", "linux"} {
 			if country != "ir" || os != "android" {
-				assert.True(t, gl.FeatureEnabled(FeatureShortcut, os, common.DefaultAppName, common.Version, 1, false, country), fmt.Sprintf("shortcut is enabled for %s in %s", os, country))
+				assert.False(t, gl.FeatureEnabled(FeatureShortcut, os, common.DefaultAppName, common.Version, 1, false, country), fmt.Sprintf("shortcut is disabled for %s in %s", os, country))
 			}
 		}
 	}
diff --git a/embeddedconfig/global.yaml.tmpl b/embeddedconfig/global.yaml.tmpl
index 0fa8f3228..1de2eece7 100644
--- a/embeddedconfig/global.yaml.tmpl
+++ b/embeddedconfig/global.yaml.tmpl
@@ -121,15 +121,15 @@ featuresenabled:
       versionconstraints: ">=99.0.0"
     # For building
   ######## New-Style configuration for detour, shortcut and probeproxies. These are disabled by default and have to be enabled in the config. ########
-  detour:
-    - label: cn-detour
-      geocountries: cn
-  shortcut:
-    - label: cn-shortcut
-      geocountries: cn
-    - lable: ir-desktop-shortcut
-      geocountries: ir
-      platforms: windows,darwin,linux
+  #detour:
+  #  - label: cn-detour
+  #    geocountries: cn
+  #shortcut:
+  #  - label: cn-shortcut
+  #    geocountries: cn
+  #  - label: ir-desktop-shortcut
+  #    geocountries: ir
+  #    platforms: windows,darwin,linux
   # probeproxies is not enabled anywhere
   ######## End of New-Style configuration for detour, shortcut and probeproxies ########