.gitignore

@@ -2,6 +2,4 @@
 .gitignore
 rss.iml
 rss
-fetchdapenti
-/run.sh
-/sendmail
+fetchdapenti

bbclearn/bbc.go

@@ -88,10 +88,6 @@ func fetch(u string) (r rss2.Item) {
 var hadSend = safety.NewMap[string, struct{}]()
 
 func downAndSendMail(doc *goquery.Document, title string) {
-	if err := mail.CheckEnv(); err != nil {
-		log.Println("err", err)
-		return
-	}
 	type m struct {
 		tit     string
 		content string

mail/mail.go

@@ -7,29 +7,23 @@ import (
 	"os/exec"
 )
 
-var cm, subjectParam, contentParam, fileParam string
-
-func CheckEnv() error {
-	cm = os.Getenv("mail_cmd_path")
+func SendMail(subject string, content string, files ...string) error {
+	cm := os.Getenv("mail_cmd_path")
 	if cm == "" {
 		return errors.New("cmd can't empty")
 	}
-	subjectParam = os.Getenv("mail_cmd_subject_param_name")
+	subjectParam := os.Getenv("mail_cmd_subject_param_name")
 	if subjectParam == "" {
 		return errors.New("title param name empty")
 	}
-	contentParam = os.Getenv("mail_cmd_content_param_name")
+	contentParam := os.Getenv("mail_cmd_content_param_name")
 	if contentParam == "" {
 		return errors.New("content param name emtpy")
 	}
-	fileParam = os.Getenv("mail_cmd_file_param_name")
+	fileParam := os.Getenv("mail_cmd_file_param_name")
 	if fileParam == "" {
 		return errors.New("file empty")
 	}
-	return nil
-}
-
-func SendMail(subject string, content string, files ...string) error {
 	v := []string{subjectParam, subject, contentParam, content}
 	for _, f := range files {
 		if f != "" {

main.go

@@ -1,7 +1,6 @@
 package main
 
 import (
-	str "github.com/fthvgb1/wp-go/helper/strings"
 	"io"
 	"log"
 	"net/http"
@@ -63,45 +62,39 @@ func penti(w http.ResponseWriter, req *http.Request) {
 
 func zhihuDaily(w http.ResponseWriter, req *http.Request) {
 	io.WriteString(w, fetch("https://feedx.best/rss/zhihudaily.xml", func(s string) string {
-		return filterItem(s, time.Now(), recentDay)
+		return filterItem(s, time.Now(), 1)
 	}))
 }
 
 func tjxz(w http.ResponseWriter, r *http.Request) {
 
 	io.WriteString(w, fetch("https://feedx.best/rss/tjxz.xml", func(s string) string {
-		return filterItem(s, time.Now(), recentDay)
+		return filterItem(s, time.Now(), 1)
 	}))
 }
 func bbcLearn(w http.ResponseWriter, _ *http.Request) {
 	io.WriteString(w, fetch("https://www.bbc.co.uk/learningenglish/chinese", func(s string) string {
-		return bbclearn.LearnParse(s, recentDay)
+		return bbclearn.LearnParse(s, 1)
 	}))
 }
 
 func theNewYorker(w http.ResponseWriter, r *http.Request) {
 	io.WriteString(w, fetch("https://feedx.best/rss/newyorker.xml", func(s string) string {
-		return filterItem(s, time.Now(), recentDay)
+		return filterItem(s, time.Now(), 1)
 	}))
 }
 
 func voaLearnEnglish(w http.ResponseWriter, r *http.Request) {
 	io.WriteString(w, fetch("https://feedx.best/rss/voalearningenglish.xml", func(s string) string {
-		return filterItem(s, time.Now(), recentDay)
+		return filterItem(s, time.Now(), 1)
 	}))
 }
 
-var recentDay = 1
-
 func main() {
 	port := os.Getenv("port")
 	if port == "" {
 		port = ":80"
 	}
-	day := os.Getenv("rss_recent_day")
-	if day != "" {
-		recentDay = str.ToInt[int](day)
-	}
 	time.Local = time.FixedZone("CST", 3600*8)
 	http.HandleFunc("/pentitugua", penti)                //喷嚏图挂
 	http.HandleFunc("/zhihuDaily", zhihuDaily)           //知乎日报