Mirrors/writefreely
2
0
Fork 0
mirror of https://github.com/writefreely/writefreely synced 2024-11-28 19:40:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #479 from writefreely/fix-stats-no-host-log

Browse source 
Fix "Collection.hostName is empty!" log on Stats page
This commit is contained in:
Matt Baer 2021-06-29 12:46:47 -04:00 committed by GitHub
commit 6291f4f155
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
account.go
View file

@ -1021,9 +1021,10 @@ func viewStats(app *App, u *User, w http.ResponseWriter, r *http.Request) error
if c.OwnerID != u.ID { if c.OwnerID != u.ID {
return ErrCollectionNotFound return ErrCollectionNotFound
} }
c.hostName = app.cfg.App.Host
} }
topPosts, err := app.db.GetTopPosts(u, alias) topPosts, err := app.db.GetTopPosts(u, alias, c.hostName)
if err != nil { if err != nil {
log.Error("Unable to get top posts: %v", err) log.Error("Unable to get top posts: %v", err)
return err return err

5
database.go
View file

@ -76,7 +76,7 @@ type writestore interface {
GetMeStats(u *User) userMeStats GetMeStats(u *User) userMeStats
GetTotalCollections() (int64, error) GetTotalCollections() (int64, error)
GetTotalPosts() (int64, error) GetTotalPosts() (int64, error)
GetTopPosts(u *User, alias string) (*[]PublicPost, error) GetTopPosts(u *User, alias string, hostName string) (*[]PublicPost, error)
GetAnonymousPosts(u *User, page int) (*[]PublicPost, error) GetAnonymousPosts(u *User, page int) (*[]PublicPost, error)
GetUserPosts(u *User) (*[]PublicPost, error) GetUserPosts(u *User) (*[]PublicPost, error)
@ -1767,7 +1767,7 @@ func (db *datastore) GetTotalPosts() (postCount int64, err error) {
return return
} }
func (db *datastore) GetTopPosts(u *User, alias string) (*[]PublicPost, error) { func (db *datastore) GetTopPosts(u *User, alias string, hostName string) (*[]PublicPost, error) {
params := []interface{}{u.ID} params := []interface{}{u.ID}
where := "" where := ""
if alias != "" { if alias != "" {
@ -1802,6 +1802,7 @@ func (db *datastore) GetTopPosts(u *User, alias string) (*[]PublicPost, error) {
c.Title = title.String c.Title = title.String
c.Description = description.String c.Description = description.String
c.Views = views.Int64 c.Views = views.Int64
c.hostName = hostName
pubPost.Collection = &CollectionObj{Collection: c} pubPost.Collection = &CollectionObj{Collection: c}
} }