浏览页面，活跃度增加1

zhima1234 · zhima1234 · commit 04845e985686 · 2017-06-13T12:01:52.000+08:00
diff --git a/src/http/middleware/login.go b/src/http/middleware/login.go
@@ -35,6 +35,10 @@ func AutoLogin() echo.MiddlewareFunc {
 					user := logic.DefaultUser.FindCurrentUser(ctx, usernameOrId)
 					if user.Uid != 0 {
 						ctx.Set("user", user)
+
+						if !util.IsAjax(ctx) {
+							logic.ViewObservable.NotifyObservers(user.Uid, 0, 0)
+						}
 					}
 				}
 			}
diff --git a/src/logic/observer.go b/src/logic/observer.go
@@ -16,7 +16,7 @@ var (
 	publishObservable Observable
 	modifyObservable  Observable
 	commentObservable Observable
-	viewObservable    Observable
+	ViewObservable    Observable
 )
 
 func init() {
@@ -35,9 +35,9 @@ func init() {
 	commentObservable.AddObserver(&TodayActiveObserver{})
 	commentObservable.AddObserver(&UserRichObserver{})
 
-	viewObservable = NewConcreteObservable(actionView)
-	viewObservable.AddObserver(&UserWeightObserver{})
-	viewObservable.AddObserver(&TodayActiveObserver{})
+	ViewObservable = NewConcreteObservable(actionView)
+	ViewObservable.AddObserver(&UserWeightObserver{})
+	ViewObservable.AddObserver(&TodayActiveObserver{})
 }
 
 type Observer interface {
diff --git a/src/logic/view.go b/src/logic/view.go
@@ -117,7 +117,7 @@ func (this *views) Incr(req *http.Request, objtype, objid int, uids ...int) {
 	this.data[key].incr()
 
 	if len(uids) > 0 {
-		viewObservable.NotifyObservers(uids[0], objtype, objid)
+		ViewObservable.NotifyObservers(uids[0], objtype, objid)
 	}
 }
 
diff --git a/static/js/sidebar.js b/static/js/sidebar.js
@@ -227,7 +227,7 @@ $(function(){
 
 			var content = '<li>会员数: <span>'+data.user+'</span> 人</li>';
 			if (data.topic > 0) {
-				'<li>主题数: <span>'+data.topic+'</span> 个</li>';
+				content += '<li>主题数: <span>'+data.topic+'</span> 个</li>';
 			}
 			if (data.article > 0) {
 				content += '<li>文章数: <span>'+data.article+'</span> 篇</li>';

Original file line number	Diff line number	Diff line change
`@@ -35,6 +35,10 @@ func AutoLogin() echo.MiddlewareFunc {`
`35`	`35`	`user := logic.DefaultUser.FindCurrentUser(ctx, usernameOrId)`
`36`	`36`	`if user.Uid != 0 {`
`37`	`37`	`ctx.Set("user", user)`
	`38`	`+`
	`39`	`+ if !util.IsAjax(ctx) {`
	`40`	`+ logic.ViewObservable.NotifyObservers(user.Uid, 0, 0)`
	`41`	`+ }`
`38`	`42`	`}`
`39`	`43`	`}`
`40`	`44`	`}`
Original file line number	Diff line number	Diff line change
`@@ -117,7 +117,7 @@ func (this views) Incr(req http.Request, objtype, objid int, uids ...int) {`
`117`	`117`	`this.data[key].incr()`
`118`	`118`
`119`	`119`	`if len(uids) > 0 {`
`120`		`- viewObservable.NotifyObservers(uids[0], objtype, objid)`
	`120`	`+ ViewObservable.NotifyObservers(uids[0], objtype, objid)`
`121`	`121`	`}`
`122`	`122`	`}`
`123`	`123`
Original file line number	Diff line number	Diff line change
`@@ -227,7 +227,7 @@ $(function(){`
`227`	`227`
`228`	`228`	`var content = '<li>会员数: <span>'+data.user+'</span> 人</li>';`
`229`	`229`	`if (data.topic > 0) {`
`230`		`- '<li>主题数: <span>'+data.topic+'</span> 个</li>';`
	`230`	`+ content += '<li>主题数: <span>'+data.topic+'</span> 个</li>';`
`231`	`231`	`}`
`232`	`232`	`if (data.article > 0) {`
`233`	`233`	`content += '<li>文章数: <span>'+data.article+'</span> 篇</li>';`