Merge remote-tracking branch 'origin/master'

Vanessa219 · Vanessa219 · commit ad2a4cba9e65 · 2020-01-15T16:50:34.000+08:00
# Conflicts:
#	pipe.json
#	theme/x/9IPHP/css/common.css
#	theme/x/Fara/css/common.css
#	theme/x/Gina/css/common.css
#	theme/x/Koma/css/common.css
#	theme/x/Littlewin/css/common.css
#	theme/x/Medium/css/common.css
#	theme/x/Next/css/common.css
diff --git a/controller/oauthctl.go b/controller/oauthctl.go
@@ -65,7 +65,7 @@ func loginCallbackAction(c *gin.Context) {
 			user = &model.User{
 				Name:      userName,
 				AvatarURL: avatar,
-				B3Key:     githubId,
+				B3Key:     userName,
 				GithubId:  githubId,
 			}
 
@@ -81,7 +81,7 @@ func loginCallbackAction(c *gin.Context) {
 				user = &model.User{
 					Name:      userName,
 					AvatarURL: avatar,
-					B3Key:     githubId,
+					B3Key:     userName,
 					GithubId:  githubId,
 				}
 
@@ -93,11 +93,24 @@ func loginCallbackAction(c *gin.Context) {
 				}
 			} else {
 				user.GithubId = githubId
-				user.B3Key = githubId
 				user.AvatarURL = avatar
-				service.User.UpdateUser(user)
+				if err := service.User.UpdateUser(user); nil != err {
+					logger.Errorf("update user failed: " + err.Error())
+					c.Status(http.StatusInternalServerError)
+
+					return
+				}
 			}
 		}
+	} else {
+		user.Name = userName
+		user.AvatarURL = avatar
+		if err := service.User.UpdateUser(user); nil != err {
+			logger.Errorf("update user failed: " + err.Error())
+			c.Status(http.StatusInternalServerError)
+
+			return
+		}
 	}
 
 	ownBlog := service.User.GetOwnBlog(user.ID)
