From 23c357eaac61020e0a54953913f4f161cb6da423 Mon Sep 17 00:00:00 2001
From: Jeff <jeff@i2p.rocks>
Date: Sat, 24 Nov 2018 17:23:00 -0500
Subject: [PATCH 01/10] fix watermark stuff

---
 contrib/backends/srndv2/src/srnd/nntp.go | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/contrib/backends/srndv2/src/srnd/nntp.go b/contrib/backends/srndv2/src/srnd/nntp.go
index 61f2e55..74d88c0 100644
--- a/contrib/backends/srndv2/src/srnd/nntp.go
+++ b/contrib/backends/srndv2/src/srnd/nntp.go
@@ -854,7 +854,7 @@ func (self *nntpConnection) handleLine(daemon *NNTPDaemon, code int, line string
 						if err == nil {
 							hi, lo, err = daemon.database.GetLastAndFirstForGroup(group)
 							if err == nil {
-								conn.PrintfLine("211 %d %d %d %s list follows", count, lo, hi, group)
+								conn.PrintfLine("211 %d %d %d %s list follows", count, hi, lo, group)
 								dw := conn.DotWriter()
 								idx := lo
 								for idx <= hi {
@@ -1002,7 +1002,7 @@ func (self *nntpConnection) handleLine(daemon *NNTPDaemon, code int, line string
 					hi, low, err := daemon.database.GetLastAndFirstForGroup(group)
 					if err == nil {
 						// we gud
-						conn.PrintfLine("211 %d %d %d %s", number, low, hi, group)
+						conn.PrintfLine("211 %d %d %d %s", number, hi, low, group)
 					} else {
 						// wtf error
 						log.Println(self.name, "error in GROUP command", err)
@@ -1327,7 +1327,7 @@ func (self *nntpConnection) scrapeGroup(daemon *NNTPDaemon, conn *textproto.Conn
 		// check code
 		if code == 211 {
 			// success
-			es, lo, hi, _ := interpretGroupResult(ret)
+			es, hi, lo, _ := interpretGroupResult(ret)
 			for {
 				if lo > hi {
 					// server indicated empty group

From cbd7d30e8d8e4e482894a0282b950dcbd75102ba Mon Sep 17 00:00:00 2001
From: Jeff <jeff@i2p.rocks>
Date: Sat, 24 Nov 2018 17:48:30 -0500
Subject: [PATCH 02/10] include more for previous commit

---
 contrib/backends/srndv2/src/srnd/nntp.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contrib/backends/srndv2/src/srnd/nntp.go b/contrib/backends/srndv2/src/srnd/nntp.go
index 74d88c0..e3cb4c5 100644
--- a/contrib/backends/srndv2/src/srnd/nntp.go
+++ b/contrib/backends/srndv2/src/srnd/nntp.go
@@ -1175,7 +1175,7 @@ func (self *nntpConnection) handleLine(daemon *NNTPDaemon, code int, line string
 					dw := conn.DotWriter()
 					for _, entry := range list {
 						if ValidNewsgroup(entry[0]) {
-							io.WriteString(dw, fmt.Sprintf("%s %s %s y\r\n", entry[0], entry[1], entry[2]))
+							io.WriteString(dw, fmt.Sprintf("%s %s %s y\r\n", entry[0], entry[2], entry[1]))
 						}
 					}
 					dw.Close()

From d1c392ce2904f0960b3039e40a592fce0d7d7cae Mon Sep 17 00:00:00 2001
From: Jeff <jeff@i2p.rocks>
Date: Sat, 24 Nov 2018 17:51:59 -0500
Subject: [PATCH 03/10] Revert "fix watermark stuff"

This reverts commit 23c357eaac61020e0a54953913f4f161cb6da423.
---
 contrib/backends/srndv2/src/srnd/nntp.go | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/contrib/backends/srndv2/src/srnd/nntp.go b/contrib/backends/srndv2/src/srnd/nntp.go
index e3cb4c5..87994c9 100644
--- a/contrib/backends/srndv2/src/srnd/nntp.go
+++ b/contrib/backends/srndv2/src/srnd/nntp.go
@@ -854,7 +854,7 @@ func (self *nntpConnection) handleLine(daemon *NNTPDaemon, code int, line string
 						if err == nil {
 							hi, lo, err = daemon.database.GetLastAndFirstForGroup(group)
 							if err == nil {
-								conn.PrintfLine("211 %d %d %d %s list follows", count, hi, lo, group)
+								conn.PrintfLine("211 %d %d %d %s list follows", count, lo, hi, group)
 								dw := conn.DotWriter()
 								idx := lo
 								for idx <= hi {
@@ -1002,7 +1002,7 @@ func (self *nntpConnection) handleLine(daemon *NNTPDaemon, code int, line string
 					hi, low, err := daemon.database.GetLastAndFirstForGroup(group)
 					if err == nil {
 						// we gud
-						conn.PrintfLine("211 %d %d %d %s", number, hi, low, group)
+						conn.PrintfLine("211 %d %d %d %s", number, low, hi, group)
 					} else {
 						// wtf error
 						log.Println(self.name, "error in GROUP command", err)
@@ -1327,7 +1327,7 @@ func (self *nntpConnection) scrapeGroup(daemon *NNTPDaemon, conn *textproto.Conn
 		// check code
 		if code == 211 {
 			// success
-			es, hi, lo, _ := interpretGroupResult(ret)
+			es, lo, hi, _ := interpretGroupResult(ret)
 			for {
 				if lo > hi {
 					// server indicated empty group

From 76f9d84fa0c3f04e6f840d4c79816c29512764a4 Mon Sep 17 00:00:00 2001
From: Jeff <jeff@i2p.rocks>
Date: Sun, 25 Nov 2018 07:09:34 -0500
Subject: [PATCH 04/10] add new route for board list

---
 contrib/backends/srndv2/src/srnd/null_cache.go | 6 ++++++
 contrib/templates/placebo/frontpage.mustache   | 5 +++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/contrib/backends/srndv2/src/srnd/null_cache.go b/contrib/backends/srndv2/src/srnd/null_cache.go
index b5bbcec..6af4724 100644
--- a/contrib/backends/srndv2/src/srnd/null_cache.go
+++ b/contrib/backends/srndv2/src/srnd/null_cache.go
@@ -97,6 +97,12 @@ func (self *nullHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
+	// board list page
+	if strings.ToLower(path) == "/b/" {
+		template.genBoardList(self.prefix, self.name, w, self.database, i18n)
+		return
+	}
+	
 	if strings.HasPrefix(path, "/b/") {
 		// board handler
 		parts := strings.Split(path[3:], "/")
diff --git a/contrib/templates/placebo/frontpage.mustache b/contrib/templates/placebo/frontpage.mustache
index 7036869..5f52709 100644
--- a/contrib/templates/placebo/frontpage.mustache
+++ b/contrib/templates/placebo/frontpage.mustache
@@ -26,9 +26,10 @@
   </head>
   <body>
       <center>
-          <a href="{{prefix}}o/?lang={{i18n.Name}}"><img id="logo" src="{{prefix}}static/changolia-logo.png" /><h1>Enter</h1></a>
-          <a href="{{prefix}}boards.html"><h2>Board List</h2></a>
+          <a href="{{prefix}}b/"><h2>Board List</h2></a>
+          <a href="{{prefix}}o/?lang={{i18n.Name}}"><img id="logo" src="{{prefix}}static/changolia-logo.png" />Firehose</a>
           <a href="{{prefix}}static/faq.html">FAQ</a>
+          
       </center>
     <hr/>
     <footer>

From fbc53d1e818121e41505593de8b475645defa828 Mon Sep 17 00:00:00 2001
From: Jeff <jeff@i2p.rocks>
Date: Sun, 25 Nov 2018 07:12:26 -0500
Subject: [PATCH 05/10] fix last commit

---
 contrib/templates/placebo/frontpage.mustache | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/contrib/templates/placebo/frontpage.mustache b/contrib/templates/placebo/frontpage.mustache
index 5f52709..7a7be9f 100644
--- a/contrib/templates/placebo/frontpage.mustache
+++ b/contrib/templates/placebo/frontpage.mustache
@@ -26,8 +26,9 @@
   </head>
   <body>
       <center>
+          <img id="logo" src="{{prefix}}static/changolia-logo.png" />
           <a href="{{prefix}}b/"><h2>Board List</h2></a>
-          <a href="{{prefix}}o/?lang={{i18n.Name}}"><img id="logo" src="{{prefix}}static/changolia-logo.png" />Firehose</a>
+          <a href="{{prefix}}o/?lang={{i18n.Name}}">Firehose</a>
           <a href="{{prefix}}static/faq.html">FAQ</a>
           
       </center>

From 6694c23859663cbdeb7c6233118b336360a81a41 Mon Sep 17 00:00:00 2001
From: Jeff <jeff@i2p.rocks>
Date: Sun, 25 Nov 2018 08:47:40 -0500
Subject: [PATCH 06/10] better query

---
 contrib/backends/srndv2/src/srnd/database.go  | 16 +++++---
 contrib/backends/srndv2/src/srnd/model.go     |  3 ++
 contrib/backends/srndv2/src/srnd/postgres.go  | 17 ++++++++
 .../srndv2/src/srnd/templates_impl.go         | 39 ++++++++-----------
 4 files changed, 46 insertions(+), 29 deletions(-)

diff --git a/contrib/backends/srndv2/src/srnd/database.go b/contrib/backends/srndv2/src/srnd/database.go
index 0cfb6de..0fa10f8 100644
--- a/contrib/backends/srndv2/src/srnd/database.go
+++ b/contrib/backends/srndv2/src/srnd/database.go
@@ -47,13 +47,12 @@ func (self PostEntry) Count() int64 {
 	return self[1]
 }
 
+type PostEntryList []PostEntry
+
+
 // stats about newsgroup postings
 type NewsgroupStats struct {
-	Posted []PostEntry
-	Delted []PostEntry
-	Hits   []PostEntry
-	Start  time.Time
-	End    time.Time
+	PPD    int64
 	Name   string
 }
 
@@ -70,6 +69,8 @@ type NewsgroupListEntry [3]string
 
 type NewsgroupList []NewsgroupListEntry
 
+
+
 type Database interface {
 	Close()
 	CreateTables()
@@ -81,7 +82,7 @@ type Database interface {
 	GetAllArticlesInGroup(group string, send chan ArticleEntry)
 	CountAllArticlesInGroup(group string) (int64, error)
 	GetAllArticles() []ArticleEntry
-
+	
 	SetConnectionLifetime(seconds int)
 	SetMaxOpenConns(n int)
 	SetMaxIdleConns(n int)
@@ -124,6 +125,9 @@ type Database interface {
 	// if N <= 0 then count all we have now
 	CountPostsInGroup(group string, time_frame int64) int64
 
+	// get the stats for the overview page
+	GetNewsgroupStats() ([]NewsgroupStats, error)
+
 	// get all replies to a thread
 	// if last > 0 then get that many of the last replies
 	// start at reply number start
diff --git a/contrib/backends/srndv2/src/srnd/model.go b/contrib/backends/srndv2/src/srnd/model.go
index a177f85..d4967e0 100644
--- a/contrib/backends/srndv2/src/srnd/model.go
+++ b/contrib/backends/srndv2/src/srnd/model.go
@@ -224,6 +224,8 @@ type boardPageRow struct {
 	Hour  int64
 	Day   int64
 	All   int64
+	Hi    int64
+	Lo    int64
 }
 
 type boardPageRows []boardPageRow
@@ -242,6 +244,7 @@ func (self boardPageRows) Swap(i, j int) {
 	self[i], self[j] = self[j], self[i]
 }
 
+
 type postsGraphRow struct {
 	day time.Time
 	Num int64
diff --git a/contrib/backends/srndv2/src/srnd/postgres.go b/contrib/backends/srndv2/src/srnd/postgres.go
index 2fadb7c..29385b2 100644
--- a/contrib/backends/srndv2/src/srnd/postgres.go
+++ b/contrib/backends/srndv2/src/srnd/postgres.go
@@ -151,9 +151,11 @@ const GetCitesByPostHashLike = "GetCitesByPostHashLike"
 const GetYearlyPostHistory = "GetYearlyPostHistory"
 const GetNewsgroupList = "GetNewsgroupList"
 const CountUkko = "CountUkko"
+const GetNewsgroupStats = "GetNewsgroupStats"
 
 func (self *PostgresDatabase) prepareStatements() {
 	self.stmt = map[string]string{
+		GetNewsgroupStats: "SELECT COUNT(message_id), newsgroup FROM articleposts WHERE time_posted > (EXTRACT(epoch FROM NOW()) - (24*3600)) GROUP BY newsgroup",
 		NewsgroupBanned:                 "SELECT 1 FROM BannedGroups WHERE newsgroup = $1",
 		ArticleBanned:                   "SELECT 1 FROM BannedArticles WHERE message_id = $1",
 		GetAllNewsgroups:                "SELECT name FROM Newsgroups WHERE name NOT IN ( SELECT newsgroup FROM BannedGroups )",
@@ -2039,6 +2041,21 @@ func (self *PostgresDatabase) GetUkkoPageCount(perpage int) (count int64, err er
 	return
 }
 
+func (self *PostgresDatabase)	GetNewsgroupStats() (stats []NewsgroupStats, err error) {
+	var rows *sql.Rows
+	rows, err = self.conn.Query(self.stmt[GetNewsgroupStats])
+	if err == nil {
+		for rows.Next() {
+			var s NewsgroupStats
+			rows.Scan(&s.PPD, &s.Name)
+			stats = append(stats, s)
+		}
+		rows.Close()
+	}
+	return
+}
+
+
 func (self *PostgresDatabase) FindHeaders(group, headername string, lo, hi int64) (hdr ArticleHeaders, err error) {
 	hdr = make(ArticleHeaders)
 	q := "SELECT header_value FROM nntpheaders WHERE header_name = $1 AND header_article_message_id IN ( SELECT message_id FROM articleposts WHERE newsgroup = $2 )"
diff --git a/contrib/backends/srndv2/src/srnd/templates_impl.go b/contrib/backends/srndv2/src/srnd/templates_impl.go
index ff9153f..7541933 100644
--- a/contrib/backends/srndv2/src/srnd/templates_impl.go
+++ b/contrib/backends/srndv2/src/srnd/templates_impl.go
@@ -475,36 +475,29 @@ func (self *templateEngine) genGraphs(prefix string, wr io.Writer, db Database,
 
 func (self *templateEngine) genBoardList(prefix, name string, wr io.Writer, db Database, i18n *I18N) {
 	// the graph for the front page
-	var frontpage_graph boardPageRows
+	var graph boardPageRows
 
-	// for each group
-	groups := db.GetAllNewsgroups()
-	for _, group := range groups {
-		// exclude banned
-		banned, _ := db.NewsgroupBanned(group)
-		if banned {
-			continue
-		}
-		// posts this hour
-		hour := db.CountPostsInGroup(group, 3600)
-		// posts today
-		day := db.CountPostsInGroup(group, 86400)
-		// posts total
-		all := db.CountPostsInGroup(group, 0)
-		frontpage_graph = append(frontpage_graph, boardPageRow{
-			All:   all,
-			Day:   day,
-			Hour:  hour,
-			Board: group,
+	stats, err := db.GetNewsgroupStats()
+	if err != nil {
+		log.Println("error getting board list", err)
+		io.WriteString(wr, err.Error())
+		return
+	}
+
+	for idx := range stats {
+		graph = append(graph, boardPageRow{
+			Board: stats[idx].Name,
+			Day: stats[idx].PPD,
 		})
 	}
+	
 	param := map[string]interface{}{
 		"prefix":   prefix,
 		"frontend": name,
 	}
-	sort.Sort(frontpage_graph)
-	param["graph"] = frontpage_graph
-	_, err := io.WriteString(wr, self.renderTemplate("boardlist", param, i18n))
+	sort.Sort(graph)
+	param["graph"] = graph
+	_, err = io.WriteString(wr, self.renderTemplate("boardlist", param, i18n))
 	if err != nil {
 		log.Println("error writing board list page", err)
 	}

From 9f18416f081786e225cdaa04726045f3807f7a25 Mon Sep 17 00:00:00 2001
From: Jeff <jeff@i2p.rocks>
Date: Sun, 25 Nov 2018 08:49:54 -0500
Subject: [PATCH 07/10] update template

---
 contrib/templates/placebo/boardlist.mustache | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/contrib/templates/placebo/boardlist.mustache b/contrib/templates/placebo/boardlist.mustache
index 5767176..cc1ac87 100644
--- a/contrib/templates/placebo/boardlist.mustache
+++ b/contrib/templates/placebo/boardlist.mustache
@@ -32,9 +32,9 @@
               -->
               <td class="board_td">
                   <table cellspacing="0" class="datatable" style="border-collapse: inherit;">
-                      <tr><th>posts today</th><th>post rate</th><th>board</th></tr>
+                      <tr><th>posts today</th><th>board</th></tr>
                       {{#graph}}
-                          <tr><td class="right">{{Day}}</td><td class="right">{{Hour}} PPH</td><td><a href="{{prefix}}b/{{Board}}/">{{Board}}</a></td></tr>
+                          <tr><td class="right">{{Day}}</td><td><a href="{{prefix}}b/{{Board}}/">{{Board}}</a></td></tr>
                       {{/graph}}
                   </table>
               </td>

From 3fb9140a07446c3fcc04890c6ea3493b535ea004 Mon Sep 17 00:00:00 2001
From: Jeff <jeff@i2p.rocks>
Date: Sun, 25 Nov 2018 08:51:05 -0500
Subject: [PATCH 08/10] fix style

---
 contrib/templates/placebo/boardlist.mustache | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contrib/templates/placebo/boardlist.mustache b/contrib/templates/placebo/boardlist.mustache
index cc1ac87..6e22135 100644
--- a/contrib/templates/placebo/boardlist.mustache
+++ b/contrib/templates/placebo/boardlist.mustache
@@ -22,7 +22,7 @@
   </head>
   <body>
       <center>
-      <table class="activity" cellspacing="0" cellpadding="0" border="0" width="100%">
+      <table class="activity" cellspacing="0" cellpadding="0" border="0">
           <tr>
               <!--
               <td class="usage_td">

From 91e758c8340b7b28904612895236bfb161d87dd6 Mon Sep 17 00:00:00 2001
From: cathugger <cathugger@cock.li>
Date: Sun, 25 Nov 2018 20:01:33 +0200
Subject: [PATCH 09/10] fix ARTICLE not returning any error

Yes, I'm aware it sometimes may still return wrong code.
---
 contrib/backends/srndv2/src/srnd/nntp.go | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/contrib/backends/srndv2/src/srnd/nntp.go b/contrib/backends/srndv2/src/srnd/nntp.go
index 87994c9..0d9327d 100644
--- a/contrib/backends/srndv2/src/srnd/nntp.go
+++ b/contrib/backends/srndv2/src/srnd/nntp.go
@@ -776,10 +776,13 @@ func (self *nntpConnection) handleLine(daemon *NNTPDaemon, code int, line string
 							// wtf?!
 							conn.PrintfLine("503 idkwtf happened: %s", err.Error())
 						}
+					} else {
+						// we dont got it (by msgid)
+						conn.PrintfLine("430 %s", msgid)
 					}
 				} else {
-					// we dont got it
-					conn.PrintfLine("430 %s", msgid)
+					// we dont got it (by num)
+					conn.PrintfLine("423 %s", msgid)
 				}
 			} else if cmd == "IHAVE" {
 				if !self.authenticated {

From 2d3c304c81b56ccab8e89c4adf795f4ea1716ba2 Mon Sep 17 00:00:00 2001
From: cathugger <cathugger@cock.li>
Date: Tue, 27 Nov 2018 05:15:11 +0200
Subject: [PATCH 10/10] srnd: more lax Message-ID check

This axes out literally insane overly restrictive regex-based
Message-ID check and replaces it with clean and simple conditions
specified in RFC 3977.
Old check wasn't compliant with any email or netnews internet
standard I know of, and was causing propagation issues.
Even old RFC 822 (email) and RFC 850 (usenet) specifications
don't have so restrictive specifications.
---
 contrib/backends/srndv2/src/srnd/util.go | 30 +++++++++++++++++++++---
 1 file changed, 27 insertions(+), 3 deletions(-)

diff --git a/contrib/backends/srndv2/src/srnd/util.go b/contrib/backends/srndv2/src/srnd/util.go
index 21023f9..efa9428 100644
--- a/contrib/backends/srndv2/src/srnd/util.go
+++ b/contrib/backends/srndv2/src/srnd/util.go
@@ -60,10 +60,34 @@ func EnsureDir(dirname string) {
 	}
 }
 
-var exp_valid_message_id = regexp.MustCompilePOSIX(`^<[a-zA-Z0-9$.]{2,128}@[a-zA-Z0-9\-.]{2,63}>$`)
+// printableASCII tells whether string is made of US-ASCII printable characters
+// except of specified one.
+func printableASCII(s string, e byte) bool {
+	for i := 0; i < len(s); i++ {
+		c := s[i]
+		// NOTE: doesn't include space, which is neither printable nor control
+		if c <= 32 || c >= 127 || c == e {
+			return false
+		}
+	}
+	return true
+}
 
 func ValidMessageID(id string) bool {
-	return exp_valid_message_id.MatchString(id)
+	/*
+	   {RFC 3977}
+	   o  A message-id MUST begin with "<", end with ">", and MUST NOT
+	      contain the latter except at the end.
+	   o  A message-id MUST be between 3 and 250 octets in length.
+	   o  A message-id MUST NOT contain octets other than printable US-ASCII
+	      characters.
+
+	   additionally, we check path characters, they may be dangerous
+	*/
+	return len(id) >= 3 && len(id) <= 250 &&
+		id[0] == '<' && id[len(id)-1] == '>' &&
+		printableASCII(id[1:len(id)-1], '>') &&
+		strings.IndexAny(id[1:len(id)-1], "/\\") < 0
 }
 
 // message id hash
@@ -482,7 +506,7 @@ func IPNet2MinMax(inet *net.IPNet) (min, max net.IP) {
 	maskb := []byte(inet.Mask)
 	maxb := make([]byte, len(netb))
 
-	for i, _ := range maxb {
+	for i := range maxb {
 		maxb[i] = netb[i] | (^maskb[i])
 	}
 	min = net.IP(netb)