From eb524e27a6036eeaa092f0d9f603bbfc79cd390f Mon Sep 17 00:00:00 2001
From: Ildar Kamalov <i.kamalov@adguard.com>
Date: Thu, 29 Aug 2019 11:39:04 +0300
Subject: [PATCH 1/3] + blocked_services: add tiktok

---
 home/blocked_services.go | 1 +
 1 file changed, 1 insertion(+)

diff --git a/home/blocked_services.go b/home/blocked_services.go
index 5f9e58b9..5612aacb 100644
--- a/home/blocked_services.go
+++ b/home/blocked_services.go
@@ -35,6 +35,7 @@ var serviceRulesArray = []svc{
 	{"vk", []string{"||vk.com^"}},
 	{"steam", []string{"||steam.com^"}},
 	{"mail_ru", []string{"||mail.ru^"}},
+	{"tiktok", []string{"||snssdk.com^", "||amemv.com^", "||toutiao.com^", "||ixigua.com^", "||pstatp.com^", "||ixiguavideo.com^", "||toutiaocloud.com^", "||toutiaocloud.net^", "||bdurl.com^", "||bytecdn.cn^", "||byteimg.com^", "||ixigua.com^"}},
 }
 
 // convert array to map

From 44a3a8857f1eb7c2cfccb5cb9883b35c9793fbe4 Mon Sep 17 00:00:00 2001
From: Ildar Kamalov <i.kamalov@adguard.com>
Date: Thu, 29 Aug 2019 11:40:17 +0300
Subject: [PATCH 2/3] + client: add tiktok icon

---
 client/src/components/ui/Icons.js | 4 ++++
 client/src/helpers/constants.js   | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/client/src/components/ui/Icons.js b/client/src/components/ui/Icons.js
index 14405ef8..ef2fbf85 100644
--- a/client/src/components/ui/Icons.js
+++ b/client/src/components/ui/Icons.js
@@ -124,6 +124,10 @@ const Icons = () => (
             <path d="M256 141.176c-63.306 0-114.809 51.503-114.809 114.809S192.694 370.795 256 370.795s114.809-51.503 114.809-114.809S319.306 141.176 256 141.176zm0 188.254c-40.498 0-73.445-32.947-73.445-73.445 0-40.498 32.947-73.445 73.445-73.445 40.499 0 73.445 32.947 73.445 73.445 0 40.498-32.946 73.445-73.445 73.445z"/><path d="M437.008 74.97C388.656 26.623 324.375 0 256 0h-.017C187.603.004 123.318 26.637 74.97 74.992 26.62 123.347-.005 187.637 0 256.017c.004 68.379 26.637 132.666 74.992 181.014C123.344 485.377 187.625 512.001 256 512h.017c55.945-.004 111.216-18.738 155.631-52.752 9.07-6.945 10.792-19.927 3.846-28.995-6.945-9.069-19.926-10.794-28.995-3.846-37.24 28.518-83.58 44.224-130.486 44.228h-.014c-57.324 0-111.224-22.324-151.761-62.856-40.542-40.536-62.871-94.435-62.875-151.766-.006-118.35 96.273-214.641 214.623-214.649H256c118.34 0 214.628 96.279 214.636 214.622v23.532c0 27.523-22.39 49.913-49.913 49.913-27.523 0-49.913-22.391-49.913-49.913v-23.532c0-11.422-9.259-20.682-20.682-20.682s-20.682 9.26-20.682 20.682v23.532c0 50.33 40.947 91.278 91.278 91.278S512 329.848 512 279.518v-23.534c-.005-68.38-26.638-132.666-74.992-181.014z"/>
         </symbol>
 
+        <symbol id="service_tiktok" viewBox="0 0 50 50" fill="currentColor" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2">
+            <path d="M41 4H9C6.243 4 4 6.243 4 9v32c0 2.757 2.243 5 5 5h32c2.757 0 5-2.243 5-5V9c0-2.757-2.243-5-5-5zm-3.994 18.323a7.482 7.482 0 0 1-.69.035 7.492 7.492 0 0 1-6.269-3.388v11.537a8.527 8.527 0 1 1-8.527-8.527c.178 0 .352.016.527.027v4.202c-.175-.021-.347-.053-.527-.053a4.351 4.351 0 1 0 0 8.704c2.404 0 4.527-1.894 4.527-4.298l.042-19.594h4.016a7.488 7.488 0 0 0 6.901 6.685v4.67z"/>
+        </symbol>
+
         <symbol id="question" viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2">
             <circle cx="12" cy="12" r="10" /><path d="M9.09 9a3 3 0 0 1 5.83 1c0 2-3 3-3 3" /><line x1="12" y1="17" x2="12" y2="17" />
         </symbol>
diff --git a/client/src/helpers/constants.js b/client/src/helpers/constants.js
index a5c8e922..0d607c3d 100644
--- a/client/src/helpers/constants.js
+++ b/client/src/helpers/constants.js
@@ -243,4 +243,8 @@ export const SERVICES = [
         id: 'mail_ru',
         name: 'mail.ru',
     },
+    {
+        id: 'tiktok',
+        name: 'TikTok',
+    },
 ];

From bdd86adac5a3fdc7013200e1448a7acb6a04993e Mon Sep 17 00:00:00 2001
From: Ildar Kamalov <i.kamalov@adguard.com>
Date: Thu, 29 Aug 2019 11:45:39 +0300
Subject: [PATCH 3/3] + blocked_services: add tiktok main domain

---
 home/blocked_services.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/home/blocked_services.go b/home/blocked_services.go
index 5612aacb..c3a6dc26 100644
--- a/home/blocked_services.go
+++ b/home/blocked_services.go
@@ -35,7 +35,7 @@ var serviceRulesArray = []svc{
 	{"vk", []string{"||vk.com^"}},
 	{"steam", []string{"||steam.com^"}},
 	{"mail_ru", []string{"||mail.ru^"}},
-	{"tiktok", []string{"||snssdk.com^", "||amemv.com^", "||toutiao.com^", "||ixigua.com^", "||pstatp.com^", "||ixiguavideo.com^", "||toutiaocloud.com^", "||toutiaocloud.net^", "||bdurl.com^", "||bytecdn.cn^", "||byteimg.com^", "||ixigua.com^"}},
+	{"tiktok", []string{"||tiktok.com^", "||snssdk.com^", "||amemv.com^", "||toutiao.com^", "||ixigua.com^", "||pstatp.com^", "||ixiguavideo.com^", "||toutiaocloud.com^", "||toutiaocloud.net^", "||bdurl.com^", "||bytecdn.cn^", "||byteimg.com^", "||ixigua.com^"}},
 }
 
 // convert array to map