1 files changed, 72 insertions, 80 deletions

diff --git a/modules/grils/grils.go b/modules/grils/grils.go
index 116b689..135398d 100644
--- a/modules/grils/grils.go
+++ b/modules/grils/grils.go
@@ -6,20 +6,20 @@ import (
         "net/http"
         "regexp"
         "strconv"
-    "time"
         "strings"
+        "time"
 
         "fagott.pw/charakterin"
+        "fagott.pw/grilist/cache"
         "fagott.pw/grilist/frontend"
         "fagott.pw/grilist/grilist"
-    "fagott.pw/grilist/cache"
 
         "github.com/julienschmidt/httprouter"
 )
 
 type CachedGril struct {
-    Created time.Time
-    Gril *Gril
+        Created time.Time
+        Gril    *Gril
 }
 
 var (
@@ -38,7 +38,7 @@ func findIdx() {
 
 type GrilsModule struct {
         g *grilist.Grilist
-    c *cache.Cache
+        c *cache.Cache
 }
 
 func (m *GrilsModule) Name() string {
@@ -50,8 +50,8 @@ func (m *GrilsModule) Init(g *grilist.Grilist) {
         m.g = g
         m.g.Router.GET("/gril/:id", m.viewGril)
         m.g.Router.GET("/gril/:id/*rest", m.viewGril)
-    
-    m.c = cache.New()
+
+        m.c = cache.New()
 }
 
 func (m *GrilsModule) getGrils(whereClause string, params ...interface{}) ([]*Gril, error) {
@@ -105,43 +105,35 @@ func (m *GrilsModule) GetListsOfGril(gril *Gril) error {
 
 func (m *GrilsModule) ProvideDashboardData(user *charakterin.User) []grilist.DashboardCategory {
         var categories []grilist.DashboardCategory
-
         t1 := time.Now()
-        rows, err := m.g.DB.Query(`SELECT id FROM grilist.grils ORDER BY updated_at DESC LIMIT 5`)
+
+        rows, err := m.g.DB.Query(
+                `SELECT id, romaji_name, kanji_name FROM grilist.get_recently_updated_grils();`)
         if err != nil {
                 log.Println(err)
                 return categories
         }
         defer rows.Close()
-        log.Printf("get_newest_grils: %dms", time.Since(t1).Nanoseconds()/1000000)
 
         cat := grilist.DashboardCategory{
                 Title: "Neue Grils",
         }
 
         for rows.Next() {
-                var id int
-                if err := rows.Scan(&id); err != nil {
-                        log.Println(err)
-                        continue
-                }
-
-                t2 := time.Now()
-                gril, err := m.FromID(id)
-                if err != nil {
+                var g Gril
+                if err := rows.Scan(&g.ID, &g.RomajiName, &g.KanjiName); err != nil {
                         log.Println(err)
                         continue
                 }
-                log.Printf("get_gril_from_id_in_newest_grils: %dms", time.Since(t2).Nanoseconds()/1000000)
 
                 cat.Cards = append(cat.Cards, frontend.Card{
-                        Title:       gril.RomajiName,
-                        Description: gril.KanjiName,
+                        Title:       g.RomajiName,
+                        Description: g.KanjiName,
                         Size:        "medium",
                         Actions: []frontend.Action{
                                 frontend.Action{
                                         Name: "anguckieren",
-                                        Link: "/gril/" + gril.Slug(),
+                                        Link: "/gril/" + g.Slug(),
                                 },
                         },
                 })
@@ -152,77 +144,77 @@ func (m *GrilsModule) ProvideDashboardData(user *charakterin.User) []grilist.Das
 }
 
 func (m *GrilsModule) FromID(id int) (*Gril, error) {
-    if g, ok := m.c.Get(id); ok {
-        return g.(*Gril), nil
-    }
-    
+        if g, ok := m.c.Get(id); ok {
+                return g.(*Gril), nil
+        }
+
         gril := &Gril{
                 ID: id,
         }
-    t1 := time.Now()
+        t1 := time.Now()
         err := m.g.DB.QueryRow(`SELECT updated_at, age, birthday FROM grilist.grils WHERE id = $1`, id).Scan(&gril.UpdatedAt, &gril.Age, &gril.Birthday)
         log.Printf("get_gril_from_id_raw: %dms", time.Since(t1).Nanoseconds()/1000000)
 
         if err != nil {
                 return nil, err
         }
-    
-    // Namen rausholen
-    rows, err := m.g.DB.Query(`SELECT name, name_type FROM grilist.gril_names WHERE gril_id = $1`, id)
+
+        // Namen rausholen
+        rows, err := m.g.DB.Query(`SELECT name, name_type FROM grilist.gril_names WHERE gril_id = $1`, id)
         if err != nil {
                 return nil, err
         }
         log.Printf("get_gril_from_id_names: %dms", time.Since(t1).Nanoseconds()/1000000)
-    defer rows.Close()
-    
-    for rows.Next() {
-        var name string
-        var name_type int
-        if err := rows.Scan(&name, &name_type); err != nil {
-            return nil, err
-        }
-        
-        switch name_type {
-        case 0:
-            gril.KanjiName = name
-            break
-        case 1:
-            gril.RomajiName = name
-        default:
-            gril.OtherNames = append(gril.OtherNames, name)
-        }
-    }
-    /*rows, err := m.g.DB.Query(`SELECT name FROM grilist.gril_names WHERE gril_id = $1 AND name_type > 1`, id)
-        if err != nil {
-                return nil, err
-        }
-    defer rows.Close()
-    
-    for rows.Next() {
-        var name string
-        if err := rows.Scan(&name); err != nil {
-            return nil, err
-        }
-        gril.OtherNames = append(gril.OtherNames, name)
-    }
-    rows.Close()
-    
-    // Tags holen
-    rows, err := m.g.DB.Query(`SELECT name FROM grilist.tags WHERE id IN (SELECT tag_id FROM grilist.grils_tags WHERE gril_id = $1)`, id)
-        if err != nil {
-                return nil, err
+        defer rows.Close()
+
+        for rows.Next() {
+                var name string
+                var name_type int
+                if err := rows.Scan(&name, &name_type); err != nil {
+                        return nil, err
+                }
+
+                switch name_type {
+                case 0:
+                        gril.KanjiName = name
+                        break
+                case 1:
+                        gril.RomajiName = name
+                default:
+                        gril.OtherNames = append(gril.OtherNames, name)
+                }
         }
-    defer rows.Close()
-    
-    for rows.Next() {
-        var name string
-        if err := rows.Scan(&name); err != nil {
-            return nil, err
-        }
-        gril.Tags = append(gril.Tags, name)
-    }*/
-
-    m.c.Insert(id, gril)
+        /*rows, err := m.g.DB.Query(`SELECT name FROM grilist.gril_names WHERE gril_id = $1 AND name_type > 1`, id)
+                if err != nil {
+                        return nil, err
+                }
+            defer rows.Close()
+
+            for rows.Next() {
+                var name string
+                if err := rows.Scan(&name); err != nil {
+                    return nil, err
+                }
+                gril.OtherNames = append(gril.OtherNames, name)
+            }
+            rows.Close()
+
+            // Tags holen
+            rows, err := m.g.DB.Query(`SELECT name FROM grilist.tags WHERE id IN (SELECT tag_id FROM grilist.grils_tags WHERE gril_id = $1)`, id)
+                if err != nil {
+                        return nil, err
+                }
+            defer rows.Close()
+
+            for rows.Next() {
+                var name string
+                if err := rows.Scan(&name); err != nil {
+                    return nil, err
+                }
+                gril.Tags = append(gril.Tags, name)
+            }*/
+
+        m.c.Insert(id, gril)
         log.Printf("get_gril_from_id: %dms", time.Since(t1).Nanoseconds()/1000000)
         return gril, nil
 }