From 32b24ce0930cbdb9b759f77f2c0773f3e61cb7b3 Mon Sep 17 00:00:00 2001
From: Artem Baskal <a.baskal@adguard.com>
Date: Tue, 20 Oct 2020 11:26:39 +0300
Subject: [PATCH] + dnsfilter, client: Add qq to blocked services

Squashed commit of the following:

commit ffb2a1065fc9edd2b840cccbb96a0a2c1334bf00
Merge: 0f966d5b 3acfaa16
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Tue Oct 20 11:19:39 2020 +0300

    Merge branch 'master' into dnsfilter/update_blocked_services

commit 0f966d5b00f96c93bf778e944d68f62ebcdeaa50
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Mon Oct 19 20:47:22 2020 +0300

    Add qq icon to blocked services

commit f9c42551bbb442f83c6354314fc42ea174aacf4b
Author: ifurther <55025025+ifurther@users.noreply.github.com>
Date:   Sun Jun 7 12:19:05 2020 +0000

    Add qq to blocked services
---
 client/src/components/ui/Icons.js | Bin 42479 -> 44350 bytes
 client/src/helpers/constants.js   |   4 ++++
 dnsfilter/blocked_services.go     |   1 +
 3 files changed, 5 insertions(+)

diff --git a/client/src/components/ui/Icons.js b/client/src/components/ui/Icons.js
index 3851ff014c13df989d2c8e8f44bd8a64b4946674..ec5bf8a32e76078aa5b971b9b786d312a671d17a 100644
GIT binary patch
delta 1651
zcmZXVy^bA45QW8xzydO~jtEB1r_|N|9YC@P$qI`Nkq~HP5Yn!Vxx&FsCN|P09wbC&
zSv&v|IWIusn3v!c_^NxZSs=N4rmFhXsh{rs>yNYF|2+Hk)${FPxOevS>GpZJzy0*f
zC-;JX7W~KVxV`@2{###fugm%SUww0Z{pt7Dk3M|x_{rnrqwk(P_-Om$_WZ@mcUKjk
zrr<BCgy;cNo`RDS`Rkkb=odGu#8xJ65wn+)%9J=Y;KASoOYTOZ@Ly>ZP1WdhPjI~S
zQ2dJ#g0P+_=R1@gcg}%!&MI|C^hy#VhjNI0!+pFYb**VCq806v<S<L{0Xht`R98<h
z61KW-nkA*-q*&r6%sJS(@omR;WT&9TU}yf}BXgBTqP)z~gF5pY;*r&k?!*#WBoN{q
zop_0Ko+`*d$dxvUh|bfA-zIy$eS7=%i<j@LS#qK{4{JR{$*A)ZbDA1rn4#f?-qJbO
zZH2a<{5uv^igyf0%Pg8zg65eovpP@VuA<VF%30@e4T!?^!e_Q6PEmYgAYL?7GHDjd
zxyqs?@4kVXWUbGbXkA2O78lt91O$ntAoF-*wUDDq&T(NHYRXkwr32y%E7h@4_`^z*
zS=Ro6P7CUIv1zF?M>8gVebF8FfbL0Zr)`lL`3UUzc*Ei)7T9$G&<yV#0oG<tt%v^#
z*d0TFEmBu?M?l{5ndg53cIWX1_R=P%>*M03^(HVzTbUf~s)1UI<fngKeNNe~ON*!k
zFF5+KVI-N-)gAyQ;Ls1w#xnRir2mYcmZpAz7<H=R0^?Wq(G`ZT3`+Z^q_(meMjCZu
zirf))g#{Q`VxWF1VV6RigESCh?w_V|M}a4#4Wq@x-fkw1PG?VuXbV=Rvs*muTzF&l
zt0$E;4QCIxjAk)ieL~!!g2I#|{$zVx`hjfpMrQgbIr%Tq(E{4-*G*2jm?7Cc$QMx@
zBhbQDOsHs*8dXl--cKKRXM$9<chJ_AUDp1}oG?Y_y(rQ*iyKRs%SDmGZS{q9Cjl>8
zAcKwz6m*H*?WSrDS{UfAI$ngp4RQW6?3(%=pgPxJ&e?w9-!YYd&}E$%2p&_|H_$rL
fa>bN`(u}bsF^2vRWc&H{z3s<a_uH%ImmmBM<riF;

delta 14
WcmdmYi|PGorVWcaH-DVqD+2&Nt_RNm

diff --git a/client/src/helpers/constants.js b/client/src/helpers/constants.js
index 578d52a3..989a258b 100644
--- a/client/src/helpers/constants.js
+++ b/client/src/helpers/constants.js
@@ -279,6 +279,10 @@ export const SERVICES = [
         id: 'tiktok',
         name: 'TikTok',
     },
+    {
+        id: 'qq',
+        name: 'QQ',
+    },
 ];
 
 export const SERVICES_ID_NAME_MAP = SERVICES.reduce((acc, { id, name }) => {
diff --git a/dnsfilter/blocked_services.go b/dnsfilter/blocked_services.go
index 8cac102e..08990e0a 100644
--- a/dnsfilter/blocked_services.go
+++ b/dnsfilter/blocked_services.go
@@ -161,6 +161,7 @@ var serviceRulesArray = []svc{
 		"||douyin.com^",
 		"||tiktokv.com^",
 	}},
+	{"qq", []string{"||qq.com^", "||qqzaixian.com^"}},
 }
 
 // convert array to map