xing/wp-go
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

优化

Browse Source
This commit is contained in:
xing 2022-10-08 16:37:27 +08:00
parent b5324fda0c
commit e3dc2a156c
5 changed files with 25 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
actions/common/posts.go
View File

@ -12,14 +12,10 @@ import (
"time" "time"
) )
func GetPostAndCache(ctx context.Context, id uint64) (models.WpPosts, error) { func GetPostById(ctx context.Context, id uint64) (models.WpPosts, error) {
return postsCache.GetCache(ctx, id, time.Second, id) return postsCache.GetCache(ctx, id, time.Second, id)
} }
func GetPostById(id uint64) models.WpPosts {
return postsCache.Get(id)
}
func GetPostsByIds(ctx context.Context, ids []uint64) ([]models.WpPosts, error) { func GetPostsByIds(ctx context.Context, ids []uint64) ([]models.WpPosts, error) {
return postsCache.GetCacheBatch(ctx, ids, time.Second, ids) return postsCache.GetCacheBatch(ctx, ids, time.Second, ids)
} }

2
actions/detail.go
View File

@ -61,7 +61,7 @@ func Detail(c *gin.Context) {
if ID > maxId || err != nil { if ID > maxId || err != nil {
return return
} }
post, err := common.GetPostAndCache(c, ID) post, err := common.GetPostById(c, ID)
if post.Id == 0 || err != nil { if post.Id == 0 || err != nil {
return return
} }

26
actions/feed.go
View File

@ -19,6 +19,7 @@ import (
var feedCache = cache.NewSliceCache(feed, time.Hour) var feedCache = cache.NewSliceCache(feed, time.Hour)
var postFeedCache = cache.NewMapCacheByFn[string, string](postFeed, time.Hour) var postFeedCache = cache.NewMapCacheByFn[string, string](postFeed, time.Hour)
var tmp = "Mon, 02 Jan 2006 15:04:05 GMT" var tmp = "Mon, 02 Jan 2006 15:04:05 GMT"
var timeFormat = "Mon, 02 Jan 2006 15:04:05 +0000"
var templateRss rss2.Rss2 var templateRss rss2.Rss2
var commentsFeedCache = cache.NewSliceCache(commentsFeed, time.Hour) var commentsFeedCache = cache.NewSliceCache(commentsFeed, time.Hour)
@ -79,7 +80,7 @@ func feed(arg ...any) (xml []string, err error) {
return return
} }
rs := templateRss rs := templateRss
rs.LastBuildDate = time.Now().Format(time.RFC1123Z) rs.LastBuildDate = time.Now().Format(timeFormat)
rs.Items = helper.SliceMap(posts, func(t models.WpPosts) rss2.Item { rs.Items = helper.SliceMap(posts, func(t models.WpPosts) rss2.Item {
desc := "无法提供摘要。这是一篇受保护的文章。" desc := "无法提供摘要。这是一篇受保护的文章。"
common.PasswordProjectTitle(&t) common.PasswordProjectTitle(&t)
@ -107,7 +108,7 @@ func feed(arg ...any) (xml []string, err error) {
CommentRss: fmt.Sprintf("%s/p/%d/feed", models.Options["siteurl"], t.Id), CommentRss: fmt.Sprintf("%s/p/%d/feed", models.Options["siteurl"], t.Id),
Link: fmt.Sprintf("%s/p/%d", models.Options["siteurl"], t.Id), Link: fmt.Sprintf("%s/p/%d", models.Options["siteurl"], t.Id),
Description: desc, Description: desc,
PubDate: t.PostDateGmt.Format(time.RFC1123Z), PubDate: t.PostDateGmt.Format(timeFormat),
} }
}) })
xml = []string{rs.GetXML()} xml = []string{rs.GetXML()}
@ -155,7 +156,7 @@ func postFeed(arg ...any) (x string, err error) {
if ID > maxId || err != nil { if ID > maxId || err != nil {
return return
} }
post, err := common.GetPostAndCache(c, ID) post, err := common.GetPostById(c, ID)
if post.Id == 0 || err != nil { if post.Id == 0 || err != nil {
return return
} }
@ -169,7 +170,7 @@ func postFeed(arg ...any) (x string, err error) {
rs.Title = fmt.Sprintf("《%s》的评论", post.PostTitle) rs.Title = fmt.Sprintf("《%s》的评论", post.PostTitle)
rs.AtomLink = fmt.Sprintf("%s/p/%d/feed", models.Options["siteurl"], post.Id) rs.AtomLink = fmt.Sprintf("%s/p/%d/feed", models.Options["siteurl"], post.Id)
rs.Link = fmt.Sprintf("%s/p/%d", models.Options["siteurl"], post.Id) rs.Link = fmt.Sprintf("%s/p/%d", models.Options["siteurl"], post.Id)
rs.LastBuildDate = time.Now().Format(time.RFC1123Z) rs.LastBuildDate = time.Now().Format(timeFormat)
if post.PostPassword != "" { if post.PostPassword != "" {
if len(comments) > 0 { if len(comments) > 0 {
common.PasswdProjectContent(&post) common.PasswdProjectContent(&post)
@ -179,7 +180,7 @@ func postFeed(arg ...any) (x string, err error) {
Title: fmt.Sprintf("评价者：%s", t.CommentAuthor), Title: fmt.Sprintf("评价者：%s", t.CommentAuthor),
Link: fmt.Sprintf("%s/p/%d#comment-%d", models.Options["siteurl"], post.Id, t.CommentId), Link: fmt.Sprintf("%s/p/%d#comment-%d", models.Options["siteurl"], post.Id, t.CommentId),
Creator: t.CommentAuthor, Creator: t.CommentAuthor,
PubDate: t.CommentDateGmt.Format(time.RFC1123Z), PubDate: t.CommentDateGmt.Format(timeFormat),
Guid: fmt.Sprintf("%s#comment-%d", post.Guid, t.CommentId), Guid: fmt.Sprintf("%s#comment-%d", post.Guid, t.CommentId),
Description: "评论受保护：要查看请输入密码。", Description: "评论受保护：要查看请输入密码。",
Content: post.PostContent, Content: post.PostContent,
@ -192,7 +193,7 @@ func postFeed(arg ...any) (x string, err error) {
Title: fmt.Sprintf("评价者：%s", t.CommentAuthor), Title: fmt.Sprintf("评价者：%s", t.CommentAuthor),
Link: fmt.Sprintf("%s/p/%d#comment-%d", models.Options["siteurl"], post.Id, t.CommentId), Link: fmt.Sprintf("%s/p/%d#comment-%d", models.Options["siteurl"], post.Id, t.CommentId),
Creator: t.CommentAuthor, Creator: t.CommentAuthor,
PubDate: t.CommentDateGmt.Format(time.RFC1123Z), PubDate: t.CommentDateGmt.Format(timeFormat),
Guid: fmt.Sprintf("%s#comment-%d", post.Guid, t.CommentId), Guid: fmt.Sprintf("%s#comment-%d", post.Guid, t.CommentId),
Content: t.CommentContent, Content: t.CommentContent,
} }
@ -222,7 +223,8 @@ func commentsFeed(args ...any) (r []string, err error) {
c := args[0].(*gin.Context) c := args[0].(*gin.Context)
commens := common.RecentComments(c, 10) commens := common.RecentComments(c, 10)
rs := templateRss rs := templateRss
rs.LastBuildDate = time.Now().Format(time.RFC1123Z) rs.Title = fmt.Sprintf("\"%s\"的评论", models.Options["blogname"])
rs.LastBuildDate = time.Now().Format(timeFormat)
rs.AtomLink = fmt.Sprintf("%s/comments/feed", models.Options["siteurl"]) rs.AtomLink = fmt.Sprintf("%s/comments/feed", models.Options["siteurl"])
com, err := common.GetCommentByIds(c, helper.SliceMap(commens, func(t models.WpComments) uint64 { com, err := common.GetCommentByIds(c, helper.SliceMap(commens, func(t models.WpComments) uint64 {
return t.CommentId return t.CommentId
@ -231,7 +233,7 @@ func commentsFeed(args ...any) (r []string, err error) {
return []string{}, err return []string{}, err
} }
rs.Items = helper.SliceMap(com, func(t models.WpComments) rss2.Item { rs.Items = helper.SliceMap(com, func(t models.WpComments) rss2.Item {
post, _ := common.GetPostAndCache(c, t.CommentPostId) post, _ := common.GetPostById(c, t.CommentPostId)
common.PasswordProjectTitle(&post) common.PasswordProjectTitle(&post)
desc := "评论受保护：要查看请输入密码。" desc := "评论受保护：要查看请输入密码。"
content := t.CommentContent content := t.CommentContent
@ -239,15 +241,15 @@ func commentsFeed(args ...any) (r []string, err error) {
common.PasswdProjectContent(&post) common.PasswdProjectContent(&post)
content = post.PostContent content = post.PostContent
} else { } else {
desc = plugins.DigestRaw(t.CommentContent, 55, fmt.Sprintf("%s/p/%d#comment-%d", models.Options["siteurl"], post.Id, t.CommentId)) desc = plugins.ClearHtml(t.CommentContent)
content = t.CommentContent content = desc
} }
return rss2.Item{ return rss2.Item{
Title: fmt.Sprintf("《%s》的评论", post.PostTitle), Title: fmt.Sprintf("%s对《%s》的评论", t.CommentAuthor, post.PostTitle),
Link: fmt.Sprintf("%s/p/%d#comment-%d", models.Options["siteurl"], post.Id, t.CommentId), Link: fmt.Sprintf("%s/p/%d#comment-%d", models.Options["siteurl"], post.Id, t.CommentId),
Creator: t.CommentAuthor, Creator: t.CommentAuthor,
Description: desc, Description: desc,
PubDate: t.CommentDateGmt.Format(time.RFC1123Z), PubDate: t.CommentDateGmt.Format(timeFormat),
Guid: fmt.Sprintf("%s#commment-%d", post.Guid, t.CommentId), Guid: fmt.Sprintf("%s#commment-%d", post.Guid, t.CommentId),
Content: content, Content: content,
} }

4
actions/index.go
View File

@ -204,9 +204,7 @@ func Index(c *gin.Context) {
pw := h.session.Get("post_password") pw := h.session.Get("post_password")
plug := plugins.NewPostPlugin(c, h.scene) plug := plugins.NewPostPlugin(c, h.scene)
for i, v := range postIds { for i, post := range postIds {
post := common.GetPostById(v.Id)
postIds[i] = post
common.PasswordProjectTitle(&postIds[i]) common.PasswordProjectTitle(&postIds[i])
if post.PostPassword != "" && pw != post.PostPassword { if post.PostPassword != "" && pw != post.PostPassword {
common.PasswdProjectContent(&postIds[i]) common.PasswdProjectContent(&postIds[i])

8
plugins/digest.go
View File

@ -43,6 +43,14 @@ func DigestCache(ctx *gin.Context, id uint64, str string) string {
return content return content
} }
func ClearHtml(str string) string {
content := removeWpBlock.ReplaceAllString(str, "")
content = strings.Trim(content, " \t\n\r\000\x0B")
content = strings.Replace(content, "]]>", "]]>", -1)
content = helper.StripTagsX(content, "<a><b><blockquote><br><cite><code><dd><del><div><dl><dt><em><h1><h2><h3><h4><h5><h6><i><img><li><ol><p><pre><span><strong><ul>")
return str
}
func DigestRaw(str string, limit int, u string) string { func DigestRaw(str string, limit int, u string) string {
if r := more.FindString(str); r != "" { if r := more.FindString(str); r != "" {
m := strings.Split(str, r) m := strings.Split(str, r)