From a0f397f84e947aea066fc7690c7098f3feede954 Mon Sep 17 00:00:00 2001
From: Zzqqbs <23348661+Zzqqbs@users.noreply.github.com>
Date: Sat, 28 Dec 2019 16:39:47 +0800
Subject: [PATCH 1/3] Add acfun and kuaishou

Create acfun, kuaishou, kuaishou-ads
---
 data/acfun          | 5 +++++
 data/category-ads   | 1 +
 data/geolocation-cn | 2 ++
 data/kuaishou       | 7 +++++++
 data/kuaishou-ads   | 2 ++
 5 files changed, 17 insertions(+)
 create mode 100644 data/acfun
 create mode 100644 data/kuaishou
 create mode 100644 data/kuaishou-ads

diff --git a/data/acfun b/data/acfun
new file mode 100644
index 00000000..d789f489
--- /dev/null
+++ b/data/acfun
@@ -0,0 +1,5 @@
+# Beijing Danmu Network Technology Co., Ltd.
+# It was wholly acquired by Kuaishou on June 5, 2018.
+
+acfun.cn
+aixifan.com
diff --git a/data/category-ads b/data/category-ads
index ea490dab..7694f4e2 100644
--- a/data/category-ads
+++ b/data/category-ads
@@ -8,6 +8,7 @@ include:google-ads
 include:hunantv-ads
 include:iqiyi-ads
 include:jd-ads
+include:kuaishou-ads
 include:letv-ads
 include:netease-ads
 include:sina-ads
diff --git a/data/geolocation-cn b/data/geolocation-cn
index 77189ec9..58f41f6b 100644
--- a/data/geolocation-cn
+++ b/data/geolocation-cn
@@ -1,5 +1,6 @@
 # List of all domains that have access point in China
 
+include:acfun
 include:alibaba
 include:baidu
 include:bilibili
@@ -12,6 +13,7 @@ include:huya
 include:iqiyi
 include:jd
 include:jiemian
+include:kuaishou
 include:mafengwo
 include:netease
 include:qihoo360
diff --git a/data/kuaishou b/data/kuaishou
new file mode 100644
index 00000000..e96f8a4b
--- /dev/null
+++ b/data/kuaishou
@@ -0,0 +1,7 @@
+# Beijing Kuaishou Technology Co., Ltd.
+
+gifshow.com
+kuaishou.com
+static.yximgs.com
+
+include:kuaishou-ads
diff --git a/data/kuaishou-ads b/data/kuaishou-ads
new file mode 100644
index 00000000..8b446fc6
--- /dev/null
+++ b/data/kuaishou-ads
@@ -0,0 +1,2 @@
+full:log-sdk.gifshow.com @ads
+full:wlog.kuaishou.com @ads

From c655a655f51e7ca3a22f500dd465c5453a2752a7 Mon Sep 17 00:00:00 2001
From: Zzqqbs <23348661+Zzqqbs@users.noreply.github.com>
Date: Sat, 28 Dec 2019 17:04:05 +0800
Subject: [PATCH 2/3] Add acfun-ads

Create and include acfun-ads
---
 data/acfun        | 2 ++
 data/acfun-ads    | 1 +
 data/category-ads | 1 +
 3 files changed, 4 insertions(+)
 create mode 100644 data/acfun-ads

diff --git a/data/acfun b/data/acfun
index d789f489..1b449ee9 100644
--- a/data/acfun
+++ b/data/acfun
@@ -3,3 +3,5 @@
 
 acfun.cn
 aixifan.com
+
+include:acfun-ads
diff --git a/data/acfun-ads b/data/acfun-ads
new file mode 100644
index 00000000..508863f9
--- /dev/null
+++ b/data/acfun-ads
@@ -0,0 +1 @@
+full:apilog-web.acfun.cn @ads
diff --git a/data/category-ads b/data/category-ads
index 7694f4e2..b0f3d252 100644
--- a/data/category-ads
+++ b/data/category-ads
@@ -1,5 +1,6 @@
 # This file contains domains that clearly serving ads
 
+include:acfun-ads
 include:alibaba-ads
 include:apple-ads
 include:baidu-ads

From 292b035575d5b70c48a6b2bf82e1c7c2354e9148 Mon Sep 17 00:00:00 2001
From: Zzqqbs <23348661+Zzqqbs@users.noreply.github.com>
Date: Sat, 28 Dec 2019 17:53:33 +0800
Subject: [PATCH 3/3] Update acfun

1. Move "aixifan.com" from geolocation-cn to acfun;
2. Delete invalid domain "acfun.tv".
---
 data/acfun          | 1 -
 data/geolocation-cn | 2 --
 2 files changed, 3 deletions(-)

diff --git a/data/acfun b/data/acfun
index 1b449ee9..53a5055a 100644
--- a/data/acfun
+++ b/data/acfun
@@ -1,5 +1,4 @@
 # Beijing Danmu Network Technology Co., Ltd.
-# It was wholly acquired by Kuaishou on June 5, 2018.
 
 acfun.cn
 aixifan.com
diff --git a/data/geolocation-cn b/data/geolocation-cn
index 58f41f6b..06e0644a 100644
--- a/data/geolocation-cn
+++ b/data/geolocation-cn
@@ -96,10 +96,8 @@ moji.com
 900.la
 9718.com
 9xu.com
-acfun.tv
 agrantsem.com
 aicdn.com
-aixifan.com
 allyes.com
 anjuke.com
 anquan.org