xing/rss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix bug

Browse Source
This commit is contained in:
xing 2023-05-03 00:31:40 +08:00
parent 233738f52f
commit 013b7a533d
2 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
bbclearn/bbc.go
View File

@ -1,7 +1,6 @@
package bbclearn package bbclearn
import ( import (
"fmt"
"github.com/PuerkitoBio/goquery" "github.com/PuerkitoBio/goquery"
"github.com/fthvgb1/wp-go/rss2" "github.com/fthvgb1/wp-go/rss2"
"net/http" "net/http"
@ -47,11 +46,7 @@ func dateFilter(u string, recentDay int) (r bool) {
return return
} }
t := time.Now() t := time.Now()
if t.Year() != date.Year() || t.Month() != date.Month() { if t.Sub(date).Hours()/24-float64(recentDay) > 0 {
return
}
fmt.Println(time.Now().Day()-recentDay, date.Day())
if t.Day()-recentDay > date.Day() {
return return
} }
r = true r = true

18
main.go
View File

@ -31,7 +31,7 @@ func fetch(u string, fn ...func(s string) string) string {
return html return html
} }
func dayLimit(today, forwardDay int, s, format string) string { func dayLimit(now time.Time, forwardDay int, s, format string) string {
da := date.FindStringSubmatch(s) da := date.FindStringSubmatch(s)
if len(da) <= 1 { if len(da) <= 1 {
return s return s
@ -40,15 +40,17 @@ func dayLimit(today, forwardDay int, s, format string) string {
if err != nil { if err != nil {
return s return s
} }
if today-forwardDay > t.Day() { day := now.Sub(t).Hours() / 24
if day-float64(forwardDay) > 0 {
return "" return ""
} }
return s return s
} }
func filterItem(html string, today, recentDay int) string { func filterItem(html string, now time.Time, recentDay int) string {
return zhihuReg.ReplaceAllStringFunc(html, func(s string) string { return zhihuReg.ReplaceAllStringFunc(html, func(s string) string {
return dayLimit(today, recentDay, s, time.RFC1123Z) return dayLimit(now, recentDay, s, time.RFC1123Z)
}) })
} }
@ -60,14 +62,14 @@ func penti(w http.ResponseWriter, req *http.Request) {
func zhihuDaily(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 { io.WriteString(w, fetch("https://feedx.best/rss/zhihudaily.xml", func(s string) string {
return filterItem(s, time.Now().Day(), 1) return filterItem(s, time.Now(), 1)
})) }))
} }
func tjxz(w http.ResponseWriter, r *http.Request) { func tjxz(w http.ResponseWriter, r *http.Request) {
io.WriteString(w, fetch("https://feedx.best/rss/tjxz.xml", func(s string) string { io.WriteString(w, fetch("https://feedx.best/rss/tjxz.xml", func(s string) string {
return filterItem(s, time.Now().Day(), 0) return filterItem(s, time.Now(), 0)
})) }))
} }
func bbcLearn(w http.ResponseWriter, _ *http.Request) { func bbcLearn(w http.ResponseWriter, _ *http.Request) {
@ -78,13 +80,13 @@ func bbcLearn(w http.ResponseWriter, _ *http.Request) {
func theNewYorker(w http.ResponseWriter, r *http.Request) { func theNewYorker(w http.ResponseWriter, r *http.Request) {
io.WriteString(w, fetch("https://feedx.best/rss/newyorker.xml", func(s string) string { io.WriteString(w, fetch("https://feedx.best/rss/newyorker.xml", func(s string) string {
return filterItem(s, time.Now().Day(), 1) return filterItem(s, time.Now(), 1)
})) }))
} }
func voaLearnEnglish(w http.ResponseWriter, r *http.Request) { func voaLearnEnglish(w http.ResponseWriter, r *http.Request) {
io.WriteString(w, fetch("https://feedx.best/rss/voalearningenglish.xml", func(s string) string { io.WriteString(w, fetch("https://feedx.best/rss/voalearningenglish.xml", func(s string) string {
return filterItem(s, time.Now().Day(), 1) return filterItem(s, time.Now(), 1)
})) }))
} }