移除标签展示功能

Author: movsb

service/main.go

@@ -18,7 +18,6 @@ import (
 	"github.com/movsb/taoblog/modules/utils"
 	"github.com/movsb/taoblog/modules/version"
 	"github.com/movsb/taoblog/protocols/go/proto"
-	"github.com/movsb/taoblog/service/models"
 	"github.com/movsb/taoblog/service/modules/cache"
 	commentgeo "github.com/movsb/taoblog/service/modules/comment_geo"
 	"github.com/movsb/taoblog/service/modules/comment_notify"
@@ -40,7 +39,6 @@ type ToBeImplementedByRpc interface {
 	GetLink(ID int64) string
 	GetPlainLink(ID int64) string
 	Config() *config.Config
-	ListTagsWithCount() []*models.TagWithCount
 	IncrementPostPageView(id int64)
 	ThemeChangedAt() time.Time
 	GetCommentEmailById(id int) string

service/models/tag.go

@@ -23,10 +23,3 @@ type ObjectTag struct {
 func (ObjectTag) TableName() string {
 	return `post_tags`
 }
-
-// TagWithCount is a tag with associated post count.
-type TagWithCount struct {
-	// taorm yet doesn't support embedded field scanning.
-	Name  string
-	Count int64
-}

service/tag.go

@@ -24,17 +24,6 @@ func (s *Service) GetTagByName(name string) *models.Tag {
 	return &tag
 }
 
-func (s *Service) ListTagsWithCount() []*models.TagWithCount {
-	var tags []*models.TagWithCount
-	s.tdb.Raw(`
-		SELECT tags.name AS name, count(tags.id) AS count
-		FROM tags INNER JOIN post_tags ON tags.id = post_tags.tag_id
-		GROUP BY tags.id
-		ORDER BY count desc
-	`).MustFind(&tags)
-	return tags
-}
-
 func (s *Service) getObjectTagIDs(postID int64, alias bool) (ids []int64) {
 	sql := `SELECT tag_id FROM post_tags WHERE post_id=?`
 	rows, err := s.tdb.Query(sql, postID)

theme/blog/templates/tags.html

@@ -43,9 +43,6 @@ type Data struct {
 	// If it is the Posts.
 	Posts *PostsData
 
-	// If it is the Tags.
-	Tags *TagsData
-
 	// If it is the tag.
 	Tag *TagData
 

theme/data/data.go

@@ -98,7 +98,6 @@ func New(devMode bool, cfg *config.Config, service proto.TaoBlogServer, impl ser
 	m.HandleFunc(`GET /search`, t.querySearch)
 	m.Handle(`GET /posts`, t.LastPostTime304HandlerFunc(t.queryPosts))
 	m.Handle(`GET /tweets`, t.LastPostTime304HandlerFunc(t.queryTweets))
-	m.Handle(`GET /tags`, t.LastPostTime304HandlerFunc(t.queryTags))
 
 	t.loadTemplates()
 
@@ -302,11 +301,6 @@ func (t *Theme) queryTweets(w http.ResponseWriter, r *http.Request) {
 	t.executeTemplate(`tweets.html`, w, d)
 }
 
-func (t *Theme) queryTags(w http.ResponseWriter, r *http.Request) {
-	d := data.NewDataForTags(r.Context(), t.cfg, t.service, t.impl)
-	t.executeTemplate(`tags.html`, w, d)
-}
-
 func (t *Theme) QueryByID(w http.ResponseWriter, r *http.Request, id int64) {
 	p, err := t.service.GetPost(r.Context(),
 		&proto.GetPostRequest{

theme/data/tags.go

@@ -14,6 +14,4 @@ var nonCategoryNames = map[string]bool{
 	"/admin/":   true,
 	"/scripts/": true,
 	"/images/":  true,
-	"/tags/":    true,
-	"/plugins/": true,
 }