chore(release): 2.2.11

CHANGELOG.md

@@ -2,6 +2,15 @@
 
 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.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)
 
 

conf/app.yml

@@ -31,7 +31,7 @@ eiblogapp:
     url: https://www.google-analytics.com/g/collect
     tid: G-xxxxxxxxxx
     v: "2"
-    adsense: <script data-ad-client="ca-pub-5384494508691406" async src=""></script>
+    adsense: <script async src="https://pagead2.googlesyndication.com/xxx" crossorigin="anonymous"></script>
   qiniu: # 七牛OSS
     bucket: eiblog
     domain: st.deepzz.com

eiblog.conf

@@ -78,9 +78,6 @@ server {
     proxy_set_header             X-Forwarded-For   $proxy_add_x_forwarded_for;
     location ^~ /admin/ {
         add_header               Strict-Transport-Security "max-age=31536000; includeSubDomains; preload";
-        # https://imququ.com/post/web-security-and-response-header.html#toc-1
-        # 期望CT: https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Expect-CT
-        add_header               Expect-CT "max-age=180";
         add_header               Cache-Control no-cache;
         add_header               X-Frame-Options SAMEORIGIN;
         add_header               X-Content-Type-Options nosniff;
@@ -93,9 +90,6 @@ server {
 
     location / {
         add_header               Strict-Transport-Security "max-age=31536000; includeSubDomains; preload";
-        # https://imququ.com/post/web-security-and-response-header.html#toc-1
-        # 期望CT: https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Expect-CT
-        add_header               Expect-CT "max-age=180";
         add_header               Cache-Control no-cache;
         # 内容安全策略: https://developer.mozilla.org/en-US/docs/Web/HTTP/CSP
         add_header               Content-Security-Policy "default-src 'none'; script-src 'unsafe-inline' 'unsafe-eval' blob: https:; img-src data: https:; media-src https:; style-src 'unsafe-inline' https:; child-src https:; connect-src 'self'; frame-src https://disqus.com";

go.mod

@@ -4,20 +4,21 @@ go 1.15
 
 require (
 	github.com/eiblog/blackfriday v0.0.0-20161010144836-c0ec111761ae
-	github.com/gin-contrib/sessions v0.0.3
+	github.com/gin-contrib/sessions v0.0.5
 	github.com/gin-gonic/gin v1.9.1
-	github.com/lib/pq v1.10.1
+	github.com/lib/pq v1.10.9
 	github.com/qiniu/go-sdk/v7 v7.11.0
 	github.com/satori/go.uuid v1.2.0
-	github.com/sirupsen/logrus v1.4.2
+	github.com/sirupsen/logrus v1.9.3
+	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.5.1
+	go.mongodb.org/mongo-driver v1.11.4
 	gopkg.in/yaml.v3 v3.0.1
-	gorm.io/driver/clickhouse v0.1.0
-	gorm.io/driver/mysql v1.0.6
-	gorm.io/driver/postgres v1.0.8
-	gorm.io/driver/sqlite v1.1.4
-	gorm.io/driver/sqlserver v1.0.7
-	gorm.io/gorm v1.21.9
+	gorm.io/driver/clickhouse v0.6.0
+	gorm.io/driver/mysql v1.5.2
+	gorm.io/driver/postgres v1.5.4
+	gorm.io/driver/sqlite v1.5.4
+	gorm.io/driver/sqlserver v1.5.2
+	gorm.io/gorm v1.25.5
 )

pkg/core/backup/swag/swag.go

@@ -5,8 +5,8 @@ import (
 	_ "github.com/eiblog/eiblog/pkg/core/backup/docs" // docs
 
 	"github.com/gin-gonic/gin"
+	swaggerFiles "github.com/swaggo/files"
 	ginSwagger "github.com/swaggo/gin-swagger"
-	"github.com/swaggo/gin-swagger/swaggerFiles"
 )
 
 // RegisterRoutes register routes

pkg/core/eiblog/page/fe.go

@@ -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

pkg/core/eiblog/swag/swag.go

@@ -5,8 +5,8 @@ import (
 	_ "github.com/eiblog/eiblog/pkg/core/eiblog/docs" // docs
 
 	"github.com/gin-gonic/gin"
+	swaggerFiles "github.com/swaggo/files"
 	ginSwagger "github.com/swaggo/gin-swagger"
-	"github.com/swaggo/gin-swagger/swaggerFiles"
 )
 
 // RegisterRoutes register routes

pkg/internal/disqus.go

@@ -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 {
@@ -123,16 +125,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", article.Thread)
 	vals.Set("cursor", cursor)
+	vals.Set("order", "popular")
 	vals.Set("limit", "50")
 
 	resp, err := httpGet(apiPostsList + "?" + vals.Encode())
@@ -181,7 +184,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)