diff --git a/go.mod b/go.mod
@@ -3,43 +3,43 @@ module github.com/88250/pipe
 go 1.12
 
 require (
-	cloud.google.com/go v0.37.1 // indirect
 	github.com/88250/gulu v0.0.0-20191221090949-7ec528e17061
-	github.com/88250/lute v0.0.0-20191230154728-ed9c8978a4e5
+	github.com/88250/lute v0.0.0-20200109164411-d82a2ba83be0
 	github.com/PuerkitoBio/goquery v1.5.0
-	github.com/araddon/dateparse v0.0.0-20190223010137-262228af701e
+	github.com/andybalholm/cascadia v1.1.0 // indirect
+	github.com/araddon/dateparse v0.0.0-20190622164848-0fb0a474d195
 	github.com/beevik/etree v1.1.0 // indirect
-	github.com/bluele/gcache v0.0.0-20190301044115-79ae3b2d8680
+	github.com/bluele/gcache v0.0.0-20190518031135-bc40bd653833
 	github.com/clbanning/mxj v1.8.4 // indirect
-	github.com/denisenkom/go-mssqldb v0.0.0-20190315220205-a8ed825ac853 // indirect
+	github.com/denisenkom/go-mssqldb v0.0.0-20191128021309-1d7a30a10f73 // indirect
 	github.com/dustin/go-humanize v1.0.0
-	github.com/elazarl/goproxy v0.0.0-20181111060418-2ce16c963a8a // indirect
-	github.com/erikstmartin/go-testdb v0.0.0-20160219214506-8d10e4a1bae5 // indirect
+	github.com/elazarl/goproxy v0.0.0-20191011121108-aa519ddbe484 // indirect
+	github.com/elazarl/goproxy/ext v0.0.0-20191011121108-aa519ddbe484 // indirect
 	github.com/fatih/structs v1.1.0
-	github.com/gin-contrib/sessions v0.0.0-20190226023029-1532893d996f
-	github.com/gin-gonic/gin v1.3.0
-	github.com/go-sql-driver/mysql v1.4.1 // indirect
-	github.com/gofrs/uuid v3.2.0+incompatible // indirect
-	github.com/gorilla/feeds v1.1.0
+	github.com/gin-contrib/sessions v0.0.3
+	github.com/gin-gonic/gin v1.5.0
+	github.com/go-playground/universal-translator v0.17.0 // indirect
+	github.com/go-sql-driver/mysql v1.5.0 // indirect
+	github.com/gorilla/feeds v1.1.1
+	github.com/gorilla/sessions v1.2.0 // indirect
 	github.com/ikeikeikeike/go-sitemap-generator v2.0.1+incompatible
-	github.com/jinzhu/gorm v1.9.2
-	github.com/jinzhu/inflection v0.0.0-20180308033659-04140366298a // indirect
-	github.com/jinzhu/now v1.0.0 // indirect
-	github.com/lib/pq v1.0.0 // indirect
-	github.com/mattn/go-isatty v0.0.11 // indirect
-	github.com/mattn/go-sqlite3 v1.10.0 // indirect
+	github.com/jinzhu/gorm v1.9.12
+	github.com/jinzhu/now v1.1.1 // indirect
+	github.com/json-iterator/go v1.1.9 // indirect
+	github.com/leodido/go-urn v1.2.0 // indirect
+	github.com/lib/pq v1.3.0 // indirect
+	github.com/mattn/go-sqlite3 v2.0.2+incompatible // indirect
 	github.com/microcosm-cc/bluemonday v1.0.2
-	github.com/moul/http2curl v1.0.0 // indirect
-	github.com/mssola/user_agent v0.5.0
-	github.com/parnurzeal/gorequest v0.2.15
-	github.com/sergi/go-diff v1.1.0 // indirect
-	github.com/simplereach/timeutils v1.2.0 // indirect
-	github.com/smartystreets/goconvey v0.0.0-20190306220146-200a235640ff // indirect
+	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
+	github.com/modern-go/reflect2 v1.0.1 // indirect
+	github.com/mssola/user_agent v0.5.1
+	github.com/parnurzeal/gorequest v0.2.16
+	github.com/smartystreets/assertions v1.0.1 // indirect
+	github.com/smartystreets/goconvey v1.6.4 // indirect
 	github.com/vinta/pangu v3.0.0+incompatible
-	golang.org/x/crypto v0.0.0-20191227163750-53104e6ec876 // indirect
+	golang.org/x/crypto v0.0.0-20200109152110-61a87790db17 // indirect
 	golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553 // indirect
-	golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e // indirect
-	golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8 // indirect
-	gopkg.in/mgo.v2 v2.0.0-20180705113604-9856a29383ce // indirect
+	gopkg.in/go-playground/validator.v9 v9.31.0 // indirect
 	gopkg.in/yaml.v2 v2.2.7
+	moul.io/http2curl v1.0.0 // indirect
 )
diff --git a/theme/js/common.js b/theme/js/common.js
@@ -8,6 +8,7 @@
 import $ from 'jquery'
 import NProgress from 'nprogress'
 import pjax from './lib/pjax'
