Merge branch 'master' of projekte.fagott.pw:grilist

3 files changed, 39 insertions, 15 deletions

diff --git a/modules/grils/gril.go b/modules/grils/gril.go
index c8c6538..89dd7c4 100644
--- a/modules/grils/gril.go
+++ b/modules/grils/gril.go
@@ -3,6 +3,7 @@ package grils
 import (
         "database/sql"
         "fmt"
+        "os"
         "strconv"
         "strings"
         "time"
@@ -39,3 +40,27 @@ func (g *Gril) Slug() string {
                 g.ID,
                 strings.Replace(g.RomajiName, " ", "", -1))
 }
+
+func (g *Gril) ImagePath(prioritizeThumbnail bool) string {
+        var big string
+        exts := []string{"png", "jpg", "gif", "jpeg"}
+        for _, ext := range exts {
+                path := fmt.Sprintf("assets/img/gril/%d/0.%s", g.ID, ext)
+                if _, err := os.Stat(path); err == nil {
+                        if prioritizeThumbnail {
+                                big = path
+                        } else {
+                                return path
+                        }
+                }
+        }
+
+        for _, ext := range exts {
+                path := fmt.Sprintf("assets/img/gril/%d/1.%s", g.ID, ext)
+                if _, err := os.Stat(path); err == nil {
+                        return path
+                }
+        }
+
+        return big
+}
diff --git a/modules/grils/grils.go b/modules/grils/grils.go
index 46d0fb3..0df93a0 100644
--- a/modules/grils/grils.go
+++ b/modules/grils/grils.go
@@ -44,10 +44,6 @@ func (m *GrilsModule) Init(g *grilist.Grilist) {
         m.g.Router.GET("/gril/:id/*rest", m.viewGril)
 }
 
-func (m *GrilsModule) Interface() interface{} {
-        return m
-}
-
 func (m *GrilsModule) getGrils(whereClause string, params ...interface{}) ([]*Gril, error) {
         var grils []*Gril
 
diff --git a/modules/lists/lists.go b/modules/lists/lists.go
index 47501c2..4c4288f 100644
--- a/modules/lists/lists.go
+++ b/modules/lists/lists.go
@@ -52,7 +52,7 @@ func (m *Module) Init(g *grilist.Grilist) {
                 log.Fatal("lists: grils module not found")
         }
 
-        grilsModule, ok := gm.Interface().(*grils.GrilsModule)
+        grilsModule, ok := gm.(*grils.GrilsModule)
         if !ok {
                 log.Fatal("lists: error with grils module")
         }
@@ -60,11 +60,6 @@ func (m *Module) Init(g *grilist.Grilist) {
         m.g.Router.GET("/list/:id", m.viewList)
 }
 
-// Interface gibt das Modul zurück
-func (m *Module) Interface() interface{} {
-        return m
-}
-
 func (m *Module) getListGrils(list *List) error {
         rows, err := m.g.DB.Query(`SELECT gril_id, "order" FROM grilist.lists_grils WHERE list_id = $1`, list.ID)
         if err != nil {
@@ -96,7 +91,7 @@ func (m *Module) getListGrils(list *List) error {
 func (m *Module) getLists(whereClause string, params ...interface{}) ([]*List, error) {
         var lists []*List
 
-        rows, err := m.g.DB.Query(fmt.Sprintf(`SELECT id, name, description, fork_of, updated_at FROM grilist.lists WHERE %s`, whereClause), params...)
+        rows, err := m.g.DB.Query(fmt.Sprintf(`SELECT id, name, description, fork_of, updated_at, user_id FROM grilist.lists WHERE %s`, whereClause), params...)
         if err != nil {
                 return nil, err
         }
@@ -104,8 +99,8 @@ func (m *Module) getLists(whereClause string, params ...interface{}) ([]*List, e
         defer rows.Close()
         for rows.Next() {
                 list := &List{}
-
-                if err := rows.Scan(&list.ID, &list.Name, &list.Description, &list.ForkOf, &list.UpdatedAt); err != nil {
+                var ownerID int
+                if err := rows.Scan(&list.ID, &list.Name, &list.Description, &list.ForkOf, &list.UpdatedAt, &ownerID); err != nil {
                         log.Println("error scanning row in getLists:", err)
                         continue
                 }
@@ -115,6 +110,14 @@ func (m *Module) getLists(whereClause string, params ...interface{}) ([]*List, e
                         continue
                 }
 
+                // Owner kriegn
+                owner, err := m.g.Charakterin.GetUserByID(ownerID)
+                if err != nil {
+                        log.Println("error retreiving owner of list", err)
+                        continue
+                }
+                list.Owner = owner
+
                 lists = append(lists, list)
         }
 
@@ -161,8 +164,8 @@ func listsToCards(lists []*List) []frontend.Card {
                                         Link: fmt.Sprintf("/list/%d", list.ID),
                                 },
                                 frontend.Action{
-                                        Name: fmt.Sprintf(`<span class="chip">%d gril%s</span>`, len(list.Grils), s),
-                                        Link: "#",
+                                        Name:     fmt.Sprintf(`<span class="chip">%d gril%s</span>`, len(list.Grils), s),
+                                        Link:     "#",
                                         Disabled: true,
                                 },
                         },