diff --git a/config/setup.go b/config/setup.go index 37d83cf..f1478a9 100644 --- a/config/setup.go +++ b/config/setup.go @@ -35,7 +35,7 @@ func Configure() error { Success: "{{ . | bold | faint }}: ", } selTmpls := &promptui.SelectTemplates{ - Selected: fmt.Sprintf(`{{.Label}} {{ . | faint }}`, promptui.IconGood), + Selected: fmt.Sprintf(`{{.Label}} {{ . | faint }}`), } prompt := promptui.Prompt{ diff --git a/nodeinfo.go b/nodeinfo.go index fc36c34..a0e7a63 100644 --- a/nodeinfo.go +++ b/nodeinfo.go @@ -1,7 +1,6 @@ package writefreely import ( - "fmt" "github.com/writeas/go-nodeinfo" "github.com/writeas/web-core/log" "github.com/writeas/writefreely/config" @@ -59,21 +58,21 @@ func (r nodeInfoResolver) Usage() (nodeinfo.Usage, error) { if r.cfg.App.PublicStats { // Display bi-yearly / monthly stats - err = r.db.QueryRow(fmt.Sprintf(`SELECT COUNT(*) FROM ( + err = r.db.QueryRow(`SELECT COUNT(*) FROM ( SELECT DISTINCT collection_id FROM posts INNER JOIN collections c ON collection_id = c.id WHERE collection_id IS NOT NULL - AND updated > DATE_SUB(NOW(), INTERVAL 6 MONTH)) co`, CollPublic)).Scan(&activeHalfYear) + AND updated > DATE_SUB(NOW(), INTERVAL 6 MONTH)) co`).Scan(&activeHalfYear) - err = r.db.QueryRow(fmt.Sprintf(`SELECT COUNT(*) FROM ( + err = r.db.QueryRow(`SELECT COUNT(*) FROM ( SELECT DISTINCT collection_id FROM posts INNER JOIN FROM collections c ON collection_id = c.id WHERE collection_id IS NOT NULL - AND updated > DATE_SUB(NOW(), INTERVAL 1 MONTH)) co`, CollPublic)).Scan(&activeMonth) + AND updated > DATE_SUB(NOW(), INTERVAL 1 MONTH)) co`).Scan(&activeMonth) } return nodeinfo.Usage{