diff --git a/gserver/apiv3/apiv3.go b/gserver/apiv3/apiv3.go index 5ff9930..9d5c331 100644 --- a/gserver/apiv3/apiv3.go +++ b/gserver/apiv3/apiv3.go @@ -182,7 +182,7 @@ func GetSearch(c *gin.Context) { lps := 0 lts := 0 eps := 0 - database.Db.Model(database.LetsPlay{}).Where("to_tsvector('german', name) @@ to_tsquery('german', ?)", term).Count(&lps) + database.Db.Model(database.LetsPlay{}).Where("to_tsvector('german', name) @@ to_tsquery('german', ?) AND aired IS NOT NULL AND merge_id IS NULL", term).Count(&lps) database.Db.Model(database.LetsTest{}).Where("to_tsvector('german', name) @@ to_tsquery('german', ?)", term).Count(<s) database.Db.Model(database.Episode{}).Where("to_tsvector('german', name) @@ to_tsquery('german', ?)", term).Count(&eps) response := gin.H{"lets-plays": lps, "tests": lts, "episodes": eps} @@ -193,7 +193,7 @@ func GetSearch(c *gin.Context) { } else if kind == "lets-plays" { var lps []database.LetsPlay var ALPs []LetsPlay - database.Db.Where("to_tsvector('german', name) @@ to_tsquery('german', ?)", term).Find(&lps) + database.Db.Where("to_tsvector('german', name) @@ to_tsquery('german', ?) AND aired IS NOT NULL AND merge_id IS NULL", term).Find(&lps) copier.Copy(&ALPs, &lps) if HandleEtag(c, fmt.Sprintf("%#v", ALPs)) { return diff --git a/gserver/apiv3/models.go b/gserver/apiv3/models.go index 94af25b..4134cf7 100644 --- a/gserver/apiv3/models.go +++ b/gserver/apiv3/models.go @@ -181,11 +181,15 @@ func (ep *Episode) Slug(s sql.NullString) { } func (ep *Episode) Name(s sql.NullString) { - ep.AName = s.String + ep.AName = "Folge 0: " + s.String } func (ep *Episode) Episode(i sql.NullInt64) { - ep.AEpisode = i.Int64 + ep.AEpisode = ep.AEpisode + i.Int64 +} + +func (ep *Episode) Season(i sql.NullInt64) { + ep.AEpisode = ep.AEpisode + 10000 * i.Int64 } func (ep *Episode) ThumbS(s sql.NullString) {