+import Uvstat from 'uvstat'
 
 export const ParseHljs = () => {
   Vditor.highlightRender({
diff --git a/theme/package-lock.json b/theme/package-lock.json
diff --git a/theme/package.json b/theme/package.json
@@ -43,6 +43,7 @@
     "jquery": "^3.4.1",
     "nprogress": "^0.2.0",
     "qrious": "^4.0.2",
-    "turndown": "^5.0.3"
+    "turndown": "^5.0.3",
+    "uvstat": "^1.0.4"
   }
 }
diff --git a/theme/sw.min.js b/theme/sw.min.js
diff --git a/theme/x/9IPHP/article.html b/theme/x/9IPHP/article.html
@@ -40,7 +40,7 @@ <h2 class="article__title">
                     &nbsp; | &nbsp;
                     <span class="ft__nowrap">
                         <svg><use xlink:href="#icon-view"></use></svg>
-                        {{.Article.ViewCount}} {{$.I18n.View}}
+                        <span data-uvstaturl="{{.Article.URL}}">{{.Article.ViewCount}}</span> {{$.I18n.View}}
                     </span>
                     {{if and .Commentable (gt .Article.CommentCount 0)}}
                     &nbsp; | &nbsp;
diff --git a/theme/x/9IPHP/define-article-list.html b/theme/x/9IPHP/define-article-list.html
@@ -45,7 +45,7 @@ <h2 class="article__title">
                 &nbsp; | &nbsp;
                 <span class="ft__nowrap">
                             <svg><use xlink:href="#icon-view"></use></svg>
-                            {{.ViewCount}} {{$.I18n.View}}
+                            <span data-uvstaturl="{{.URL}}">{{.ViewCount}}</span> {{$.I18n.View}}
                         </span>
                 {{if and $.Commentable (gt .CommentCount 0)}}
                 &nbsp; | &nbsp;
diff --git a/theme/x/9IPHP/define-footer.html b/theme/x/9IPHP/define-footer.html
@@ -9,7 +9,7 @@
                 </div>
             </div>
             <div class="fn__clear">
-                {{.Statistic.StatisticViewCount}}
+                <span data-uvstaturl="{{.BlogURL}}">{{.Statistic.StatisticViewCount}}</span>
                 {{.I18n.View}}
                 &nbsp;
                 {{.Statistic.StatisticArticleCount}}
diff --git a/theme/x/Fara/article.html b/theme/x/Fara/article.html
@@ -32,7 +32,7 @@ <h1 class="article__title">
                         {{.Article.Author.Name}}
                     </a>
                     {{end}}
-                    ,  {{.Article.ViewCount}} {{$.I18n.View}}
+                    ,  <span data-uvstaturl="{{.Article.URL}}">{{.Article.ViewCount}}</span> {{$.I18n.View}}
                     {{if and $.Commentable (gt .Article.CommentCount 0)}}
                     ,
                     <a href="{{.Article.URL}}#pipeComments">
diff --git a/theme/x/Fara/define-article-list.html b/theme/x/Fara/define-article-list.html
@@ -23,7 +23,7 @@
             </div>
             <div>
                 <a href="{{$item.URL}}">
-                    {{$item.ViewCount}} {{$.I18n.View}}
+                    <span data-uvstaturl="{{.URL}}">{{.ViewCount}}</span> {{$.I18n.View}}
                 </a>
             </div>
             {{if and $.Commentable (gt .CommentCount 0)}}
diff --git a/theme/x/Fara/define-footer.html b/theme/x/Fara/define-footer.html
@@ -15,7 +15,7 @@
             </div>
         </div>
         <div class="fn__clear">
-            {{.Statistic.StatisticViewCount}}
+            <span data-uvstaturl="{{.BlogURL}}">{{.Statistic.StatisticViewCount}}</span>
             {{.I18n.View}}
             &nbsp;
             {{.Statistic.StatisticArticleCount}}
diff --git a/theme/x/Gina/article.html b/theme/x/Gina/article.html
@@ -33,7 +33,7 @@ <h2 class="header__title{{if .Article.Editable}} header__title--edit{{end}}">
                     {{end}}
                     <time class="ft__nowrap">{{.Article.CreatedAt}}</time>
                     •
-                    <span class="ft__nowrap">{{.Article.ViewCount}} {{$.I18n.View}}</span>
+                    <span class="ft__nowrap"><span data-uvstaturl="{{.Article.URL}}">{{.Article.ViewCount}}</span> {{$.I18n.View}}</span>
                     {{if and .Commentable (gt .Article.CommentCount 0)}}
                     •
                     <a href="{{.Article.URL}}#pipeComments" class="ft__nowrap ft__gray">{{.Article.CommentCount}}
diff --git a/theme/x/Gina/define-article-list.html b/theme/x/Gina/define-article-list.html
@@ -39,7 +39,7 @@ <h2 class="article__title">
                             <span class="article__responsive-meta">
                                 <time class="ft__nowrap">{{.CreatedAt}}</time>
                                 •
-                                <span class="ft__nowrap">{{.ViewCount}} {{$.I18n.View}}</span>
+                                <span class="ft__nowrap"><span data-uvstaturl="{{.URL}}">{{.ViewCount}}</span> {{$.I18n.View}}</span>
                                 {{if and $.Commentable (gt .CommentCount 0)}}
                                 •
                                 <a href="{{.URL}}#pipeComments" class="fn-nowrap ft__gray">{{.CommentCount}} {{$.I18n.Comment}}</a>
diff --git a/theme/x/Gina/define-footer.html b/theme/x/Gina/define-footer.html
@@ -46,7 +46,7 @@
                 </div>
             </div>
             <div class="fn__clear">
-                <span class="ft__gray">{{.Statistic.StatisticViewCount}}</span>
+                <span class="ft__gray"><span data-uvstaturl="{{.BlogURL}}">{{.Statistic.StatisticViewCount}}</span></span>
                 {{.I18n.View}}
                 &nbsp;
                 <span class="ft__gray">{{.Statistic.StatisticArticleCount}}</span>
diff --git a/theme/x/Koma/article.html b/theme/x/Koma/article.html
@@ -67,7 +67,7 @@ <h2>
             <span class="fn__right">
                 <a href="{{.Article.URL}}" aria-label="{{$.I18n.View}}"
                    class="pipe-tooltipped pipe-tooltipped--n">
-                    {{.Article.ViewCount}}
+                    <span data-uvstaturl="{{.Article.URL}}">{{.Article.ViewCount}}</span>
                     <svg>
                         <use xlink:href="#icon-view"></use>
                     </svg>
diff --git a/theme/x/Koma/define-article-list.html b/theme/x/Koma/define-article-list.html
@@ -50,7 +50,7 @@ <h2>
         <span class="fn__right">
             <a href="{{.URL}}" aria-label="{{$.I18n.View}}"
                   class="pipe-tooltipped pipe-tooltipped--n">
-                {{.ViewCount}}
+                <span data-uvstaturl="{{.URL}}">{{.ViewCount}}</span>
                 <svg>
                     <use xlink:href="#icon-view"></use>
                 </svg>
diff --git a/theme/x/Koma/define-footer.html b/theme/x/Koma/define-footer.html
@@ -8,7 +8,7 @@
         </div>
     </div>
     <div class="fn__clear">
-        {{.Statistic.StatisticViewCount}}
+        <span data-uvstaturl="{{.BlogURL}}">{{.Statistic.StatisticViewCount}}</span>
         {{.I18n.View}}
         &nbsp;
         {{.Statistic.StatisticArticleCount}}
diff --git a/theme/x/Littlewin/article.html b/theme/x/Littlewin/article.html
@@ -66,7 +66,7 @@ <h2 class="post__title">
             <div class="module module--space module--bottom post__meta">
                 本文由 <a rel="nofollow" href="{{.Article.Author.URL}}">{{.Article.Author.Name}}</a> 于 {{.Article.CreatedAt}}
                 发布，当前已被围观 
-                <a href="{{.Article.URL}}">{{.Article.ViewCount}}</a> 次{{if gt .Article.CommentCount 0}}{{if $.Commentable}}，评论
+                <a href="{{.Article.URL}}"><span data-uvstaturl="{{.Article.URL}}">{{.Article.ViewCount}}</span></a> 次{{if gt .Article.CommentCount 0}}{{if $.Commentable}}，评论
                 <a href="{{.Article.URL}}#pipeComments">{{.Article.CommentCount}}</a> 次{{end}}{{end}}
                 <br>
 
diff --git a/theme/x/Littlewin/define-article-list.html b/theme/x/Littlewin/define-article-list.html
@@ -52,7 +52,7 @@ <h2 class="fn__flex-center">
             <svg>
                 <use xlink:href="#iconView"></use>
             </svg>
-            <a href="{{.URL}}#pipeComments">{{.ViewCount}}</a>
+            <a href="{{.URL}}#pipeComments"><span data-uvstaturl="{{.URL}}">{{.ViewCount}}</span></a>
             {{end}}
 
             {{if and $.Commentable (gt .CommentCount 0)}}
diff --git a/theme/x/Littlewin/define-footer.html b/theme/x/Littlewin/define-footer.html
@@ -9,7 +9,7 @@
             </div>
         </div>
         <div class="fn__clear">
-            <span class="ft__gray">{{.Statistic.StatisticViewCount}}</span>
+            <span class="ft__gray"><span data-uvstaturl="{{.BlogURL}}">{{.Statistic.StatisticViewCount}}</span></span>
             {{.I18n.View}}
             &nbsp;
             <span class="ft__gray">{{.Statistic.StatisticArticleCount}}</span>
diff --git a/theme/x/Medium/article.html b/theme/x/Medium/article.html
@@ -57,7 +57,7 @@ <h2 class="post__title">
             {{if eq $.UserCount 1}}
             <time class="ft__gray">{{.Article.CreatedAt}} • </time>
             {{end}}
-            <a href="{{.URL}}" class="post__view">{{.Article.ViewCount}} {{$.I18n.View}}</a>
+            <a href="{{.URL}}" class="post__view"><span data-uvstaturl="{{.Article.URL}}">{{.Article.ViewCount}}</span> {{$.I18n.View}}</a>
 
             <div class="fn__right">
                 {{if $.Commentable}}
@@ -128,7 +128,7 @@ <h2 class="post__title">
 
     <div class="article__toolbar">
         <div class="wrapper fn__clear">
-            <a href="{{.URL}}" class="post__view">{{.Article.ViewCount}} {{$.I18n.View}}</a>
+            <a href="{{.URL}}" class="post__view"><span data-uvstaturl="{{.URL}}">{{.Article.ViewCount}}</span> {{$.I18n.View}}</a>
             <div class="fn__right">
                 {{if $.Commentable}}
                 <span id="articleCommentBottomBtn" class="{{if gt .Article.CommentCount 0}}pipe-tooltipped pipe-tooltipped--n{{end}} article__edit ft-green"
@@ -218,7 +218,7 @@ <h2 class="article__title">
                                 <div class="fn__ellipsis">
                                     <time>{{$item.CreatedAt}}</time>
                                     •
-                                    <a href="{{$item.URL}}" class="ft__gray">{{$item.ViewCount}} {{$.I18n.View}}</a>{{if $.Commentable}} •
+                                    <a href="{{$item.URL}}" class="ft__gray"><span data-uvstaturl="{{$item.URL}}">{{$item.ViewCount}}</span> {{$.I18n.View}}</a>{{if $.Commentable}} •
                                     <a href="{{$item.URL}}#comments" class="ft__gray">
                                         {{if gt $item.CommentCount 0}}
                                         {{$item.CommentCount}}
diff --git a/theme/x/Medium/define-footer.html b/theme/x/Medium/define-footer.html
@@ -9,7 +9,7 @@
             </div>
         </div>
         <div class="fn__clear">
-            {{.Statistic.StatisticViewCount}}
+            <span data-uvstaturl="{{.BlogURL}}">{{.Statistic.StatisticViewCount}}</span>
             {{.I18n.View}}
             &nbsp;
             {{.Statistic.StatisticArticleCount}}
diff --git a/theme/x/Next/article.html b/theme/x/Next/article.html
diff --git a/theme/x/Next/define-article-list.html b/theme/x/Next/define-article-list.html
diff --git a/theme/x/Next/define-footer.html b/theme/x/Next/define-footer.html

Original file line number	Diff line number	Diff line change
`@@ -43,6 +43,7 @@`
`43`	`43`	`"jquery": "^3.4.1",`
`44`	`44`	`"nprogress": "^0.2.0",`
`45`	`45`	`"qrious": "^4.0.2",`
`46`		`- "turndown": "^5.0.3"`
	`46`	`+ "turndown": "^5.0.3",`
	`47`	`+ "uvstat": "^1.0.4"`
`47`	`48`	`}`
`48`	`49`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ <h1 class="article__title">`
`32`	`32`	`{{.Article.Author.Name}}`
`33`	`33`	`</a>`
`34`	`34`	`{{end}}`
`35`		`- , {{.Article.ViewCount}} {{$.I18n.View}}`
	`35`	`+ , <span data-uvstaturl="{{.Article.URL}}">{{.Article.ViewCount}}</span> {{$.I18n.View}}`
`36`	`36`	`{{if and $.Commentable (gt .Article.CommentCount 0)}}`
`37`	`37`	`,`
`38`	`38`	`<a href="{{.Article.URL}}#pipeComments">`