3 files changed, 134 insertions, 6 deletions

diff --git a/modules/grils/gril.go b/modules/grils/gril.go
index fe316cd..89dd7c4 100644
--- a/modules/grils/gril.go
+++ b/modules/grils/gril.go
@@ -3,9 +3,12 @@ package grils
 import (
         "database/sql"
         "fmt"
-        "github.com/lib/pq"
         "os"
+        "strconv"
+        "strings"
         "time"
+
+        "github.com/lib/pq"
 )
 
 type DataSource int
@@ -28,6 +31,16 @@ type Gril struct {
         Lists      []int
 }
 
+func (g *Gril) Slug() string {
+        if g.RomajiName == "" {
+                return strconv.Itoa(g.ID)
+        }
+        return fmt.Sprintf(
+                "%d/%s",
+                g.ID,
+                strings.Replace(g.RomajiName, " ", "", -1))
+}
+
 func (g *Gril) ImagePath(prioritizeThumbnail bool) string {
         var big string
         exts := []string{"png", "jpg", "gif", "jpeg"}
diff --git a/modules/grils/grils.go b/modules/grils/grils.go
index a1c84c7..0df93a0 100644
--- a/modules/grils/grils.go
+++ b/modules/grils/grils.go
@@ -1,16 +1,18 @@
 package grils
 
 import (
-        "fagott.pw/charakterin"
-        "fagott.pw/grilist/frontend"
-        "fagott.pw/grilist/grilist"
         "fmt"
-        "github.com/julienschmidt/httprouter"
         "log"
         "net/http"
         "regexp"
         "strconv"
         "strings"
+
+        "fagott.pw/charakterin"
+        "fagott.pw/grilist/frontend"
+        "fagott.pw/grilist/grilist"
+
+        "github.com/julienschmidt/httprouter"
 )
 
 var (
@@ -39,6 +41,7 @@ func (m *GrilsModule) Init(g *grilist.Grilist) {
         findIdx()
         m.g = g
         m.g.Router.GET("/gril/:id", m.viewGril)
+        m.g.Router.GET("/gril/:id/*rest", m.viewGril)
 }
 
 func (m *GrilsModule) getGrils(whereClause string, params ...interface{}) ([]*Gril, error) {
@@ -124,7 +127,7 @@ func (m *GrilsModule) ProvideDashboardData(user *charakterin.User) []grilist.Das
                         Actions: []frontend.Action{
                                 frontend.Action{
                                         Name: "anguckieren",
-                                        Link: fmt.Sprintf("/gril/%d", gril.ID),
+                                        Link: "/gril/" + gril.Slug(),
                                 },
                         },
                 })
@@ -149,6 +152,22 @@ func (m *GrilsModule) FromID(id int) (*Gril, error) {
         return gril, nil
 }
 
+func (m *GrilsModule) FromIDs(ids []int) ([]*Gril, error) {
+        idList := "("
+        first := true
+        for _, v := range ids {
+                if first {
+                        first = false
+                } else {
+                        idList += ","
+                }
+                idList += strconv.Itoa(v)
+        }
+        idList += ")"
+        grils, err := m.getGrils("id IN " + idList)
+        return grils, err
+}
+
 func (m *GrilsModule) viewGril(w http.ResponseWriter, r *http.Request, p httprouter.Params) {
         user, _ := m.g.Charakterin.GetUserFromRequest(r)
         sid := p.ByName("id")
diff --git a/modules/tags/tags.go b/modules/tags/tags.go
new file mode 100644
index 0000000..9412e24
--- /dev/null
+++ b/modules/tags/tags.go
@@ -0,0 +1,96 @@
+package tags
+
+import (
+        "log"
+        "net/http"
+
+        "fagott.pw/charakterin"
+        "fagott.pw/grilist/frontend"
+        "fagott.pw/grilist/grilist"
+        "fagott.pw/grilist/modules/grils"
+
+        "github.com/julienschmidt/httprouter"
+)
+
+type Module struct {
+        g     *grilist.Grilist
+        grils *grils.GrilsModule
+}
+
+func New() *Module {
+        return &Module{}
+}
+
+func (m *Module) Name() string {
+        return "Tags"
+}
+
+func (m *Module) Init(g *grilist.Grilist) {
+        m.g = g
+        gm, ok := g.Modules["Grils"]
+        if !ok {
+                log.Fatal("tags: grils module not found")
+        }
+        m.grils = gm.(*grils.GrilsModule)
+        m.g.Router.GET("/tag/:tag", m.viewTag)
+}
+
+func (m *Module) Interface() interface{} {
+        return m
+}
+
+func (m *Module) ProvideDashboardData(user *charakterin.User) []grilist.DashboardCategory {
+        return make([]grilist.DashboardCategory, 0)
+}
+
+func (m *Module) viewTag(w http.ResponseWriter, r *http.Request, p httprouter.Params) {
+        user, _ := m.g.Charakterin.GetUserFromRequest(r)
+        tag := p.ByName("tag")
+        var tagID int
+        row := m.g.DB.QueryRow("SELECT id FROM grilist.tags WHERE name = $1;", tag)
+        if err := row.Scan(&tagID); err != nil {
+                log.Println(err)
+                http.Redirect(w, r, "/", 302)
+                return
+        }
+        idList := make([]int, 0)
+        rows, err := m.g.DB.Query(
+                "SELECT gril_id FROM grilist.grils_tags WHERE tag_id = $1",
+                tagID)
+        if err != nil {
+                log.Println(err)
+                http.Redirect(w, r, "/", 302)
+                return
+        }
+        defer rows.Close()
+        for rows.Next() {
+                var grilID int
+                rows.Scan(&grilID)
+                idList = append(idList, grilID)
+        }
+        grils, err := m.grils.FromIDs(idList)
+        if err != nil {
+                log.Println(err)
+                http.Redirect(w, r, "/", 302)
+                return
+        }
+        cards := make([]frontend.Card, 0)
+        for _, v := range grils {
+                cards = append(cards, frontend.Card{
+                        Title:       v.RomajiName,
+                        Description: v.KanjiName,
+                        Size:        "medium",
+                        Actions: []frontend.Action{
+                                frontend.Action{
+                                        Name: "anguckieren",
+                                        Link: "/gril/" + v.Slug(),
+                                },
+                        },
+                })
+        }
+        data := m.g.Renderer.DefaultData()
+        data["user"] = user
+        data["tag"] = tag
+        data["cards"] = cards
+        m.g.Renderer.RenderPage("tag", w, data)
+}