chore(release): 2.2.15

2. CleanArticles deleted all article error in rdbms, fixed #43,fixed #44

CHANGELOG.md

@@ -2,6 +2,38 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [2.2.15](https://github.com/eiblog/eiblog/compare/v2.2.14...v2.2.15) (2024-12-31)
+
+
+### Bug Fixes
+
+* disqus list posts ([52fe730](https://github.com/eiblog/eiblog/commit/52fe7303f3345421c0f2e2989a6c174d5b1a689e))
+* disqus thread not store ([616248d](https://github.com/eiblog/eiblog/commit/616248d33fdf44dbc3aed41e92adae001a4f5577))
+
+### [2.2.14](https://github.com/eiblog/eiblog/compare/v2.2.13...v2.2.14) (2024-10-10)
+
+
+### Bug Fixes
+
+* 1. bei_an cannot  update error ([b53fc91](https://github.com/eiblog/eiblog/commit/b53fc91ce7b67c3811c232ad6236898f84bc391b)), closes [#43](https://github.com/eiblog/eiblog/issues/43) [#44](https://github.com/eiblog/eiblog/issues/44)
+* **serie:** update serie did not rerender ([88f23bd](https://github.com/eiblog/eiblog/commit/88f23bd1a0d6183d6de484cb79303506f0506d15))
+
+### [2.2.13](https://github.com/eiblog/eiblog/compare/v2.2.12...v2.2.13) (2024-01-02)
+
+
+### Bug Fixes
+
+* load more comments ([95e55ee](https://github.com/eiblog/eiblog/commit/95e55ee13c1af13e2bb2149ccbe60013c93e4e69))
+
+### [2.2.12](https://github.com/eiblog/eiblog/compare/v2.2.11...v2.2.12) (2024-01-02)
+
+### [2.2.11](https://github.com/eiblog/eiblog/compare/v2.2.10...v2.2.11) (2024-01-02)
+
+
+### Bug Fixes
+
+* **disqus:** fix returned posts list not have parent post ([9d71ca8](https://github.com/eiblog/eiblog/commit/9d71ca81988bfc614d13fcb02079f0dba9ef43cc))
+
 ### [2.2.10](https://github.com/eiblog/eiblog/compare/v2.2.9...v2.2.10) (2023-12-22)
 
 ### [2.2.9](https://github.com/eiblog/eiblog/compare/v2.2.8...v2.2.9) (2023-09-25)

go.mod

@@ -4,7 +4,7 @@ go 1.15
 
 require (
 	github.com/eiblog/blackfriday v0.0.0-20161010144836-c0ec111761ae
-	github.com/gin-contrib/sessions v0.0.5
+	github.com/gin-contrib/sessions v0.0.4
 	github.com/gin-gonic/gin v1.9.1
 	github.com/lib/pq v1.10.9
 	github.com/qiniu/go-sdk/v7 v7.11.0
@@ -13,9 +13,9 @@ require (
 	github.com/swaggo/files v0.0.0-20190704085106-630677cd5c14
 	github.com/swaggo/gin-swagger v1.3.3
 	github.com/swaggo/swag v1.7.4
-	go.mongodb.org/mongo-driver v1.11.4
+	go.mongodb.org/mongo-driver v1.5.4
 	gopkg.in/yaml.v3 v3.0.1
-	gorm.io/driver/clickhouse v0.6.0
+	gorm.io/driver/clickhouse v0.4.2
 	gorm.io/driver/mysql v1.5.2
 	gorm.io/driver/postgres v1.5.4
 	gorm.io/driver/sqlite v1.5.4

pkg/cache/store/rdbms.go

@@ -144,7 +144,7 @@ func (db *rdbms) RemoveArticle(ctx context.Context, id int) error {
 
 // CleanArticles 清理回收站文章
 func (db *rdbms) CleanArticles(ctx context.Context, exp time.Time) error {
-	return db.Where("deleted_at BETWEEN ? AND ?", time.Time{}, exp).Delete(model.Article{}).Error
+	return db.Where("deleted_at > ? AND deleted_at < ?", time.Time{}, exp).Delete(model.Article{}).Error
 }
 
 // UpdateArticle 更新文章

pkg/config/config.go

@@ -2,7 +2,6 @@
 package config
 
 import (
-	"io/ioutil"
 	"os"
 	"path/filepath"
 	"strings"
@@ -147,7 +146,7 @@ func init() {
 	WorkDir = workDir()
 	path := filepath.Join(WorkDir, "conf", "app.yml")
 
-	data, err := ioutil.ReadFile(path)
+	data, err := os.ReadFile(path)
 	if err != nil {
 		panic(err)
 	}

pkg/core/eiblog/admin/admin.go

@@ -94,6 +94,7 @@ func handleAPIBlogger(c *gin.Context) {
 	err := cache.Ei.UpdateBlogger(context.Background(), map[string]interface{}{
 		"blog_name":    bn,
 		"b_title":      bt,
+		"bei_an":       ba,
 		"sub_title":    st,
 		"series_say":   ss,
 		"archives_say": as,
@@ -287,14 +288,14 @@ func handleAPIPostCreate(c *gin.Context) {
 		cid = article.ID
 
 		if !article.IsDraft {
+			// disqus
+			internal.ThreadCreate(article, cache.Ei.Blogger.BTitle)
 			// 异步执行，快
 			go func() {
 				// elastic
 				internal.ElasticAddIndex(article)
 				// rss
 				internal.PingFunc(cache.Ei.Blogger.BTitle, slug)
-				// disqus
-				internal.ThreadCreate(article, cache.Ei.Blogger.BTitle)
 			}()
 		}
 		return
@@ -326,16 +327,16 @@ func handleAPIPostCreate(c *gin.Context) {
 	}
 	if !article.IsDraft {
 		cache.Ei.RepArticle(artc, article)
+		// disqus
+		if artc == nil {
+			internal.ThreadCreate(article, cache.Ei.Blogger.BTitle)
+		}
 		// 异步执行，快
 		go func() {
 			// elastic
 			internal.ElasticAddIndex(article)
 			// rss
 			internal.PingFunc(cache.Ei.Blogger.BTitle, slug)
-			// disqus
-			if artc == nil {
-				internal.ThreadCreate(article, cache.Ei.Blogger.BTitle)
-			}
 		}()
 	}
 }
@@ -398,6 +399,7 @@ func handleAPISerieCreate(c *gin.Context) {
 		serie.Slug = slug
 		serie.Name = name
 		serie.Desc = desc
+		cache.PagesCh <- cache.PageSeries
 	} else {
 		err = cache.Ei.AddSerie(&model.Serie{
 			Slug:      slug,

pkg/core/eiblog/page/fe.go

@@ -6,7 +6,7 @@ import (
 	"context"
 	"fmt"
 	htemplate "html/template"
-	"io/ioutil"
+	"io"
 	"math/rand"
 	"net/http"
 	"strconv"
@@ -204,7 +204,7 @@ func handleDisqusList(c *gin.Context) {
 	if artc != nil {
 		dcs.Data.Thread = artc.Thread
 	}
-	postsList, err := internal.PostsList(slug, cursor)
+	postsList, err := internal.PostsList(artc, cursor)
 	if err != nil {
 		logrus.Error("hadnleDisqusList.PostsList: ", err)
 		dcs.ErrNo = 0
@@ -370,7 +370,7 @@ func handleBeaconPage(c *gin.Context) {
 			return
 		}
 		defer res.Body.Close()
-		data, err := ioutil.ReadAll(res.Body)
+		data, err := io.ReadAll(res.Body)
 		if err != nil {
 			logrus.Error("HandleBeaconPage.ReadAll: ", err)
 			return

pkg/core/eiblog/page/page.go

@@ -18,7 +18,7 @@ var htmlTmpl *template.Template
 func init() {
 	htmlTmpl = template.New("eiblog").Funcs(tools.TplFuncMap)
 	root := filepath.Join(config.WorkDir, "website")
-	files := tools.ReadDirFiles(root, func(fi fs.FileInfo) bool {
+	files := tools.ReadDirFiles(root, func(fi fs.DirEntry) bool {
 		name := fi.Name()
 		if name == ".DS_Store" {
 			return true

pkg/internal/disqus.go

@@ -5,7 +5,7 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"net/http"
 	"net/url"
 	"strings"
@@ -17,11 +17,13 @@ import (
 // disqus api
 const (
 	apiPostsCount    = "https://disqus.com/api/3.0/threads/set.json"
-	apiPostsList     = "https://disqus.com/api/3.0/threads/listPosts.json"
+	apiPostsList     = "https://disqus.com/api/3.0/threads/listPostsThreaded"
 	apiPostCreate    = "https://disqus.com/api/3.0/posts/create.json"
 	apiPostApprove   = "https://disqus.com/api/3.0/posts/approve.json"
 	apiThreadCreate  = "https://disqus.com/api/3.0/threads/create.json"
 	apiThreadDetails = "https://disqus.com/api/3.0/threads/details.json"
+
+	disqusAPIKey = "E8Uh5l5fHZ6gD8U3KycjAIAk46f68Zw7C6eW8WSjZvCLXebZ7p0r1yrYDrLilk2F"
 )
 
 func checkDisqusConfig() error {
@@ -69,7 +71,7 @@ func PostsCount(articles map[string]*model.Article) error {
 		}
 		defer resp.Body.Close()
 
-		b, err := ioutil.ReadAll(resp.Body)
+		b, err := io.ReadAll(resp.Body)
 		if err != nil {
 			return err
 		}
@@ -89,7 +91,9 @@ func PostsCount(articles map[string]*model.Article) error {
 
 			if article := articles[slug]; article != nil {
 				article.Count = v.Posts
-				article.Thread = v.ID
+				if article.Thread == "" && v.ID != "" {
+					article.Thread = v.ID
+				}
 			}
 		}
 	}
@@ -123,16 +127,17 @@ type postDetail struct {
 }
 
 // PostsList 评论列表
-func PostsList(slug, cursor string) (*PostsListResp, error) {
+func PostsList(article *model.Article, cursor string) (*PostsListResp, error) {
 	if err := checkDisqusConfig(); err != nil {
 		return nil, err
 	}
 
 	vals := url.Values{}
-	vals.Set("api_key", config.Conf.EiBlogApp.Disqus.PublicKey)
+	vals.Set("api_key", disqusAPIKey)
 	vals.Set("forum", config.Conf.EiBlogApp.Disqus.ShortName)
-	vals.Set("thread:ident", "post-"+slug)
+	vals.Set("thread:ident", "post-"+article.Slug)
 	vals.Set("cursor", cursor)
+	vals.Set("order", "popular")
 	vals.Set("limit", "50")
 
 	resp, err := httpGet(apiPostsList + "?" + vals.Encode())
@@ -141,7 +146,7 @@ func PostsList(slug, cursor string) (*PostsListResp, error) {
 	}
 	defer resp.Body.Close()
 
-	b, err := ioutil.ReadAll(resp.Body)
+	b, err := io.ReadAll(resp.Body)
 	if err != nil {
 		return nil, err
 	}
@@ -181,7 +186,7 @@ func PostCreate(pc *PostComment) (*PostCreateResp, error) {
 		return nil, err
 	}
 	vals := url.Values{}
-	vals.Set("api_key", "E8Uh5l5fHZ6gD8U3KycjAIAk46f68Zw7C6eW8WSjZvCLXebZ7p0r1yrYDrLilk2F")
+	vals.Set("api_key", disqusAPIKey)
 	vals.Set("message", pc.Message)
 	vals.Set("parent", pc.Parent)
 	vals.Set("thread", pc.Thread)
@@ -195,7 +200,7 @@ func PostCreate(pc *PostComment) (*PostCreateResp, error) {
 		return nil, err
 	}
 	defer resp.Body.Close()
-	b, err := ioutil.ReadAll(resp.Body)
+	b, err := io.ReadAll(resp.Body)
 	if err != nil {
 		return nil, err
 	}
@@ -237,7 +242,7 @@ func PostApprove(post string) error {
 	}
 	defer resp.Body.Close()
 
-	b, err := ioutil.ReadAll(resp.Body)
+	b, err := io.ReadAll(resp.Body)
 	if err != nil {
 		return err
 	}
@@ -279,7 +284,7 @@ func ThreadCreate(article *model.Article, btitle string) error {
 		return err
 	}
 
-	b, err := ioutil.ReadAll(resp.Body)
+	b, err := io.ReadAll(resp.Body)
 	if err != nil {
 		return err
 	}
@@ -322,7 +327,7 @@ func ThreadDetails(article *model.Article) error {
 		return err
 	}
 
-	b, err := ioutil.ReadAll(resp.Body)
+	b, err := io.ReadAll(resp.Body)
 	if err != nil {
 		return err
 	}

pkg/internal/es.go

@@ -6,7 +6,7 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"net/http"
 	"regexp"
 	"strings"
@@ -160,7 +160,7 @@ func createIndexAndMappings(index, typ string, mappings []byte) error {
 		return err
 	}
 	defer resp.Body.Close()
-	data, err := ioutil.ReadAll(resp.Body)
+	data, err := io.ReadAll(resp.Body)
 	if err != nil {
 		return err
 	}
@@ -183,7 +183,7 @@ func indexOrUpdateDocument(index, typ string, id int, doc []byte) (err error) {
 		return err
 	}
 	defer resp.Body.Close()
-	data, err := ioutil.ReadAll(resp.Body)
+	data, err := io.ReadAll(resp.Body)
 	if err != nil {
 		return err
 	}
@@ -220,7 +220,7 @@ func deleteIndexDocument(index, typ string, ids []string) error {
 		return err
 	}
 	defer resp.Body.Close()
-	data, err := ioutil.ReadAll(resp.Body)
+	data, err := io.ReadAll(resp.Body)
 	if err != nil {
 		return err
 	}
@@ -272,7 +272,7 @@ func indexQueryDSL(index, typ string, size, from int, dsl []byte) (*SearchIndexR
 		return nil, err
 	}
 	defer resp.Body.Close()
-	data, err := ioutil.ReadAll(resp.Body)
+	data, err := io.ReadAll(resp.Body)
 	if err != nil {
 		return nil, err
 	}

pkg/internal/pinger.go

@@ -5,7 +5,7 @@ import (
 	"bytes"
 	"encoding/xml"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"net/http"
 	"net/url"
 
@@ -30,7 +30,7 @@ var feedrPingFunc = func(btitle, slug string) error {
 		return err
 	}
 	defer resp.Body.Close()
-	data, err := ioutil.ReadAll(resp.Body)
+	data, err := io.ReadAll(resp.Body)
 	if err != nil {
 		return err
 	}
@@ -43,10 +43,11 @@ var feedrPingFunc = func(btitle, slug string) error {
 
 // rpcPingParam ping to rpc, eg. google baidu
 // params:
-//	 BlogName string `xml:"param>value>string"`
-//	 HomePage string `xml:"param>value>string"`
-//	 Article  string `xml:"param>value>string"`
-//	 RSS_URL  string `xml:"param>value>string"`
+//
+//	BlogName string `xml:"param>value>string"`
+//	HomePage string `xml:"param>value>string"`
+//	Article  string `xml:"param>value>string"`
+//	RSS_URL  string `xml:"param>value>string"`
 type rpcPingParam struct {
 	XMLName    xml.Name `xml:"methodCall"`
 	MethodName string   `xml:"methodName"`
@@ -87,13 +88,13 @@ var rpcPingFunc = func(btitle, slug string) error {
 			continue
 		}
 		defer resp.Body.Close()
-		data, err := ioutil.ReadAll(resp.Body)
+		data, err := io.ReadAll(resp.Body)
 		if err != nil {
 			logrus.Error("rpcPingFunc.ReadAll: ", err)
 			continue
 		}
 		if resp.StatusCode != 200 {
-			logrus.Error("rpcPingFunc.failed: ", string(data))
+			logrus.Error("rpcPingFunc.failed: ", string(data), resp.StatusCode)
 		}
 	}
 	return nil

tools/tmplfunc.go

@@ -4,7 +4,7 @@ package tools
 import (
 	"encoding/base64"
 	htmpl "html/template"
-	"io/ioutil"
+	"io"
 	"log"
 	"net/http"
 	"strings"
@@ -62,7 +62,7 @@ func GetAvatar(domain string) string {
 		}
 		defer resp.Body.Close()
 
-		data, err := ioutil.ReadAll(resp.Body)
+		data, err := io.ReadAll(resp.Body)
 		if err != nil {
 			log.Println(err)
 			return ""

tools/tools.go

@@ -6,7 +6,7 @@ import (
 	"fmt"
 	"io"
 	"io/fs"
-	"io/ioutil"
+	"os"
 	"path"
 	"regexp"
 	"time"
@@ -23,8 +23,8 @@ func EncryptPasswd(name, pass string) string {
 }
 
 // ReadDirFiles 读取目录
-func ReadDirFiles(dir string, filter func(fi fs.FileInfo) bool) (files []string) {
-	fileInfos, err := ioutil.ReadDir(dir)
+func ReadDirFiles(dir string, filter func(fi fs.DirEntry) bool) (files []string) {
+	fileInfos, err := os.ReadDir(dir)
 	if err != nil {
 		return
 	}