From c5479e2386b57090445c136a79364a71ee98babf Mon Sep 17 00:00:00 2001
From: Jeff Becker <jeff@i2p.rocks>
Date: Fri, 9 Mar 2018 10:05:03 -0500
Subject: [PATCH] more

---
 contrib/backends/srndv2/src/srnd/file_cache.go     |  4 ++--
 contrib/backends/srndv2/src/srnd/null_cache.go     |  9 +++++----
 contrib/backends/srndv2/src/srnd/templates_impl.go | 10 +++++-----
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/contrib/backends/srndv2/src/srnd/file_cache.go b/contrib/backends/srndv2/src/srnd/file_cache.go
index ee3e3db..2e83946 100644
--- a/contrib/backends/srndv2/src/srnd/file_cache.go
+++ b/contrib/backends/srndv2/src/srnd/file_cache.go
@@ -285,14 +285,14 @@ func (self *FileCache) regenUkko() {
 			return
 		}
 		defer f.Close()
-		template.genUkkoPaginated(self.prefix, self.name, f, self.database, i, false, nil, false)
+		template.genUkkoPaginated(self.prefix, self.name, f, self.database, 10, i, false, nil, false)
 		j, err := os.Create(jname)
 		if err != nil {
 			log.Printf("failed to create json ukko", i, err)
 			return
 		}
 		defer j.Close()
-		template.genUkkoPaginated(self.prefix, self.name, j, self.database, i, true, nil, false)
+		template.genUkkoPaginated(self.prefix, self.name, j, self.database, 10, i, true, nil, false)
 	}
 }
 
diff --git a/contrib/backends/srndv2/src/srnd/null_cache.go b/contrib/backends/srndv2/src/srnd/null_cache.go
index 15fcbe6..fa193af 100644
--- a/contrib/backends/srndv2/src/srnd/null_cache.go
+++ b/contrib/backends/srndv2/src/srnd/null_cache.go
@@ -136,13 +136,13 @@ func (self *nullHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 				goto notfound
 			}
 		}
-		if page == 0 {
+		pages, _ := self.database.GetUkkoPageCount(10)
+		if path == "/o/" {
 			if self.invertPagination {
-				pages, _ := self.database.GetUkkoPageCount(10)
 				page = int(pages)
 			}
 		}
-		template.genUkkoPaginated(self.prefix, self.name, w, self.database, page, isjson, i18n, self.invertPagination)
+		template.genUkkoPaginated(self.prefix, self.name, w, self.database, int(pages), page, isjson, i18n, self.invertPagination)
 		return
 	}
 
@@ -181,7 +181,8 @@ func (self *nullHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 
 	if strings.HasPrefix(file, "ukko-") {
 		page := getUkkoPage(file)
-		template.genUkkoPaginated(self.prefix, self.name, w, self.database, page, isjson, i18n, self.invertPagination)
+		pages, _ := self.database.GetUkkoPageCount(10)
+		template.genUkkoPaginated(self.prefix, self.name, w, self.database, int(pages), page, isjson, i18n, self.invertPagination)
 		return
 	}
 	if strings.HasPrefix(file, "thread-") {
diff --git a/contrib/backends/srndv2/src/srnd/templates_impl.go b/contrib/backends/srndv2/src/srnd/templates_impl.go
index f103c39..1da6339 100644
--- a/contrib/backends/srndv2/src/srnd/templates_impl.go
+++ b/contrib/backends/srndv2/src/srnd/templates_impl.go
@@ -261,18 +261,18 @@ func (self *templateEngine) genBoardPage(allowFiles, requireCaptcha bool, prefix
 
 func (self *templateEngine) genUkko(prefix, frontend string, wr io.Writer, database Database, json bool, i18n *I18N, invertPagination bool) {
 	var page int64
-	var err error
+	pages, err := database.GetUkkoPageCount(10)
 	if invertPagination {
-		page, err = database.GetUkkoPageCount(10)
+		page = pages
 	}
 	if err == nil {
-		self.genUkkoPaginated(prefix, frontend, wr, database, int(page), json, i18n, invertPagination)
+		self.genUkkoPaginated(prefix, frontend, wr, database, int(pages), int(page), json, i18n, invertPagination)
 	} else {
 		log.Println("genUkko()", err.Error())
 	}
 }
 
-func (self *templateEngine) genUkkoPaginated(prefix, frontend string, wr io.Writer, database Database, page int, json bool, i18n *I18N, invertPagination bool) {
+func (self *templateEngine) genUkkoPaginated(prefix, frontend string, wr io.Writer, database Database, pages, page int, json bool, i18n *I18N, invertPagination bool) {
 	var threads []ThreadModel
 	for _, article := range database.GetLastBumpedThreadsPaginated("", 10, page*10) {
 		root := article[0]
@@ -283,7 +283,7 @@ func (self *templateEngine) genUkkoPaginated(prefix, frontend string, wr io.Writ
 		}
 	}
 	obj := map[string]interface{}{"prefix": prefix, "threads": threads, "page": page}
-	if invertPagination {
+	if invertPagination && page < pages {
 		obj["prev"] = map[string]interface{}{"no": page + 1}
 	} else if page > 0 {
 		obj["prev"] = map[string]interface{}{"no": page - 1}