From a9fa94c8c1a17c0104ca6a063b76ae3396f2ea8f Mon Sep 17 00:00:00 2001
From: zu1k <i@lgf.im>
Date: Wed, 19 Aug 2020 21:12:49 +0800
Subject: [PATCH] opti

---
 app/cron.go            | 2 +-
 assets/clash.html      | 2 +-
 assets/index.html      | 2 +-
 assets/surge.html      | 2 +-
 getter/tgchannel.go    | 2 --
 getter/web_fuzz_sub.go | 2 +-
 6 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/app/cron.go b/app/cron.go
index 9f78915..0a39652 100644
--- a/app/cron.go
+++ b/app/cron.go
@@ -5,6 +5,6 @@ import (
 )
 
 func Cron() {
-	_ = gocron.Every(10).Minutes().Do(CrawlGo)
+	_ = gocron.Every(15).Minutes().Do(CrawlGo)
 	<-gocron.Start()
 }
diff --git a/assets/clash.html b/assets/clash.html
index c6baca9..56732ae 100644
--- a/assets/clash.html
+++ b/assets/clash.html
@@ -103,7 +103,7 @@
     <div class='section friendly'>
         <h1><strong>免费Clash节点</strong></h1>
         <div class='article'>
-            <p>自动抓取tg频道、订阅地址、公开互联网上的ss、ssr、vmess节点信息，聚合去重后提供clash配置，每10分钟更新</p>
+            <p>自动抓取tg频道、订阅地址、公开互联网上的ss、ssr、vmess节点信息，聚合去重后提供clash配置，每15分钟更新</p>
             <br>
             <p>Clash配置文件：<a href="https://proxy.tgbot.co/clash/config">https://proxy.tgbot.co/clash/config</a> <a href="clash://install-config?url=https://proxy.tgbot.co/clash/config">一键导入</a></p>
             <p>Clash proxy-provider(Shadowrocket添加订阅方式可用)：<a href="https://proxy.tgbot.co/clash/proxies">https://proxy.tgbot.co/clash/proxies</a></p>
diff --git a/assets/index.html b/assets/index.html
index 2de6df0..a0b0c52 100644
--- a/assets/index.html
+++ b/assets/index.html
@@ -106,7 +106,7 @@
     <div class='section friendly'>
         <h1><strong>免费节点</strong></h1>
         <div class='article'>
-            <p>自动抓取tg频道、订阅地址、公开互联网上的ss、ssr、vmess节点信息，聚合去重后提供节点列表，每10分钟更新</p>
+            <p>自动抓取tg频道、订阅地址、公开互联网上的ss、ssr、vmess节点信息，聚合去重后提供节点列表，每15分钟更新</p>
             <br>
             <h5><a href="/clash">Clash</a></h5>
             <p>Clash配置文件：<a href="https://proxy.tgbot.co/clash/config">https://proxy.tgbot.co/clash/config</a> <a
diff --git a/assets/surge.html b/assets/surge.html
index fe3faf9..8e3e060 100644
--- a/assets/surge.html
+++ b/assets/surge.html
@@ -73,7 +73,7 @@
   <div class='section friendly'>
 	<h1><strong>免费Surge节点</strong></h1>
 	<div class='article'>
-	  <p>自动抓取tg频道、订阅地址、公开互联网上的ss、vmess节点信息，聚合去重后提供Surge节点列表，每10分钟更新</p>
+	  <p>自动抓取tg频道、订阅地址、公开互联网上的ss、vmess节点信息，聚合去重后提供Surge节点列表，每15分钟更新</p>
 		<br>
 	  <p>Surge配置文件：<a href="https://proxy.tgbot.co/surge/config">https://proxy.tgbot.co/surge/config</a> <a href="surge3:///install-config?url=https://proxy.tgbot.co/surge/config">一键导入</a></p>
 	  <p>Surge proxy list：<a href="https://proxy.tgbot.co/surge/proxies">https://proxy.tgbot.co/surge/proxies</a></p>
diff --git a/getter/tgchannel.go b/getter/tgchannel.go
index 1fa78dc..96d4a9c 100644
--- a/getter/tgchannel.go
+++ b/getter/tgchannel.go
@@ -50,7 +50,6 @@ func NewTGChannelGetter(options tool.Options) (getter Getter, err error) {
 
 func (g *TGChannelGetter) Get() proxy.ProxyList {
 	result := make(proxy.ProxyList, 0)
-
 	g.results = make([]string, 0)
 	// 找到所有的文字消息
 	g.c.OnHTML("div.tgme_widget_message_text", func(e *colly.HTMLElement) {
@@ -74,7 +73,6 @@ func (g *TGChannelGetter) Get() proxy.ProxyList {
 	if err != nil {
 		_ = fmt.Errorf("%s", err.Error())
 	}
-
 	return append(result, StringArray2ProxyArray(g.results)...)
 }
 
diff --git a/getter/web_fuzz_sub.go b/getter/web_fuzz_sub.go
index c62013b..7a5ae7b 100644
--- a/getter/web_fuzz_sub.go
+++ b/getter/web_fuzz_sub.go
@@ -80,7 +80,7 @@ const (
 	domainPattern = `[a-zA-Z0-9][a-zA-Z0-9_-]{0,62}(\.[a-zA-Z0-9][a-zA-Z0-9_-]{0,62})*(\.[a-zA-Z][a-zA-Z0-9]{0,10}){1}`
 
 	// 匹配 URL
-	urlPattern = `((https|http|ftp|rtsp|mms)?://)?` + // 协议
+	urlPattern = `((https|http)?://)?` + // 协议
 		`(([0-9a-zA-Z]+:)?[0-9a-zA-Z_-]+@)?` + // pwd:user@
 		"(" + ipPattern + "|(" + domainPattern + "))" + // IP 或域名
 		`(:\d{1,5})?` + // 端口