From f12114c2966b7a93ca486b290566cd6b0246f980 Mon Sep 17 00:00:00 2001 From: Las Zenow Date: Sat, 30 Jul 2016 07:46:35 -0400 Subject: [PATCH] Deprecate bad quality flag --- lib/database/books.go | 2 -- lib/trantor.go | 30 +++--------------------------- templates/book.html | 5 ----- 3 files changed, 3 insertions(+), 34 deletions(-) diff --git a/lib/database/books.go b/lib/database/books.go index 3a5e328..95d64d3 100644 --- a/lib/database/books.go +++ b/lib/database/books.go @@ -21,8 +21,6 @@ type Book struct { Active bool UploadDate time.Time Tsv string - //BadQuality int `bad_quality` - BadQualityReporters []string `sql:"-"` // TODO: deprecate?? } // TODO: missing history diff --git a/lib/trantor.go b/lib/trantor.go index b678602..37355d1 100644 --- a/lib/trantor.go +++ b/lib/trantor.go @@ -50,10 +50,9 @@ func logoutHandler(h handler) { } type bookData struct { - S Status - Book database.Book - Description []string - FlaggedBadQuality bool + S Status + Book database.Book + Description []string } func bookHandler(h handler) { @@ -74,13 +73,6 @@ func bookHandler(h handler) { data.S.Title = book.Title + author + " -- " + data.S.Title data.Description = strings.Split(data.Book.Description, "\n") - data.FlaggedBadQuality = false - for _, reporter := range book.BadQualityReporters { - if reporter == h.sess.User || reporter == h.sess.Id() { - data.FlaggedBadQuality = true - break - } - } h.template.load(h, "book", data) } @@ -113,21 +105,6 @@ func downloadHandler(h handler) { io.Copy(h.w, f) } -func flagHandler(h handler) { - id := mux.Vars(h.r)["id"] - user := h.sess.Id() - if h.sess.User != "" { - user = h.sess.User - } - err := h.db.FlagBadQuality(id, user) - if err != nil { - log.Warn("An error ocurred while flaging ", id, ": ", err) - } - h.sess.Notify("Flagged!", "Book marked as bad quality, thank you", "success") - h.sess.Save(h.w, h.r) - http.Redirect(h.w, h.r, h.r.Referer(), http.StatusFound) -} - type indexData struct { S Status Books []database.Book @@ -202,7 +179,6 @@ func InitRouter(db database.DB, sg *StatsGatherer, assetsPath string) { r.HandleFunc("/download/{id:"+idPattern+"}/{epub:.*}", sg.Gather(downloadHandler)) r.HandleFunc("/cover/{id:"+idPattern+"}/{size}/{img:.*}", sg.Gather(coverHandler)) r.HandleFunc("/stats/", sg.Gather(statsHandler)) - r.HandleFunc("/flag/bad_quality/{id:"+idPattern+"}", sg.Gather(flagHandler)) r.HandleFunc("/login/", sg.Gather(loginHandler)).Methods("GET") r.HandleFunc("/login/", sg.Gather(loginPostHandler)).Methods("POST") diff --git a/templates/book.html b/templates/book.html index b0d28c2..c00e4b2 100644 --- a/templates/book.html +++ b/templates/book.html @@ -1,7 +1,6 @@ {{template "header.html" .S}} {{$role := .S.Role}} -{{$flaggedBadQuality := .FlaggedBadQuality}} {{with .Book}}