From 638a03b458b71564b1db439e6386d7dbf2a5181c Mon Sep 17 00:00:00 2001
From: knotteye <knotteye@airmail.cc>
Date: Thu, 1 Jul 2021 14:39:44 -0500
Subject: linkify text and use imageboard name to identify it

---
 client.go         |  5 ++---
 static/index.html | 10 +++++-----
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/client.go b/client.go
index 49c7d0c..dd40f3d 100644
--- a/client.go
+++ b/client.go
@@ -1,6 +1,5 @@
 package main
 
-import "fmt"
 import "net/http"
 import "html/template"
 import "database/sql"
@@ -36,7 +35,7 @@ type Board struct{
 
 type PageData struct {
 	Title string
-	Message string	
+	PreferredUsername string
 	Board Board
 	Pages []int
 	CurrentPage int
@@ -81,7 +80,7 @@ func IndexGet(w http.ResponseWriter, r *http.Request, db *sql.DB) {
 
 	var data PageData
 	data.Title = "Welcome to " + actor.PreferredUsername
-	data.Message = fmt.Sprintf("%s is a federated image board based on activitypub. The current version of the code running the server is still a work in progress, expect a bumpy ride for the time being. Get the server code here https://github.com/FChannel0", Domain)
+	data.PreferredUsername = actor.PreferredUsername
 	data.Boards = Boards
 	data.Board.Name = ""
 	data.Key = *Key
diff --git a/static/index.html b/static/index.html
index 502e527..19c5da2 100644
--- a/static/index.html
+++ b/static/index.html
@@ -1,6 +1,6 @@
 {{ define "header" }}
 <title>{{ .Title }}</title>
-<meta name="description" content="{{ .Message }}">    
+<meta name="description" content="{{ .PreferredUsername }} is a federated image board based on activitypub. The current version of the code running the server is still a work in progress, expect a bumpy ride for the time being. Get the server code here: https://github.com/FChannel0.">    
 
 <meta property="og:locale" content="en_US" />
 <meta property="og:type" content="website" />
@@ -8,10 +8,10 @@
 <meta property="og:site_name" content="{{ .Board.Actor.PreferredUsername }}" />
 
 <meta property="og:title" content="{{ .Title }}">
-<meta property="og:description" content="{{ .Message }}">
+<meta property="og:description" content="{{ .PreferredUsername }} is a federated image board based on activitypub. The current version of the code running the server is still a work in progress, expect a bumpy ride for the time being. Get the server code here: https://github.com/FChannel0.">
 
 <meta name="twitter:title" content="{{ .Title }}">
-<meta name="twitter:description" content="{{ .Message }}">
+<meta name="twitter:description" content="{{ .PreferredUsername }} is a federated image board based on activitypub. The current version of the code running the server is still a work in progress, expect a bumpy ride for the time being. Get the server code here: https://github.com/FChannel0.">
 <meta name="twitter:card" content="summary_large_image">
 
 {{ end }}
@@ -20,7 +20,7 @@
 {{ define "content" }}
 <div style="text-align: center; max-width: 800px; margin: 0 auto;">
   <h1>{{ .Title }}</h1>
-  <p style="text-align: justify">{{.Message}}</p>
+  <p style="text-align: justify">{{ .PreferredUsername }} is a federated image board based on activitypub. The current version of the code running the server is still a work in progress, expect a bumpy ride for the time being. Get the server code <a href="https://github.com/FChannel0">here</a>.</p>
   
   <div style="margin-top:50px;">
   <table align="center" style="text-align: left;">
@@ -30,7 +30,7 @@
 
     {{ range .InstanceIndex }}
     <tr>
-      <td>{{ .Id }}</td>
+      <td><a href="{{ .Id }}">{{ .Id }}</a></td>
     </tr>
     {{ end }}
   </table>
-- 
cgit v1.2.3


From 4e3848cadbb3fd89b94a7ef24838173939d198db Mon Sep 17 00:00:00 2001
From: knotteye <knotteye@airmail.cc>
Date: Thu, 1 Jul 2021 17:56:04 -0500
Subject: Add a list of local boards and server news

---
 client.go           | 13 +++++++++++--
 database.go         | 42 ++++++++++++++++++++++++++++++++++++++++--
 databaseschema.psql |  8 +++++++-
 main.go             | 11 +++++++++++
 static/index.html   | 28 ++++++++++++++++++++++++++++
 static/nadmin.html  |  8 ++++++++
 6 files changed, 105 insertions(+), 5 deletions(-)

diff --git a/client.go b/client.go
index dd40f3d..fcb496b 100644
--- a/client.go
+++ b/client.go
@@ -47,6 +47,7 @@ type PageData struct {
 	Instance Actor
 	InstanceIndex []ObjectBase
 	ReturnTo string
+	NewsItems []NewsItem
 }
 
 type AdminPage struct {
@@ -73,8 +74,15 @@ type Removed struct {
 	Board string
 }
 
+
+type NewsItem struct {
+	Title string
+	Content string
+	Time int
+}
+
 func IndexGet(w http.ResponseWriter, r *http.Request, db *sql.DB) {
-	t := template.Must(template.ParseFiles("./static/main.html", "./static/index.html"))
+	t := template.Must(template.New("").Funcs(template.FuncMap{"mod": func(i, j int) bool { return i%j == 0 }}).ParseFiles("./static/main.html", "./static/index.html"))
 
 	actor := GetActorFromDB(db, Domain)
 
@@ -90,8 +98,9 @@ func IndexGet(w http.ResponseWriter, r *http.Request, db *sql.DB) {
 	data.Board.Post.Actor = actor.Id
 	data.Board.Restricted = actor.Restricted
 	data.InstanceIndex = GetCollectionFromReq("https://fchan.xyz/followers").Items
+	data.NewsItems = getNewsFromDB(db)
 
-	t.ExecuteTemplate(w, "layout",  data)	
+	t.ExecuteTemplate(w, "layout",  data)
 }
 
 func OutboxGet(w http.ResponseWriter, r *http.Request, db *sql.DB, collection Collection){
diff --git a/database.go b/database.go
index 9d5d721..5fcebf0 100644
--- a/database.go
+++ b/database.go
@@ -7,11 +7,12 @@ import "time"
 import "os"
 import "strings"
 import "sort"
+import "container/list"
 
 func GetActorFromDB(db *sql.DB, id string) Actor {
-	var nActor Actor
+       var nActor Actor
 
-	query :=`select type, id, name, preferedusername, inbox, outbox, following, followers, restricted, summary, publickeypem from actor where id=$1`
+       query :=`select type, id, name, preferedusername, inbox, outbox, following, followers, restricted, summary, publickeypem from actor where id=$1`
 
 	rows, err := db.Query(query, id)
 
@@ -1488,3 +1489,40 @@ func MarkObjectSensitive(db *sql.DB, id string, sensitive bool) {
 
 	CheckError(err, "error updating sensitive object in cacheactivitystream")	
 }
+
+func getNewsFromDB(db *sql.DB) []NewsItem {
+	news := list.New()
+	query :=`select title, content, time from newsItem order by time desc`
+
+	rows, err := db.Query(query)
+
+	if CheckError(err, "could not get news from db query") != nil {
+		return make([]NewsItem, 0)
+	}
+
+	defer rows.Close()
+	for rows.Next() {
+		n := NewsItem{}
+		err = rows.Scan(&n.Title, &n.Content, &n.Time)
+		news.PushBack(n)
+	}
+	
+	anews := make([]NewsItem, news.Len())
+	
+	i:=0
+	for e := news.Front(); e != nil; e = e.Next() {
+		assert := e.Value.(NewsItem)
+		anews[i] = assert
+		i++
+	}
+
+	return anews
+}
+
+func WriteNewsToDB(db *sql.DB, news NewsItem) {
+	query := `insert into newsItem (title, content, time) values ($1, $2, $3)`
+	
+	_, err := db.Exec(query, news.Title, news.Content, time.Now().Unix())
+	
+	CheckError(err, "error writing news item")
+}
diff --git a/databaseschema.psql b/databaseschema.psql
index e12813e..43767f3 100644
--- a/databaseschema.psql
+++ b/databaseschema.psql
@@ -216,7 +216,13 @@ owner varchar(100),
 file varchar(100)
 );
 
+CREATE TABLE IF NOT EXISTS newsItem(
+title text,
+content text,
+time bigint
+);
+
 ALTER TABLE actor ADD COLUMN IF NOT EXISTS publicKeyPem varchar(100) default '';
 
 ALTER TABLE activitystream ADD COLUMN IF NOT EXISTS sensitive boolean default false;
-ALTER TABLE cacheactivitystream ADD COLUMN IF NOT EXISTS sensitive boolean default false;
\ No newline at end of file
+ALTER TABLE cacheactivitystream ADD COLUMN IF NOT EXISTS sensitive boolean default false;
diff --git a/main.go b/main.go
index 972e69e..037f240 100644
--- a/main.go
+++ b/main.go
@@ -598,6 +598,17 @@ func main() {
 		MakeActivityRequestOutbox(db, newActorActivity)
 		http.Redirect(w, r, "/" + *Key, http.StatusSeeOther)		
 	})
+	
+	http.HandleFunc("/" + *Key + "/postnews", func(w http.ResponseWriter, r *http.Request) {
+		var newsitem NewsItem
+		
+		newsitem.Title = r.FormValue("title")
+		newsitem.Content = r.FormValue("summary")
+		
+		WriteNewsToDB(db, newsitem)
+		
+		http.Redirect(w, r, "/", http.StatusSeeOther)		
+	})
 
 	http.HandleFunc("/verify", func(w http.ResponseWriter, r *http.Request){
 		if(r.Method == "POST") {
diff --git a/static/index.html b/static/index.html
index 19c5da2..de06c6c 100644
--- a/static/index.html
+++ b/static/index.html
@@ -22,6 +22,34 @@
   <h1>{{ .Title }}</h1>
   <p style="text-align: justify">{{ .PreferredUsername }} is a federated image board based on activitypub. The current version of the code running the server is still a work in progress, expect a bumpy ride for the time being. Get the server code <a href="https://github.com/FChannel0">here</a>.</p>
   
+  <div style="margin-top:50px;">
+  <table align="center" style="text-align: left;">
+    <th>
+      <tr>Local boards</tr>
+    </th>
+
+    {{ range .Boards }}
+    <tr>
+      <td><a href="{{.Location}}">{{.Name}} - {{.PrefName}}</a></td>
+    </tr>
+    {{ end }}
+  </table>
+  </div>
+  
+  <div style="margin-top:50px;">
+  <table align="center" style="text-align: left;">
+    <th>
+      <tr>{{ .PreferredUsername }} news</tr>
+    </th>
+
+    {{ range .NewsItems }}
+    <tr>
+      <td><p><em><b>{{.Time}} - {{.Title}}</b></em><br>{{.Content}}</p></td>
+    </tr>
+    {{ end }}
+  </table>
+  </div>
+  
   <div style="margin-top:50px;">
   <table align="center" style="text-align: left;">
     <th>
diff --git a/static/nadmin.html b/static/nadmin.html
index 984eb76..877e1e5 100644
--- a/static/nadmin.html
+++ b/static/nadmin.html
@@ -17,6 +17,14 @@
       <option value="False">False</option>          
     </select>
   </form>
+  
+  <h3>Post News</h3>
+  <form id="news" action="/{{ .Key }}/postnews" method="post" enctype="application/x-www-form-urlencoded">
+    <label>Title:</label><br>
+    <input type="text" name="title" placeholder="{{.Actor}} was created!" required><input type="submit" value="Post"><br>
+    <label>Content:</label><br>
+    <textarea name="summary" rows="8" cols="50"></textarea><br>
+  </form>
 
   <ul style="display: inline-block; padding: 0;">
     <li style="display: inline-block;"><a href="#following">Subscribed</a></li>
-- 
cgit v1.2.3


From 168225daa21fe494bcd74ab6c90d6498ecf9f1e3 Mon Sep 17 00:00:00 2001
From: knotteye <knotteye@airmail.cc>
Date: Thu, 1 Jul 2021 20:26:49 -0500
Subject: Make news list links to full page news articles

---
 client.go         | 34 +++++++++++++++++++++++++++++++++-
 database.go       | 24 ++++++++++++++++++++++++
 main.go           | 15 +++++++++++++++
 static/index.html |  2 +-
 static/news.html  | 32 ++++++++++++++++++++++++++++++++
 5 files changed, 105 insertions(+), 2 deletions(-)
 create mode 100644 static/news.html

diff --git a/client.go b/client.go
index fcb496b..38f0d6f 100644
--- a/client.go
+++ b/client.go
@@ -8,6 +8,7 @@ import "strings"
 import "strconv"
 import "sort"
 import "regexp"
+import "time"
 
 var Key *string = new(string)
 
@@ -82,7 +83,7 @@ type NewsItem struct {
 }
 
 func IndexGet(w http.ResponseWriter, r *http.Request, db *sql.DB) {
-	t := template.Must(template.New("").Funcs(template.FuncMap{"mod": func(i, j int) bool { return i%j == 0 }}).ParseFiles("./static/main.html", "./static/index.html"))
+	t := template.Must(template.New("").Funcs(template.FuncMap{"mod": func(i, j int) bool { return i%j == 0 }, "unixtoreadable": func(u int) string { return time.Unix(int64(u), 0).Format("Jan 02, 2006") }}).ParseFiles("./static/main.html", "./static/index.html"))
 
 	actor := GetActorFromDB(db, Domain)
 
@@ -103,6 +104,37 @@ func IndexGet(w http.ResponseWriter, r *http.Request, db *sql.DB) {
 	t.ExecuteTemplate(w, "layout",  data)
 }
 
+func NewsGet(w http.ResponseWriter, r *http.Request, db *sql.DB, timestamp int) {
+	t := template.Must(template.New("").Funcs(template.FuncMap{"unixtoreadable": func(u int) string { return time.Unix(int64(u), 0).Format("Jan 02, 2006") }}).ParseFiles("./static/main.html", "./static/news.html"))
+	
+	actor := GetActorFromDB(db, Domain)
+
+	var data PageData
+	data.PreferredUsername = actor.PreferredUsername
+	data.Boards = Boards
+	data.Board.Name = ""
+	data.Key = *Key
+	data.Board.Domain = Domain
+	data.Board.ModCred, _ = GetPasswordFromSession(r)
+	data.Board.Actor = actor
+	data.Board.Post.Actor = actor.Id
+	data.Board.Restricted = actor.Restricted
+	data.NewsItems = []NewsItem{NewsItem{}}
+	
+	var err error
+	data.NewsItems[0], err = getNewsItemFromDB(db, timestamp)
+	
+	if err != nil {
+		w.WriteHeader(http.StatusForbidden)			
+		w.Write([]byte("404 no path"))
+		return
+	}
+	
+	data.Title = actor.PreferredUsername + ": " + data.NewsItems[0].Title
+
+	t.ExecuteTemplate(w, "layout",  data)
+}
+
 func OutboxGet(w http.ResponseWriter, r *http.Request, db *sql.DB, collection Collection){
 
 	t := template.Must(template.ParseFiles("./static/main.html", "./static/nposts.html", "./static/top.html", "./static/bottom.html", "./static/posts.html"))	
diff --git a/database.go b/database.go
index 5fcebf0..037fde2 100644
--- a/database.go
+++ b/database.go
@@ -1504,6 +1504,9 @@ func getNewsFromDB(db *sql.DB) []NewsItem {
 	for rows.Next() {
 		n := NewsItem{}
 		err = rows.Scan(&n.Title, &n.Content, &n.Time)
+		if CheckError(err, "error scanning news from db") != nil {
+			return make([]NewsItem, 0)
+		}
 		news.PushBack(n)
 	}
 	
@@ -1519,6 +1522,27 @@ func getNewsFromDB(db *sql.DB) []NewsItem {
 	return anews
 }
 
+func getNewsItemFromDB(db *sql.DB, timestamp int) (NewsItem, error) {
+	var news NewsItem
+	query := `select title, content, time from newsItem where time=$1 limit 1`
+	
+	rows, err := db.Query(query, timestamp)
+	
+	if err != nil {
+		return news, err
+	}
+	
+	defer rows.Close()
+	rows.Next()
+	err = rows.Scan(&news.Title, &news.Content, &news.Time)
+	
+	if err != nil {
+		return news, err
+	}
+	
+	return news, nil
+}
+
 func WriteNewsToDB(db *sql.DB, news NewsItem) {
 	query := `insert into newsItem (title, content, time) values ($1, $2, $3)`
 	
diff --git a/main.go b/main.go
index 037f240..4f7f3e8 100644
--- a/main.go
+++ b/main.go
@@ -286,6 +286,21 @@ func main() {
 		w.WriteHeader(http.StatusForbidden)			
 		w.Write([]byte("404 no path"))
 	})
+	
+	http.HandleFunc("/news/", func(w http.ResponseWriter, r *http.Request){
+		timestamp := r.URL.Path[6:]
+		if timestamp[len(timestamp)-1:] == "/" {
+			timestamp = timestamp[:len(timestamp)-1]
+		}
+		
+		ts, err := strconv.Atoi(timestamp)
+		if err != nil {
+			w.WriteHeader(http.StatusForbidden)			
+			w.Write([]byte("404 no path"))
+		} else {
+			NewsGet(w, r, db, ts)
+		}
+	})
 
 	http.HandleFunc("/post", func(w http.ResponseWriter, r *http.Request){
 
diff --git a/static/index.html b/static/index.html
index de06c6c..05197c0 100644
--- a/static/index.html
+++ b/static/index.html
@@ -44,7 +44,7 @@
 
     {{ range .NewsItems }}
     <tr>
-      <td><p><em><b>{{.Time}} - {{.Title}}</b></em><br>{{.Content}}</p></td>
+      <td><a href="/news/{{.Time}}">{{unixtoreadable .Time}} - {{.Title}}</a></td>
     </tr>
     {{ end }}
   </table>
diff --git a/static/news.html b/static/news.html
new file mode 100644
index 0000000..757c420
--- /dev/null
+++ b/static/news.html
@@ -0,0 +1,32 @@
+{{ define "header" }}
+<title>{{ .Title }}</title>
+<meta name="description" content="{{ .PreferredUsername }} is a federated image board based on activitypub. The current version of the code running the server is still a work in progress, expect a bumpy ride for the time being. Get the server code here: https://github.com/FChannel0.">    
+
+<meta property="og:locale" content="en_US" />
+<meta property="og:type" content="website" />
+<meta property="og:url" content="{{ .Board.Domain }}">
+<meta property="og:site_name" content="{{ .Board.Actor.PreferredUsername }}" />
+
+<meta property="og:title" content="{{ .Title }}">
+<meta property="og:description" content="{{ .PreferredUsername }} is a federated image board based on activitypub. The current version of the code running the server is still a work in progress, expect a bumpy ride for the time being. Get the server code here: https://github.com/FChannel0.">
+
+<meta name="twitter:title" content="{{ .Title }}">
+<meta name="twitter:description" content="{{ .PreferredUsername }} is a federated image board based on activitypub. The current version of the code running the server is still a work in progress, expect a bumpy ride for the time being. Get the server code here: https://github.com/FChannel0.">
+<meta name="twitter:card" content="summary_large_image">
+
+{{ end }}
+
+{{ define "top" }}{{ end }}
+{{ define "content" }}
+<div style="text-align: left; max-width: 800px; margin: 0 auto;">
+
+    {{ range .NewsItems }}
+      <p><h1>{{unixtoreadable .Time}} - {{.Title}}</h1><br>{{.Content}}</p>
+    {{ end }}
+  
+</div>
+{{ end }}
+{{ define "bottom" }}{{ end }}
+
+{{ define "script" }}
+{{ end }}
-- 
cgit v1.2.3


From d98441da108725a76d697e358d161c06783cb066 Mon Sep 17 00:00:00 2001
From: knotteye <knotteye@airmail.cc>
Date: Fri, 2 Jul 2021 07:43:54 -0500
Subject: Display most recents news item and create a table for boards

---
 client.go         |  2 ++
 static/index.html | 24 ++++++++++++++----------
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/client.go b/client.go
index 38f0d6f..074b645 100644
--- a/client.go
+++ b/client.go
@@ -49,6 +49,7 @@ type PageData struct {
 	InstanceIndex []ObjectBase
 	ReturnTo string
 	NewsItems []NewsItem
+	BoardRemainer []int
 }
 
 type AdminPage struct {
@@ -98,6 +99,7 @@ func IndexGet(w http.ResponseWriter, r *http.Request, db *sql.DB) {
 	data.Board.Actor = actor
 	data.Board.Post.Actor = actor.Id
 	data.Board.Restricted = actor.Restricted
+	data.BoardRemainer = make([]int, (len(data.Boards) % 3)+1)
 	data.InstanceIndex = GetCollectionFromReq("https://fchan.xyz/followers").Items
 	data.NewsItems = getNewsFromDB(db)
 
diff --git a/static/index.html b/static/index.html
index 05197c0..518c012 100644
--- a/static/index.html
+++ b/static/index.html
@@ -23,17 +23,17 @@
   <p style="text-align: justify">{{ .PreferredUsername }} is a federated image board based on activitypub. The current version of the code running the server is still a work in progress, expect a bumpy ride for the time being. Get the server code <a href="https://github.com/FChannel0">here</a>.</p>
   
   <div style="margin-top:50px;">
-  <table align="center" style="text-align: left;">
-    <th>
-      <tr>Local boards</tr>
-    </th>
 
+    <div style="display: grid;border-right: 2px solid #820404">
+      <div style="display: inline-grid;grid-column: 1 / 4;border-bottom: 2px solid #820404;border-left: 2px solid #820404;border-top: 2px solid #820404;"><span style="font-size: 1.5em;font-weight: bold;">Local boards</span></div>
     {{ range .Boards }}
-    <tr>
-      <td><a href="{{.Location}}">{{.Name}} - {{.PrefName}}</a></td>
-    </tr>
+      <div style="whitespace: nowrap;display: inline-grid;text-align: left;padding: 5px;border-bottom: 2px solid #820404;border-left: 2px solid #820404;"><a href="{{.Location}}">{{.Name}} - {{.PrefName}}</a></div>
     {{ end }}
-  </table>
+    {{ range .BoardRemainer }}
+      <div style="whitespace: nowrap;display: inline-grid;text-align: left;padding: 5px;border-bottom: 2px solid #820404;border-left: 2px solid #820404;"></div>
+    {{ end }}
+    </div>
+
   </div>
   
   <div style="margin-top:50px;">
@@ -42,9 +42,13 @@
       <tr>{{ .PreferredUsername }} news</tr>
     </th>
 
-    {{ range .NewsItems }}
+    {{ range $i, $e := .NewsItems }}
     <tr>
-      <td><a href="/news/{{.Time}}">{{unixtoreadable .Time}} - {{.Title}}</a></td>
+      <td><a href="/news/{{.Time}}">{{unixtoreadable $e.Time}} - {{$e.Title}}</a>
+      {{ if eq $i 0 }}
+      <br><p>{{$e.Content}}</p>
+      {{ end }}
+      </td>
     </tr>
     {{ end }}
   </table>
-- 
cgit v1.2.3


From 44f5dd0279b18989dda5123f582e01af6cedb810 Mon Sep 17 00:00:00 2001
From: knotteye <knotteye@airmail.cc>
Date: Fri, 2 Jul 2021 10:24:38 -0500
Subject: Alert user to bad captcha instead of changing the page

---
 static/main.html | 33 ++++++++++++++++++++++++++++++++-
 1 file changed, 32 insertions(+), 1 deletion(-)

diff --git a/static/main.html b/static/main.html
index 72ed321..af9947f 100644
--- a/static/main.html
+++ b/static/main.html
@@ -7,7 +7,38 @@
     <meta name="keywords" content="Federated Imageboard based on Activtypub">    
     <meta property="og:locale" content="en_US" />
     <meta property="og:type" content="website" />
-    <link rel="icon" type="image/png"  href="/static/favicon.png">    
+    <link rel="icon" type="image/png"  href="/static/favicon.png">
+    <script>
+    window.addEventListener('DOMContentLoaded', function(){
+      var np = document.getElementById("new-post")
+      if(np){
+        np.setAttribute("onsubmit", "validatePost(this);return false;")
+      }
+      var np = document.getElementById("reply-post")
+      if(np){
+        np.setAttribute("onsubmit", "validatePost(this);return false;")
+      }
+      var np = document.getElementById("report-post")
+      if(np){
+        np.setAttribute("onsubmit", "validatePost(this);return false;")
+      }
+    })
+    function validatePost(form)
+    {
+      var data = new FormData(form)
+      fetch(form.action, {
+        method: "POST",
+        body: data
+      }).then((r) => {
+        if(r.redirected){
+          document.location = r.url
+        } else {
+          r.text().then((t) => {alert(t)})
+        }
+      })
+      return false
+    }
+    </script>
     <style>
       a, a:link, a:visited, a:hover, a:active {
           text-decoration: none
-- 
cgit v1.2.3


From ad5f4e9ff7e7ab0abab4a964cbf1626d0cdc3365 Mon Sep 17 00:00:00 2001
From: knotteye <knotteye@airmail.cc>
Date: Fri, 2 Jul 2021 13:56:38 -0500
Subject: select a specific number of news items from the database

---
 database.go | 32 ++++++++++++++------------------
 1 file changed, 14 insertions(+), 18 deletions(-)

diff --git a/database.go b/database.go
index 037fde2..7dc7f5c 100644
--- a/database.go
+++ b/database.go
@@ -7,7 +7,6 @@ import "time"
 import "os"
 import "strings"
 import "sort"
-import "container/list"
 
 func GetActorFromDB(db *sql.DB, id string) Actor {
        var nActor Actor
@@ -1490,14 +1489,20 @@ func MarkObjectSensitive(db *sql.DB, id string, sensitive bool) {
 	CheckError(err, "error updating sensitive object in cacheactivitystream")	
 }
 
-func getNewsFromDB(db *sql.DB) []NewsItem {
-	news := list.New()
-	query :=`select title, content, time from newsItem order by time desc`
+//if limit less than 1 return all news items
+func getNewsFromDB(db *sql.DB, limit int) []NewsItem {
+	news := []NewsItem
+	
+	if(limit > 0) {
+		query :=`select title, content, time from newsItem order by time desc limit $1`
+	} else {
+		query :=`select title, content, time from newsItem order by time desc`
+	}
 
-	rows, err := db.Query(query)
+	rows, err := db.Query(query, limit)
 
 	if CheckError(err, "could not get news from db query") != nil {
-		return make([]NewsItem, 0)
+		return news
 	}
 
 	defer rows.Close()
@@ -1505,21 +1510,12 @@ func getNewsFromDB(db *sql.DB) []NewsItem {
 		n := NewsItem{}
 		err = rows.Scan(&n.Title, &n.Content, &n.Time)
 		if CheckError(err, "error scanning news from db") != nil {
-			return make([]NewsItem, 0)
+			return news
 		}
-		news.PushBack(n)
+		append(news, n)
 	}
 	
-	anews := make([]NewsItem, news.Len())
-	
-	i:=0
-	for e := news.Front(); e != nil; e = e.Next() {
-		assert := e.Value.(NewsItem)
-		anews[i] = assert
-		i++
-	}
-
-	return anews
+	return news
 }
 
 func getNewsItemFromDB(db *sql.DB, timestamp int) (NewsItem, error) {
-- 
cgit v1.2.3


From faae38726dd804e3246514d88f93794c23a0cdb2 Mon Sep 17 00:00:00 2001
From: knotteye <knotteye@airmail.cc>
Date: Fri, 2 Jul 2021 14:20:16 -0500
Subject: show only the last 3 news items on index, link to a page with all
 news items

---
 client.go         | 23 ++++++++++++++++++++++-
 database.go       | 18 +++++++++++++-----
 main.go           |  6 ++++++
 static/anews.html | 44 ++++++++++++++++++++++++++++++++++++++++++++
 static/index.html |  2 +-
 5 files changed, 86 insertions(+), 7 deletions(-)
 create mode 100644 static/anews.html

diff --git a/client.go b/client.go
index be79cdd..a5fb5bb 100644
--- a/client.go
+++ b/client.go
@@ -102,7 +102,7 @@ func IndexGet(w http.ResponseWriter, r *http.Request, db *sql.DB) {
 	data.Board.Restricted = actor.Restricted
 	data.BoardRemainer = make([]int, (len(data.Boards) % 3)+1)
 	data.InstanceIndex = GetCollectionFromReq("https://fchan.xyz/followers").Items
-	data.NewsItems = getNewsFromDB(db)
+	data.NewsItems = getNewsFromDB(db, 3)
 
 	t.ExecuteTemplate(w, "layout",  data)
 }
@@ -138,6 +138,27 @@ func NewsGet(w http.ResponseWriter, r *http.Request, db *sql.DB, timestamp int)
 	t.ExecuteTemplate(w, "layout",  data)
 }
 
+func AllNewsGet(w http.ResponseWriter, r *http.Request, db *sql.DB) {
+	t := template.Must(template.New("").Funcs(template.FuncMap{"unixtoreadable": func(u int) string { return time.Unix(int64(u), 0).Format("Jan 02, 2006") }}).ParseFiles("./static/main.html", "./static/anews.html"))
+	
+	actor := GetActorFromDB(db, Domain)
+
+	var data PageData
+	data.PreferredUsername = actor.PreferredUsername
+	data.Title = actor.PreferredUsername + " News"
+	data.Boards = Boards
+	data.Board.Name = ""
+	data.Key = *Key
+	data.Board.Domain = Domain
+	data.Board.ModCred, _ = GetPasswordFromSession(r)
+	data.Board.Actor = actor
+	data.Board.Post.Actor = actor.Id
+	data.Board.Restricted = actor.Restricted
+	data.NewsItems = getNewsFromDB(db, 0)
+
+	t.ExecuteTemplate(w, "layout",  data)
+}
+
 func OutboxGet(w http.ResponseWriter, r *http.Request, db *sql.DB, collection Collection){
 
 	t := template.Must(template.ParseFiles("./static/main.html", "./static/nposts.html", "./static/top.html", "./static/bottom.html", "./static/posts.html"))	
diff --git a/database.go b/database.go
index 7dc7f5c..731f160 100644
--- a/database.go
+++ b/database.go
@@ -1491,15 +1491,23 @@ func MarkObjectSensitive(db *sql.DB, id string, sensitive bool) {
 
 //if limit less than 1 return all news items
 func getNewsFromDB(db *sql.DB, limit int) []NewsItem {
-	news := []NewsItem
+	var news []NewsItem
 	
+	var query string
 	if(limit > 0) {
-		query :=`select title, content, time from newsItem order by time desc limit $1`
+		query =`select title, content, time from newsItem order by time desc limit $1`
 	} else {
-		query :=`select title, content, time from newsItem order by time desc`
+		query =`select title, content, time from newsItem order by time desc`
 	}
 
-	rows, err := db.Query(query, limit)
+	var rows *sql.Rows
+	var err error
+	if(limit > 0) {
+		rows, err = db.Query(query, limit)
+	} else {
+		rows, err = db.Query(query)
+	}
+	
 
 	if CheckError(err, "could not get news from db query") != nil {
 		return news
@@ -1512,7 +1520,7 @@ func getNewsFromDB(db *sql.DB, limit int) []NewsItem {
 		if CheckError(err, "error scanning news from db") != nil {
 			return news
 		}
-		append(news, n)
+		news = append(news, n)
 	}
 	
 	return news
diff --git a/main.go b/main.go
index 69e8902..3eb47c0 100644
--- a/main.go
+++ b/main.go
@@ -293,6 +293,12 @@ func main() {
 	
 	http.HandleFunc("/news/", func(w http.ResponseWriter, r *http.Request){
 		timestamp := r.URL.Path[6:]
+
+		if(len(timestamp) < 2) {
+			AllNewsGet(w, r, db)
+			return
+		}
+
 		if timestamp[len(timestamp)-1:] == "/" {
 			timestamp = timestamp[:len(timestamp)-1]
 		}
diff --git a/static/anews.html b/static/anews.html
new file mode 100644
index 0000000..6527ce5
--- /dev/null
+++ b/static/anews.html
@@ -0,0 +1,44 @@
+{{ define "header" }}
+<title>{{ .Title }}</title>
+<meta name="description" content="{{ .PreferredUsername }} is a federated image board based on activitypub. The current version of the code running the server is still a work in progress, expect a bumpy ride for the time being. Get the server code here: https://github.com/FChannel0.">    
+
+<meta property="og:locale" content="en_US" />
+<meta property="og:type" content="website" />
+<meta property="og:url" content="{{ .Board.Domain }}">
+<meta property="og:site_name" content="{{ .Board.Actor.PreferredUsername }}" />
+
+<meta property="og:title" content="{{ .Title }}">
+<meta property="og:description" content="{{ .PreferredUsername }} is a federated image board based on activitypub. The current version of the code running the server is still a work in progress, expect a bumpy ride for the time being. Get the server code here: https://github.com/FChannel0.">
+
+<meta name="twitter:title" content="{{ .Title }}">
+<meta name="twitter:description" content="{{ .PreferredUsername }} is a federated image board based on activitypub. The current version of the code running the server is still a work in progress, expect a bumpy ride for the time being. Get the server code here: https://github.com/FChannel0.">
+<meta name="twitter:card" content="summary_large_image">
+
+{{ end }}
+
+{{ define "top" }}{{ end }}
+{{ define "content" }}
+<div style="text-align: center; max-width: 800px; margin: 0 auto;">
+  <h1>{{ .Title }}</h1>
+
+  <div style="margin-top:50px;">
+  <table align="center" style="text-align: left;">
+    
+    {{ range $i, $e := .NewsItems }}
+    <tr>
+      <td><a href="/news/{{.Time}}">{{unixtoreadable $e.Time}} - {{$e.Title}}</a>
+      {{ if eq $i 0 }}
+      <br><p>{{$e.Content}}</p>
+      {{ end }}
+      </td>
+    </tr>
+    {{ end }}
+  </table>
+  </div>
+  
+</div>
+{{ end }}
+{{ define "bottom" }}{{ end }}
+
+{{ define "script" }}
+{{ end }}
diff --git a/static/index.html b/static/index.html
index 518c012..106a6b3 100644
--- a/static/index.html
+++ b/static/index.html
@@ -39,7 +39,7 @@
   <div style="margin-top:50px;">
   <table align="center" style="text-align: left;">
     <th>
-      <tr>{{ .PreferredUsername }} news</tr>
+      <tr><a href="/news">{{ .PreferredUsername }} news</a></tr>
     </th>
 
     {{ range $i, $e := .NewsItems }}
-- 
cgit v1.2.3


From fab8de7187571a4f3f8a30966057d661a858b645 Mon Sep 17 00:00:00 2001
From: knotteye <knotteye@airmail.cc>
Date: Fri, 2 Jul 2021 15:10:49 -0500
Subject: add deletion of news items

---
 database.go       |  5 +++++
 main.go           | 15 +++++++++++++++
 static/anews.html |  4 +++-
 static/index.html |  3 ++-
 4 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/database.go b/database.go
index 731f160..6a871ba 100644
--- a/database.go
+++ b/database.go
@@ -1547,6 +1547,11 @@ func getNewsItemFromDB(db *sql.DB, timestamp int) (NewsItem, error) {
 	return news, nil
 }
 
+func deleteNewsItemFromDB(db *sql.DB, timestamp int) {
+	query := `delete from newsItem where time=$1`
+	db.Exec(query, timestamp)
+}
+
 func WriteNewsToDB(db *sql.DB, news NewsItem) {
 	query := `insert into newsItem (title, content, time) values ($1, $2, $3)`
 	
diff --git a/main.go b/main.go
index 3eb47c0..f98add9 100644
--- a/main.go
+++ b/main.go
@@ -634,6 +634,21 @@ func main() {
 		
 		http.Redirect(w, r, "/", http.StatusSeeOther)		
 	})
+	
+	http.HandleFunc("/" + *Key + "/newsdelete/", func(w http.ResponseWriter, r *http.Request){
+		timestamp := r.URL.Path[13+len(*Key):]
+		
+		tsint, err := strconv.Atoi(timestamp)
+		
+		if(err != nil){
+			w.WriteHeader(http.StatusForbidden)			
+			w.Write([]byte("404 no path"))
+			return
+		} else {
+			deleteNewsItemFromDB(db, tsint)
+			http.Redirect(w, r, "/news/", http.StatusSeeOther)
+		}
+	})
 
 	http.HandleFunc("/verify", func(w http.ResponseWriter, r *http.Request){
 		if(r.Method == "POST") {
diff --git a/static/anews.html b/static/anews.html
index 6527ce5..127760a 100644
--- a/static/anews.html
+++ b/static/anews.html
@@ -26,7 +26,9 @@
     
     {{ range $i, $e := .NewsItems }}
     <tr>
-      <td><a href="/news/{{.Time}}">{{unixtoreadable $e.Time}} - {{$e.Title}}</a>
+      <td>
+          {{ if $.Board.ModCred }}<a href="/{{ $.Key }}/newsdelete/{{ $e.Time }}">[Delete] </a>{{end}}
+      <a href="/news/{{.Time}}">{{unixtoreadable $e.Time}} - {{$e.Title}}</a>
       {{ if eq $i 0 }}
       <br><p>{{$e.Content}}</p>
       {{ end }}
diff --git a/static/index.html b/static/index.html
index 106a6b3..61aeab8 100644
--- a/static/index.html
+++ b/static/index.html
@@ -44,7 +44,8 @@
 
     {{ range $i, $e := .NewsItems }}
     <tr>
-      <td><a href="/news/{{.Time}}">{{unixtoreadable $e.Time}} - {{$e.Title}}</a>
+      <td>{{ if $.Board.ModCred }}<a href="/{{ $.Key }}/newsdelete/{{ $e.Time }}">[Delete] </a>{{end}} 
+      <a href="/news/{{.Time}}">{{unixtoreadable $e.Time}} - {{$e.Title}}</a>
       {{ if eq $i 0 }}
       <br><p>{{$e.Content}}</p>
       {{ end }}
-- 
cgit v1.2.3


From fc8b4d6517213a371e26938ff2c0319d5e5f459a Mon Sep 17 00:00:00 2001
From: knotteye <knotteye@airmail.cc>
Date: Fri, 2 Jul 2021 15:22:00 -0500
Subject: fix board remainder calculation

---
 client.go | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/client.go b/client.go
index a5fb5bb..f71fb7d 100644
--- a/client.go
+++ b/client.go
@@ -100,7 +100,12 @@ func IndexGet(w http.ResponseWriter, r *http.Request, db *sql.DB) {
 	data.Board.Actor = actor
 	data.Board.Post.Actor = actor.Id
 	data.Board.Restricted = actor.Restricted
-	data.BoardRemainer = make([]int, (len(data.Boards) % 3)+1)
+	//almost certainly there is a better algorithm for this but the old one was wrong
+	//and I suck at math. This works at least.
+	data.BoardRemainer = make([]int, 3-(len(data.Boards) % 3))
+	if(len(data.BoardRemainer) == 3){
+		data.BoardRemainer = make([]int, 0)
+	}
 	data.InstanceIndex = GetCollectionFromReq("https://fchan.xyz/followers").Items
 	data.NewsItems = getNewsFromDB(db, 3)
 
-- 
cgit v1.2.3


From 9bd4e03d926c045dc82ce844cb02b078843ce787 Mon Sep 17 00:00:00 2001
From: FChannel <>
Date: Fri, 2 Jul 2021 13:40:12 -0700
Subject: removed javascript for post validation because it broke board
 creation

---
 static/admin.html |  2 +-
 static/main.html  | 31 -------------------------------
 2 files changed, 1 insertion(+), 32 deletions(-)

diff --git a/static/admin.html b/static/admin.html
index a4c61c1..f238ec0 100644
--- a/static/admin.html
+++ b/static/admin.html
@@ -6,7 +6,7 @@
   <body>
     <div style="margin: 0 auto; width: 400px;">
       <h3>Add Board</h3>
-      <form id="new-post" action="/{{ .Key }}/addboard" method="post" enctype="application/x-www-form-urlencoded">
+      <form id="new-board" action="/{{ .Key }}/addboard" method="post" enctype="application/x-www-form-urlencoded">
         <label>Name:</label><br>
         <input type="text" name="name" placeholder="g" required><br>
         <label>Prefered Name:</label><br>
diff --git a/static/main.html b/static/main.html
index af9947f..70e3c23 100644
--- a/static/main.html
+++ b/static/main.html
@@ -8,37 +8,6 @@
     <meta property="og:locale" content="en_US" />
     <meta property="og:type" content="website" />
     <link rel="icon" type="image/png"  href="/static/favicon.png">
-    <script>
-    window.addEventListener('DOMContentLoaded', function(){
-      var np = document.getElementById("new-post")
-      if(np){
-        np.setAttribute("onsubmit", "validatePost(this);return false;")
-      }
-      var np = document.getElementById("reply-post")
-      if(np){
-        np.setAttribute("onsubmit", "validatePost(this);return false;")
-      }
-      var np = document.getElementById("report-post")
-      if(np){
-        np.setAttribute("onsubmit", "validatePost(this);return false;")
-      }
-    })
-    function validatePost(form)
-    {
-      var data = new FormData(form)
-      fetch(form.action, {
-        method: "POST",
-        body: data
-      }).then((r) => {
-        if(r.redirected){
-          document.location = r.url
-        } else {
-          r.text().then((t) => {alert(t)})
-        }
-      })
-      return false
-    }
-    </script>
     <style>
       a, a:link, a:visited, a:hover, a:active {
           text-decoration: none
-- 
cgit v1.2.3


From dd6189378cbc4c8ad22b95951b103880dd39060d Mon Sep 17 00:00:00 2001
From: sageman_ <sageman@anomine.net>
Date: Sat, 3 Jul 2021 14:30:14 +0200
Subject: Implement auto-reload functionality A constant 5 second reload
 interval instead of increasing the reload intervals by 5 seconds every time
 so that the user does not miss any time sensitive posts. This also works with
 the invalid captcha patch.

---
 static/js/timer.js | 38 ++++++++++++++++++++++++++++++++++++++
 static/npost.html  |  2 ++
 2 files changed, 40 insertions(+)
 create mode 100644 static/js/timer.js

diff --git a/static/js/timer.js b/static/js/timer.js
new file mode 100644
index 0000000..8f6516c
--- /dev/null
+++ b/static/js/timer.js
@@ -0,0 +1,38 @@
+var timerCount;
+var timerToggle = false;
+var timer;
+const contentLoadHandler = function(event){
+    timerToggle = !!document.getElementById("autoreload-checkbox").checked;
+    if(timerToggle){
+        timerCount = 5;
+        document.getElementById("autoreload-countdown").innerHTML = "5";
+        document.getElementById("autoreload-countdown").style.visibility = "visible";
+        timer = setInterval(timerFunction, 1000);
+        document.removeEventListener("DOMContentLoaded", contentLoadHandler, false);
+    }
+};
+
+document.addEventListener("DOMContentLoaded", contentLoadHandler, false);
+
+function timerFunction(){
+    timerCount--;
+    document.getElementById("autoreload-countdown").innerHTML = timerCount;
+    if(timerCount <= 0){
+        document.getElementById("autoreload-countdown").innerHTML = "Refreshing...";
+        clearInterval(timer);
+        location.reload();
+    }
+}
+
+function autoTimer(){
+    timerToggle = !timerToggle;
+    if(timerToggle === true){
+        timerCount = 5;
+        document.getElementById("autoreload-countdown").innerHTML = "5";
+        document.getElementById("autoreload-countdown").style.visibility = "visible";
+        timer = setInterval(timerFunction, 1000);
+    }else{
+        clearInterval(timer);
+        document.getElementById("autoreload-countdown").style.visibility = "hidden";
+    }
+}
\ No newline at end of file
diff --git a/static/npost.html b/static/npost.html
index 740018b..3df4090 100644
--- a/static/npost.html
+++ b/static/npost.html
@@ -17,6 +17,7 @@
 {{ end }}
 
 <script src="/static/js/posts.js"></script>
+<script src="/static/js/timer.js"></script>
 {{ end }}
 
 {{ define "content" }}
@@ -39,6 +40,7 @@
   <li style="display: inline"><a href="/{{ $board.Name }}/catalog">[Catalog]</a></li>            
   <li style="display: inline"><a id="bottom" href="#top">[Top]</a></li>
   <li style="display: inline"><a href="javascript:location.reload()">[Refresh]</a></li>
+  <li style="display: inline"><input id="autoreload-checkbox" type="checkbox" onclick="autoTimer()"> Auto refresh <span id="autoreload-countdown" style="visibility: hidden;">0</span></li>
 </ul>
 {{ $replies := (index .Posts 0).Replies }}            
 <span style="float: right;">{{ $replies.TotalItems }} / {{ $replies.TotalImgs }}</span>
-- 
cgit v1.2.3


From 8e3e745c2a8e9f1db6d15a67829b2aa320731c3f Mon Sep 17 00:00:00 2001
From: sageman_ <sageman@anomine.net>
Date: Sat, 3 Jul 2021 16:48:50 +0200
Subject: Preserve reply and report window states Especially important since
 auto-reload gets rid of what you wrote without this patch except for those
 who use the classic reply form. However, this introduces a lot of bloat to
 the code and a lot of data kept on the client-side. Perhaps we could
 implement a no JavaScript version? Also semicolons because apparently
 JavaScript is *this* forgiving.

---
 static/bottom.html        |   4 +-
 static/js/footerscript.js |  24 ++--
 static/js/posts.js        | 273 +++++++++++++++++++++++++++++++++-------------
 3 files changed, 209 insertions(+), 92 deletions(-)

diff --git a/static/bottom.html b/static/bottom.html
index db9606d..994ad89 100644
--- a/static/bottom.html
+++ b/static/bottom.html
@@ -4,7 +4,7 @@
   <form id="reply-post" action="/post" method="post" enctype="multipart/form-data">
     <input id="reply-name" name="name" size="43" type="text" placeholder="Name" maxlength="100">
     <input id="reply-options" name="options" size="43" type="text" placeholder="Options" maxlength="100">
-    <textarea id="reply-comment" name="comment" rows="12" cols="54" style="width: 396px;" maxlength="2000"></textarea>
+    <textarea id="reply-comment" name="comment" rows="12" cols="54" style="width: 396px;" maxlength="2000" oninput="sessionStorage.setItem('element-reply-comment', document.getElementById('reply-comment').value)"></textarea>
     <input id="reply-file" name="file" type="file">
     <input id="reply-submit" type="submit" value="Reply" style="float: right;"><br><br>
     <input type="hidden" id="inReplyTo-box" name="inReplyTo" value="{{ .Board.InReplyTo }}">
@@ -27,7 +27,7 @@
   <div id="report-header" style="text-align: center; display: inline-block; width: 370px; z-index: 0; cursor: move;"></div><div id="report-close" style="display: inline-block; float: right;"><a href="javascript:closeReport()">[X]</a></div>
   <form id="report-post" action="/report" method="post">
     <label for="comment">Reason:</label>
-    <textarea id="report-comment" name="comment" rows="12" cols="54" style="width: 396px;" maxlength="100"></textarea>
+    <textarea id="report-comment" name="comment" rows="12" cols="54" style="width: 396px;" maxlength="100" oninput="sessionStorage.setItem('element-report-comment', document.getElementById('report-comment').value)"></textarea>
     <input id="report-submit" type="submit" value="Report" style="float: right;">
     <input type="hidden" id="report-inReplyTo-box" name="id" value="{{ .Board.InReplyTo }}">
     <input type="hidden" id="sendTo" name="sendTo" value="{{ .Board.To }}">
diff --git a/static/js/footerscript.js b/static/js/footerscript.js
index a63f422..69e56e7 100644
--- a/static/js/footerscript.js
+++ b/static/js/footerscript.js
@@ -3,34 +3,34 @@ var imgArray = [].slice.call(imgs);
 
 imgArray.forEach(function(img, i){
     img.addEventListener("click", function(e){
-        var id = img.getAttribute("id")
-        var media = document.getElementById("media-" + id)
-        var sensitive = document.getElementById("sensitive-" + id)        
+        var id = img.getAttribute("id");
+        var media = document.getElementById("media-" + id);
+        var sensitive = document.getElementById("sensitive-" + id);     
         
         if(img.getAttribute("enlarge") == "0")
         {
-            var attachment = img.getAttribute("attachment")
+            var attachment = img.getAttribute("attachment");
             img.setAttribute("enlarge", "1");
             img.setAttribute("style", "float: left; margin-right: 10px; cursor: pointer;");
-            img.src = attachment
+            img.src = attachment;
         }
         else
         {
-            var preview = img.getAttribute("preview")
+            var preview = img.getAttribute("preview");
             img.setAttribute("enlarge", "0");
             if(img.getAttribute("main") == 1)
             {
                 img.setAttribute("style", "float: left; margin-right: 10px; max-width: 250px; max-height: 250px; cursor: pointer;");
-                img.src = preview
+                img.src = preview;
             }
             else
             {
                 img.setAttribute("style", "float: left; margin-right: 10px; max-width: 125px; max-height: 125px; cursor: pointer;");
-                img.src = preview                
+                img.src = preview;
             }
         }
     });
-})
+});
 
 
 function viewLink(board, actor) {
@@ -38,7 +38,7 @@ function viewLink(board, actor) {
     var postsArray = [].slice.call(posts);
 
     postsArray.forEach(function(p, i){
-        var id = p.getAttribute("post")
-        p.href = "/" + board + "/" + shortURL(actor, id)
-    })  
+        var id = p.getAttribute("post");
+        p.href = "/" + board + "/" + shortURL(actor, id);
+    });
 }
diff --git a/static/js/posts.js b/static/js/posts.js
index 79fb7c4..d91fadd 100644
--- a/static/js/posts.js
+++ b/static/js/posts.js
@@ -1,33 +1,44 @@
+function startNewPost(){
+    var el = document.getElementById("newpostbtn");
+    el.style="display:none;";
+    el.setAttribute("state", "1");
+    document.getElementById("newpost").style = "display: block;";  
+}
+
+function stopNewPost(){
+    var el = document.getElementById("newpostbtn");
+    el.style="display:block;";
+    el.setAttribute("state", "0");
+    document.getElementById("newpost").style = "display: hidden;"; 
+}
+
 function newpost()
 {
-    var el = document.getElementById("newpostbtn")
-    var state = el.getAttribute("state")
-    if(state = "0")
+    var state = document.getElementById("newpostbtn").getAttribute("state");
+    if(state === "0")
     {
-        el.style="display:none;"
-        el.setAttribute("state", "1")
-        document.getElementById("newpost").style = "display: block;";        
+        startNewPost();
+        sessionStorage.setItem("newpostState", true);    
     }
     else
     {
-        el.style="display:block;"
-        el.setAttribute("state", "0")
-        document.getElementById("newpost").style = "display: hidden;";        
+        stopNewPost();
+        sessionStorage.setItem("newpostState", false);      
     }
 }
 
 function getMIMEType(type)
 {
-    re = /\/.+/g
-    return type.replace(re, "")
+    re = /\/.+/g;
+    return type.replace(re, "");
 }
 
 function shortURL(actorName, url)
 {
     re = /.+\//g;
-    temp = re.exec(url)
+    temp = re.exec(url);
 
-    var output
+    var output;
     
     if(stripTransferProtocol(temp[0]) == stripTransferProtocol(actorName) + "/")
     {
@@ -55,18 +66,18 @@ function shortURL(actorName, url)
 
         u =  re.exec(short);
 
-        str = short.replace(/\/+/g, " ")
+        str = short.replace(/\/+/g, " ");
 
-        str = str.replace(u, " ").trim()
+        str = str.replace(u, " ").trim();
 
         re = /(\w|[!@#$%^&*<>])+$/;
         
-        v = re.exec(str)
+        v = re.exec(str);
 
         output = "f" + v[0] + "-" + u
     }
 
-    return output
+    return output;
 }
 
 function shortImg(url)
@@ -92,22 +103,22 @@ function convertSize(size)
     var convert = size / 1024.0;
     if(convert > 1024)
     {
-        convert = convert / 1024.0
-        convert = convert.toFixed(2) + " MB"
+        convert = convert / 1024.0;
+        convert = convert.toFixed(2) + " MB";
     }
     else
     {
-        convert = convert.toFixed(2) + " KB"
+        convert = convert.toFixed(2) + " KB";
     }
 
-    return convert
+    return convert;
 }
 
 function getBoardId(url)
 {
-    var re = /\/([^/\n]+)(.+)?/gm
+    var re = /\/([^/\n]+)(.+)?/gm;
     var matches = re.exec(url);
-    return matches[1]
+    return matches[1];
 }
 
 function convertContent(actorName, content, opid)
@@ -118,24 +129,24 @@ function convertContent(actorName, content, opid)
     if(match)
     {
         match.forEach(function(quote, i){
-            var link = quote.replace('>>', '')
-            var isOP = ""
+            var link = quote.replace('>>', '');
+            var isOP = "";
             if(link == opid)
             {
                 isOP = " (OP)";
             }
             
-            var q = link
+            var q = link;
             
             if(document.getElementById(link + "-content") != null) {
                 q = document.getElementById(link + "-content").innerText;
-                q = q.replaceAll('>', '/\>')
-                q = q.replaceAll('"', '')
-                q = q.replaceAll("'", "")                                
+                q = q.replaceAll('>', '/\>');
+                q = q.replaceAll('"', '');
+                q = q.replaceAll("'", "");                       
             }
             newContent = newContent.replace(quote, '<a class="reply" title="' + q +  '" href="'+ (actorName) + "/" + shortURL(actorName, opid)  +  '#' + shortURL(actorName, link) + '";">>>' + shortURL(actorName, link)  + isOP + '</a>');
 
-        })            
+        });           
     }
     
     re =  /^(\s+)?>.+/gm;
@@ -146,10 +157,10 @@ function convertContent(actorName, content, opid)
         match.forEach(function(quote, i) {
     
             newContent = newContent.replace(quote, '<span class="quote">' + quote + '</span>');
-        })
+        });
     }
     
-    return newContent.replaceAll('/\>', '>')
+    return newContent.replaceAll('/\>', '>');
 }
 
 function convertContentNoLink(actorName, content, opid)
@@ -160,36 +171,40 @@ function convertContentNoLink(actorName, content, opid)
     if(match)
     {
         match.forEach(function(quote, i){
-            var link = quote.replace('>>', '')
-            var isOP = ""
+            var link = quote.replace('>>', '');
+            var isOP = "";
             if(link == opid)
             {
                 isOP = " (OP)";
             }
             
-            var q = link
+            var q = link;
             
             if(document.getElementById(link + "-content") != null) {
                 q = document.getElementById(link + "-content").innerText;
             }
             
             newContent = newContent.replace(quote, '>>' + shortURL(actorName, link)  + isOP);
-        })            
+        });   
     }
-    newContent = newContent.replaceAll("'", "")
-    return newContent.replaceAll('"', '')
+    newContent = newContent.replaceAll("'", "");
+    return newContent.replaceAll('"', '');
 }
 
 function closeReply()
 {
     document.getElementById("reply-box").style.display = "none";
-    document.getElementById("reply-comment").value = "";        
+    document.getElementById("reply-comment").value = "";      
+      
+    sessionStorage.setItem("element-closed-reply", true);
 }
 
 function closeReport()
 {
     document.getElementById("report-box").style.display = "none";
     document.getElementById("report-comment").value = "";        
+
+    sessionStorage.setItem("element-closed-report", true);
 }
 
 
@@ -211,10 +226,11 @@ function next(actorName, totalPage, page)
 
 function quote(actorName, opid, id)
 {
+    sessionStorage.setItem("element-closed-reply", false);
     var box = document.getElementById("reply-box");
     var header = document.getElementById("reply-header");
     var comment = document.getElementById("reply-comment");
-    var inReplyTo = document.getElementById("inReplyTo-box");      
+    var inReplyTo = document.getElementById("inReplyTo-box");
 
     var w = window.innerWidth / 2 - 200;
     if(id == "reply") {
@@ -223,8 +239,11 @@ function quote(actorName, opid, id)
         var h = document.getElementById(id + "-content").offsetTop - 348;
     }
 
-
-    box.setAttribute("style", "display: block; position: absolute; width: 400px; height: 600px; z-index: 9; top: " + h + "px; left: " + w + "px; padding: 5px;");
+    const boxStyle = "display: block; position: absolute; width: 400px; height: 600px; z-index: 9; top: " + h + "px; left: " + w + "px; padding: 5px;";
+    box.setAttribute("style", boxStyle);
+    sessionStorage.setItem("element-reply-style", boxStyle);
+    sessionStorage.setItem("reply-top", h);
+    sessionStorage.setItem("reply-left", w);
 
 
     if (inReplyTo.value != opid)
@@ -232,9 +251,12 @@ function quote(actorName, opid, id)
     
     header.innerText = "Replying to Thread No. " + shortURL(actorName, opid);
     inReplyTo.value = opid;
+    sessionStorage.setItem("element-reply-actor", actorName);
+    sessionStorage.setItem("element-reply-id", inReplyTo.value);
 
     if(id != "reply")
         comment.value += ">>" + id + "\n";
+    sessionStorage.setItem("element-reply-comment", comment.value);
 
     dragElement(header);            
 
@@ -242,66 +264,161 @@ function quote(actorName, opid, id)
 
 function report(actorName, id)
 {
+    sessionStorage.setItem("element-closed-report", false);
     var box = document.getElementById("report-box");
     var header = document.getElementById("report-header");
     var comment = document.getElementById("report-comment");
-    var inReplyTo = document.getElementById("report-inReplyTo-box");      
+    var inReplyTo = document.getElementById("report-inReplyTo-box");    
 
     var w = window.innerWidth / 2 - 200;
     var h = document.getElementById(id + "-content").offsetTop - 348;
 
-    box.setAttribute("style", "display: block; position: absolute; width: 400px; height: 480px; z-index: 9; top: " + h + "px; left: " + w + "px; padding: 5px;");
+    const boxStyle = "display: block; position: absolute; width: 400px; height: 480px; z-index: 9; top: " + h + "px; left: " + w + "px; padding: 5px;";
+    box.setAttribute("style", boxStyle);
+    sessionStorage.setItem("element-report-style", boxStyle);
+    sessionStorage.setItem("report-top", h);
+    sessionStorage.setItem("report-left", w);
 
     header.innerText = "Report Post No. " + shortURL(actorName, id);
     inReplyTo.value = id;
+    sessionStorage.setItem("element-report-actor", actorName);
+    sessionStorage.setItem("element-report-id", id);
 
     dragElement(header);            
 }  
 
+var pos1, pos2, pos3, pos4;
+var elmnt;
+
+function closeDragElement(e) {
+    // stop moving when mouse button is released:
+    document.onmouseup = null;
+    document.onmousemove = null;
+    sessionStorage.setItem("eventhandler", false);
+}
+
+function elementDrag(e) {
+    e = e || window.event;
+    e.preventDefault();
+    // calculate the new cursor position:
+    pos1 = pos3 - e.clientX;
+    pos2 = pos4 - e.clientY;
+    pos3 = e.clientX;
+    pos4 = e.clientY;
+    sessionStorage.setItem("pos1", pos1);
+    sessionStorage.setItem("pos2", pos2);
+    sessionStorage.setItem("pos3", pos3);
+    sessionStorage.setItem("pos4", pos4);
+
+    // set the element's new position:
+    elmnt.parentElement.style.top = (elmnt.parentElement.offsetTop - pos2) + "px";
+    elmnt.parentElement.style.left = (elmnt.parentElement.offsetLeft - pos1) + "px";
+    if(elmnt.id.startsWith("report")){
+        sessionStorage.setItem("report-top", elmnt.parentElement.style.top);
+        sessionStorage.setItem("report-left", elmnt.parentElement.style.left);
+    }else if(elmnt.id.startsWith("reply")){
+        sessionStorage.setItem("reply-top", elmnt.parentElement.style.top);
+        sessionStorage.setItem("reply-left", elmnt.parentElement.style.left);
+    }
+}
+
+function dragMouseDown(e) {
+    e = e || window.event;
+    e.preventDefault();
+
+    // get the mouse cursor position at startup:
+    pos3 = e.clientX;
+    pos4 = e.clientY;
+    sessionStorage.setItem("pos3", pos3);
+    sessionStorage.setItem("pos4", pos4);
+
+    elmnt = e.currentTarget;
+
+    // call a function whenever the cursor moves:
+    document.onmouseup = closeDragElement;
+    document.onmousemove = elementDrag;
+    sessionStorage.setItem("eventhandler", true);
+
+}
+
 function dragElement(elmnt) {
-    var pos1 = 0, pos2 = 0, pos3 = 0, pos4 = 0;
-    
     elmnt.onmousedown = dragMouseDown;
+}
 
-    function dragMouseDown(e) {
-        e = e || window.event;
-        e.preventDefault();
-        // get the mouse cursor position at startup:
-        pos3 = e.clientX;
-        pos4 = e.clientY;
-        document.onmouseup = closeDragElement;
-        // call a function whenever the cursor moves:
-        document.onmousemove = elementDrag;
-    }
+const stateLoadHandler = function(event){
+    pos1 = parseInt(sessionStorage.getItem("pos1"));
+    pos2 = parseInt(sessionStorage.getItem("pos2"));
+    pos3 = parseInt(sessionStorage.getItem("pos3"));
+    pos4 = parseInt(sessionStorage.getItem("pos4"));
 
-    function elementDrag(e) {
-        e = e || window.event;
-        e.preventDefault();
-        // calculate the new cursor position:
-        pos1 = pos3 - e.clientX;
-        pos2 = pos4 - e.clientY;
-        pos3 = e.clientX;
-        pos4 = e.clientY;
-        // set the element's new position:
-        elmnt.parentElement.style.top = (elmnt.parentElement.offsetTop - pos2) + "px";
-        elmnt.parentElement.style.left = (elmnt.parentElement.offsetLeft - pos1) + "px";
-    }
+    if(sessionStorage.getItem("element-closed-report") === "false"){
+        var box = document.getElementById("report-box");
+        var header = document.getElementById("report-header");
+        var comment = document.getElementById("report-comment");
+        var inReplyTo = document.getElementById("report-inReplyTo-box");
 
-    function closeDragElement() {
-        // stop moving when mouse button is released:
-        document.onmouseup = null;
-        document.onmousemove = null;
+        header.onmousedown = dragMouseDown;
+        inReplyTo.value = parseInt(sessionStorage.getItem("element-report-id"));
+        header.innerText = "Report Post No. " + shortURL(sessionStorage.getItem("element-report-actor"), sessionStorage.getItem("element-report-id"));
+        comment.value = sessionStorage.getItem("element-report-comment");
+
+        box.setAttribute("style", sessionStorage.getItem("element-report-style"));
+            
+        box.style.top = sessionStorage.getItem("report-top");
+        box.style.left = sessionStorage.getItem("report-left");
+
+        if(sessionStorage.getItem("eventhandler") === "true"){
+            elmnt = header;
+            document.onmouseup = closeDragElement;
+            document.onmousemove = elementDrag;
+        }else{
+            document.onmouseup = null;
+            document.onmousemove = null;
+        }
     }
-}
+    if(sessionStorage.getItem("element-closed-reply") === "false"){
+        var box = document.getElementById("reply-box");
+        var header = document.getElementById("reply-header");
+        var comment = document.getElementById("reply-comment");
+        var inReplyTo = document.getElementById("inReplyTo-box");
+
+        header.onmousedown = dragMouseDown;
+        inReplyTo.value = parseInt(sessionStorage.getItem("element-reply-id"));
+        header.innerText = "Replying to Thread No. " + shortURL(sessionStorage.getItem("element-reply-actor"), sessionStorage.getItem("element-reply-id"));
+        comment.value = sessionStorage.getItem("element-reply-comment");
+
+        pos1 = parseInt(sessionStorage.getItem("pos1"));
+        pos2 = parseInt(sessionStorage.getItem("pos2"));
+        pos3 = parseInt(sessionStorage.getItem("pos3"));
+        pos4 = parseInt(sessionStorage.getItem("pos4"));
+
+        box.setAttribute("style", sessionStorage.getItem("element-reply-style"));
+            
+        box.style.top = sessionStorage.getItem("reply-top");
+        box.style.left = sessionStorage.getItem("reply-left");
+
+        if(sessionStorage.getItem("eventhandler") === "true"){
+            elmnt = header;
+            document.onmouseup = closeDragElement;
+            document.onmousemove = elementDrag;
+        }else{
+            document.onmouseup = null;
+            document.onmousemove = null;
+        }
+    }
+};
+
+document.addEventListener("DOMContentLoaded", stateLoadHandler, false);
 
 function stripTransferProtocol(value){
-    var re = /(https:\/\/|http:\/\/)?(www.)?/
-    return value.replace(re, "")
+    var re = /(https:\/\/|http:\/\/)?(www.)?/;
+    return value.replace(re, "");
 }
 
 function isOnion(value){
-    var re = /\.onion/
+    var re = /\.onion/;
     if(value.match(re) != null)
-        return true
-    return false
+        return true;
+    return false;
 }
+
-- 
cgit v1.2.3


From d9cce000fdc8d804e73ff2fa4bfd2f1a151d90d9 Mon Sep 17 00:00:00 2001
From: sageman_ <sageman@anomine.net>
Date: Sat, 3 Jul 2021 20:43:41 +0200
Subject: In case the PEM key is missing, do not fail too hard. Tell the
 administrator in a friendly matter that they are an idiot and they should
 seek assistance in generating a new keypair and telling everyone about it.

---
 database.go     |  46 ++++++++++++++++++++-----
 main.go         |   6 ++--
 verification.go | 103 +++++++++++++++++++++++++++++++++++++++++++-------------
 3 files changed, 122 insertions(+), 33 deletions(-)

diff --git a/database.go b/database.go
index 9d5d721..70b7572 100644
--- a/database.go
+++ b/database.go
@@ -1,12 +1,15 @@
 package main
 
-import "fmt"
-import "database/sql"
-import _ "github.com/lib/pq"
-import "time"
-import "os"
-import "strings"
-import "sort"
+import (
+	"database/sql"
+	"fmt"
+	"os"
+	"sort"
+	"strings"
+	"time"
+
+	_ "github.com/lib/pq"
+)
 
 func GetActorFromDB(db *sql.DB, id string) Actor {
 	var nActor Actor
@@ -27,6 +30,10 @@ func GetActorFromDB(db *sql.DB, id string) Actor {
 	}
 
 	nActor.PublicKey = GetActorPemFromDB(db, publicKeyPem)
+	if nActor.PublicKey.PublicKeyPem == ""{
+		err = CreatePublicKeyFromPrivate(db, &nActor, publicKeyPem)
+		CheckError(err, "error creating public key from private")
+	}
 
 	return nActor	
 }
@@ -50,6 +57,10 @@ func GetActorByNameFromDB(db *sql.DB, name string) Actor {
 	}
 
 	nActor.PublicKey = GetActorPemFromDB(db, publicKeyPem)	
+	if nActor.PublicKey.PublicKeyPem == ""{
+		err = CreatePublicKeyFromPrivate(db, &nActor, publicKeyPem)
+		CheckError(err, "error creating public key from private")
+	}
 
 	return nActor	
 }
@@ -1470,13 +1481,32 @@ func GetActorPemFromDB(db *sql.DB, pemID string) PublicKeyPem {
 	defer rows.Close()
 	rows.Next()
 	rows.Scan(&pem.Id, &pem.Owner, &pem.PublicKeyPem)
-	f, _ := os.ReadFile(pem.PublicKeyPem)
+	f, err := os.ReadFile(pem.PublicKeyPem)
+	if err != nil{
+		pem.PublicKeyPem = ""
+		return pem
+	}
 
 	pem.PublicKeyPem = strings.ReplaceAll(string(f), "\r\n", `\n`)
 	
 	return pem
 }
 
+func GetActorPemFileFromDB(db *sql.DB, pemID string) string{
+	query := `select file from publickeypem where id=$1`
+	rows, err := db.Query(query, pemID)
+
+	CheckError(err, "could not get public key filename from database")
+
+	var file string
+
+	defer rows.Close()
+	rows.Next()
+	rows.Scan(&file)
+
+	return file
+}
+
 func MarkObjectSensitive(db *sql.DB, id string, sensitive bool) {
 	var query = `update activitystream set sensitive=$1 where id=$2`
 	_, err := db.Exec(query, sensitive, id)
diff --git a/main.go b/main.go
index 2874396..b7c880b 100644
--- a/main.go
+++ b/main.go
@@ -1852,7 +1852,8 @@ func MakeActivityRequestOutbox(db *sql.DB, activity Activity) {
 	path = re.ReplaceAllString(path, "")
 
 	sig := fmt.Sprintf("(request-target): %s %s\nhost: %s\ndate: %s", "post", path, instance, date)
-	encSig := ActivitySign(db, *activity.Actor, sig)
+	encSig, err := ActivitySign(db, *activity.Actor, sig)
+	CheckError(err, "unable to sign activity response")
 	signature := fmt.Sprintf("keyId=\"%s\",headers=\"(request-target) host date\",signature=\"%s\"", activity.Actor.PublicKey.Id, encSig)	
 	
 	req.Header.Set("Content-Type", activitystreams)			
@@ -1890,7 +1891,8 @@ func MakeActivityRequest(db *sql.DB, activity Activity) {
 					path = re.ReplaceAllString(path, "")
 
 					sig := fmt.Sprintf("(request-target): %s %s\nhost: %s\ndate: %s", "post", path, instance, date)
-					encSig := ActivitySign(db, *activity.Actor, sig)
+					encSig, err := ActivitySign(db, *activity.Actor, sig)
+					CheckError(err, "unable to sign activity response")
 					signature := fmt.Sprintf("keyId=\"%s\",headers=\"(request-target) host date\",signature=\"%s\"", activity.Actor.PublicKey.Id, encSig)
 
 					req.Header.Set("Content-Type", activitystreams)			
diff --git a/verification.go b/verification.go
index c649a4e..1e9c50e 100644
--- a/verification.go
+++ b/verification.go
@@ -1,24 +1,30 @@
 package main
 
-import "fmt"
-import "database/sql"
-import _ "github.com/lib/pq"
-import	"net/smtp"
-import "time"
-import "os/exec"
-import "os"
-import "math/rand"
-import "crypto"
-import "crypto/rsa"
-import "crypto/x509"
-import "crypto/sha256"
-import "encoding/pem"
-import "encoding/base64"
-import crand "crypto/rand"
-import "io/ioutil"
-import "strings"
-import "net/http"
-import "regexp"
+import (
+	"crypto"
+	"crypto/rsa"
+	"crypto/sha256"
+	"crypto/x509"
+	"database/sql"
+	"encoding/base64"
+	"encoding/pem"
+	"errors"
+	"fmt"
+	"math/rand"
+	"net/smtp"
+	"os"
+	"os/exec"
+	"time"
+
+	_ "github.com/lib/pq"
+
+	crand "crypto/rand"
+	"io/ioutil"
+	"net/http"
+	"regexp"
+	"strings"
+)
+
 
 type Verify struct {
 	Type string
@@ -527,6 +533,50 @@ func CreatePem(db *sql.DB, actor Actor) {
 	} else {
 		StorePemToDB(db, actor)
 	}
+
+	fmt.Println(`Created PEM keypair for the "` + actor.Name +`" board. Please keep in mind that
+the PEM key is crucial in identifying yourself as the legitimate owner of the board,
+so DO NOT LOSE IT!!! If you lose it, YOU WILL LOSE ACCESS TO YOUR BOARD!`);
+}
+
+func CreatePublicKeyFromPrivate(db *sql.DB, actor *Actor, publicKeyPem string) error{
+	publicFilename := GetActorPemFileFromDB(db, publicKeyPem);
+	privateFilename := strings.ReplaceAll(publicFilename, "public.pem", "private.pem")
+	_, err := os.Stat(privateFilename)
+	if err == nil {
+		//Not a lost cause
+		priv, err := ioutil.ReadFile(privateFilename)
+
+		block, _ := pem.Decode([]byte(priv))
+		if block == nil || block.Type != "RSA PRIVATE KEY" {
+			return errors.New("failed to decode PEM block containing public key")
+		}
+		key, err := x509.ParsePKCS1PrivateKey(block.Bytes)
+		CheckError(err, "failed to parse private key")
+
+		publicKeyDer, err := x509.MarshalPKIXPublicKey(&key.PublicKey)
+		CheckError(err, "failed to marshal public key from private key")
+		pubKeyBlock := pem.Block{
+			Type:    "PUBLIC KEY",
+			Headers: nil,
+			Bytes:   publicKeyDer,
+		}
+		publicFileWriter, err := os.Create(publicFilename)
+		CheckError(err, "error creating public pem file for " + actor.Name)
+
+		err = pem.Encode(publicFileWriter, &pubKeyBlock)
+		CheckError(err, "error encoding public pem")
+	}else{
+		fmt.Println(`Unable to locate private key from public key generation. Now,
+this means that you are now missing the proof that you are the
+owner of the "` + actor.Name + `" board. If you are the developer,
+then your job is just as easy as generating a new keypair, but
+if this board is live, then you'll also have to convince the other
+owners to switch their public keys for you so that they will start
+accepting your posts from your board from this site. Good luck ;)`)
+		return errors.New("unable to locate private key")
+	}
+	return nil
 }
 
 func StorePemToDB(db *sql.DB, actor Actor) {
@@ -555,7 +605,7 @@ func StorePemToDB(db *sql.DB, actor Actor) {
 	CheckError(err, "error creating publicKeyPem for actor ")
 }
 
-func ActivitySign(db *sql.DB, actor Actor, signature string) string {
+func ActivitySign(db *sql.DB, actor Actor, signature string) (string, error) {
 	query := `select file from publicKeyPem where id=$1 `
 
 	rows, err := db.Query(query, actor.PublicKey.Id)
@@ -581,10 +631,17 @@ func ActivitySign(db *sql.DB, actor Actor, signature string) string {
 		hashed.Write([]byte(signature))		
 		cipher, _ := rsa.SignPKCS1v15(rng, pub, crypto.SHA256, hashed.Sum(nil))
 
-		return base64.StdEncoding.EncodeToString(cipher)
+		return base64.StdEncoding.EncodeToString(cipher), nil
+	}else{
+		fmt.Println(`Unable to locate private key. Now,
+this means that you are now missing the proof that you are the
+owner of the "` + actor.Name + `" board. If you are the developer,
+then your job is just as easy as generating a new keypair, but
+if this board is live, then you'll also have to convince the other
+owners to switch their public keys for you so that they will start
+accepting your posts from your board from this site. Good luck ;)`)
+		return "", errors.New("unable to locate private key")
 	}
-
-	return ""
 }
 
 func ActivityVerify(actor Actor, signature string, verify string) error {
-- 
cgit v1.2.3


From cf86acee94652ac7cd8e8f313e6abf6c9901c398 Mon Sep 17 00:00:00 2001
From: FChannel <>
Date: Sat, 3 Jul 2021 18:39:34 -0700
Subject: add some styling to news pull request

---
 client.go           | 31 ++++++++++++++++++++-----------
 database.go         | 14 ++++++++++++--
 databaseschema.psql |  1 +
 main.go             | 46 ++++++++++++++++++++++++++++++++++++++++------
 static/anews.html   | 10 +++++-----
 static/index.html   | 25 +++++++++++--------------
 static/main.html    | 19 +++++++++++++++++--
 static/nadmin.html  | 19 +++++++++++--------
 static/news.html    |  6 +++---
 9 files changed, 120 insertions(+), 51 deletions(-)

diff --git a/client.go b/client.go
index f71fb7d..f4575f5 100644
--- a/client.go
+++ b/client.go
@@ -79,12 +79,15 @@ type Removed struct {
 
 type NewsItem struct {
 	Title string
-	Content string
+	Content template.HTML
 	Time int
 }
 
 func IndexGet(w http.ResponseWriter, r *http.Request, db *sql.DB) {
-	t := template.Must(template.New("").Funcs(template.FuncMap{"mod": func(i, j int) bool { return i%j == 0 }, "unixtoreadable": func(u int) string { return time.Unix(int64(u), 0).Format("Jan 02, 2006") }}).ParseFiles("./static/main.html", "./static/index.html"))
+	t := template.Must(template.New("").Funcs(template.FuncMap{
+		"mod": func(i, j int) bool { return i%j == 0 },
+		"sub": func (i, j int) int { return i - j },
+		"unixtoreadable": func(u int) string { return time.Unix(int64(u), 0).Format("Jan 02, 2006") }}).ParseFiles("./static/main.html", "./static/index.html"))
 
 	actor := GetActorFromDB(db, Domain)
 
@@ -113,7 +116,9 @@ func IndexGet(w http.ResponseWriter, r *http.Request, db *sql.DB) {
 }
 
 func NewsGet(w http.ResponseWriter, r *http.Request, db *sql.DB, timestamp int) {
-	t := template.Must(template.New("").Funcs(template.FuncMap{"unixtoreadable": func(u int) string { return time.Unix(int64(u), 0).Format("Jan 02, 2006") }}).ParseFiles("./static/main.html", "./static/news.html"))
+	t := template.Must(template.New("").Funcs(template.FuncMap{
+		"sub": func (i, j int) int { return i - j },		
+		"unixtoreadable": func(u int) string { return time.Unix(int64(u), 0).Format("Jan 02, 2006") }}).ParseFiles("./static/main.html", "./static/news.html"))
 	
 	actor := GetActorFromDB(db, Domain)
 
@@ -144,7 +149,10 @@ func NewsGet(w http.ResponseWriter, r *http.Request, db *sql.DB, timestamp int)
 }
 
 func AllNewsGet(w http.ResponseWriter, r *http.Request, db *sql.DB) {
-	t := template.Must(template.New("").Funcs(template.FuncMap{"unixtoreadable": func(u int) string { return time.Unix(int64(u), 0).Format("Jan 02, 2006") }}).ParseFiles("./static/main.html", "./static/anews.html"))
+	t := template.Must(template.New("").Funcs(template.FuncMap{
+		"mod": func(i, j int) bool { return i%j == 0 },
+		"sub": func (i, j int) int { return i - j },				
+		"unixtoreadable": func(u int) string { return time.Unix(int64(u), 0).Format("Jan 02, 2006") }}).ParseFiles("./static/main.html", "./static/anews.html"))
 	
 	actor := GetActorFromDB(db, Domain)
 
@@ -165,8 +173,9 @@ func AllNewsGet(w http.ResponseWriter, r *http.Request, db *sql.DB) {
 }
 
 func OutboxGet(w http.ResponseWriter, r *http.Request, db *sql.DB, collection Collection){
+	t := template.Must(template.New("").Funcs(template.FuncMap{
+		"sub": func (i, j int) int { return i - j }}).ParseFiles("./static/main.html", "./static/nposts.html", "./static/top.html", "./static/bottom.html", "./static/posts.html"))
 
-	t := template.Must(template.ParseFiles("./static/main.html", "./static/nposts.html", "./static/top.html", "./static/bottom.html", "./static/posts.html"))	
 
 	actor := collection.Actor
 
@@ -214,9 +223,8 @@ func OutboxGet(w http.ResponseWriter, r *http.Request, db *sql.DB, collection Co
 }
 
 func CatalogGet(w http.ResponseWriter, r *http.Request, db *sql.DB, collection Collection){
-
-	t := template.Must(template.ParseFiles("./static/main.html", "./static/ncatalog.html", "./static/top.html"))			
-	
+	t := template.Must(template.New("").Funcs(template.FuncMap{
+		"sub": func (i, j int) int { return i - j }}).ParseFiles("./static/main.html", "./static/ncatalog.html", "./static/top.html"))			
 	actor := collection.Actor
 
 	var returnData PageData
@@ -249,8 +257,8 @@ func CatalogGet(w http.ResponseWriter, r *http.Request, db *sql.DB, collection C
 }
 
 func PostGet(w http.ResponseWriter, r *http.Request, db *sql.DB){
-
-	t := template.Must(template.ParseFiles("./static/main.html", "./static/npost.html", "./static/top.html", "./static/bottom.html", "./static/posts.html"))
+	t := template.Must(template.New("").Funcs(template.FuncMap{
+		"sub": func (i, j int) int { return i - j }}).ParseFiles("./static/main.html", "./static/npost.html", "./static/top.html", "./static/bottom.html", "./static/posts.html"))
 	
 	path := r.URL.Path
 	actor := GetActorFromPath(db, path, "/")
@@ -322,10 +330,11 @@ func GetBoardCollection(db *sql.DB) []Board {
 		if boardActor.Id == "" {
 			boardActor = FingerActor(e.Id)
 		}
-		board.Name = "/" + boardActor.Name + "/"
+		board.Name = boardActor.Name
 		board.PrefName = boardActor.PreferredUsername
 		board.Location = "/" + boardActor.Name
 		board.Actor = boardActor
+		board.Restricted = boardActor.Restricted
 		collection = append(collection, board)
 	}
 
diff --git a/database.go b/database.go
index baae16a..edab4f6 100644
--- a/database.go
+++ b/database.go
@@ -7,6 +7,7 @@ import (
 	"sort"
 	"strings"
 	"time"
+	"html/template"	
 
 	_ "github.com/lib/pq"
 )
@@ -1546,10 +1547,15 @@ func getNewsFromDB(db *sql.DB, limit int) []NewsItem {
 	defer rows.Close()
 	for rows.Next() {
 		n := NewsItem{}
-		err = rows.Scan(&n.Title, &n.Content, &n.Time)
+		var content string
+		err = rows.Scan(&n.Title, &content, &n.Time)
 		if CheckError(err, "error scanning news from db") != nil {
 			return news
 		}
+
+		content = strings.ReplaceAll(content, "\n", "<br>")
+		n.Content = template.HTML(content)
+		
 		news = append(news, n)
 	}
 	
@@ -1558,6 +1564,7 @@ func getNewsFromDB(db *sql.DB, limit int) []NewsItem {
 
 func getNewsItemFromDB(db *sql.DB, timestamp int) (NewsItem, error) {
 	var news NewsItem
+	var content string
 	query := `select title, content, time from newsItem where time=$1 limit 1`
 	
 	rows, err := db.Query(query, timestamp)
@@ -1568,11 +1575,14 @@ func getNewsItemFromDB(db *sql.DB, timestamp int) (NewsItem, error) {
 	
 	defer rows.Close()
 	rows.Next()
-	err = rows.Scan(&news.Title, &news.Content, &news.Time)
+	err = rows.Scan(&news.Title, &content, &news.Time)
 	
 	if err != nil {
 		return news, err
 	}
+
+	content = strings.ReplaceAll(content, "\n", "<br>")
+	news.Content = template.HTML(content)	
 	
 	return news, nil
 }
diff --git a/databaseschema.psql b/databaseschema.psql
index 43767f3..02c229b 100644
--- a/databaseschema.psql
+++ b/databaseschema.psql
@@ -226,3 +226,4 @@ ALTER TABLE actor ADD COLUMN IF NOT EXISTS publicKeyPem varchar(100) default '';
 
 ALTER TABLE activitystream ADD COLUMN IF NOT EXISTS sensitive boolean default false;
 ALTER TABLE cacheactivitystream ADD COLUMN IF NOT EXISTS sensitive boolean default false;
+
diff --git a/main.go b/main.go
index 7a30721..0c1e4fa 100644
--- a/main.go
+++ b/main.go
@@ -501,7 +501,8 @@ func main() {
 			http.Redirect(w, r, "/" + *Key + "/" + redirect, http.StatusSeeOther)							
 			
 		} else if manage && actor.Name != "" {
-			t := template.Must(template.ParseFiles("./static/main.html", "./static/manage.html"))
+			t := template.Must(template.New("").Funcs(template.FuncMap{
+				"sub": func (i, j int) int { return i - j }}).ParseFiles("./static/main.html", "./static/manage.html"))
 
 			follow := GetActorCollection(actor.Following)
 			follower := GetActorCollection(actor.Followers)
@@ -554,8 +555,8 @@ func main() {
 			t.ExecuteTemplate(w, "layout", adminData)
 			
 		} else if admin || actor.Id == Domain {
-
-			t := template.Must(template.ParseFiles("./static/main.html", "./static/nadmin.html"))						
+			t := template.Must(template.New("").Funcs(template.FuncMap{
+				"sub": func (i, j int) int { return i - j }}).ParseFiles("./static/main.html", "./static/nadmin.html"))						
 	
 			actor := GetActor(Domain)
 			follow := GetActorCollection(actor.Following).Items
@@ -590,12 +591,21 @@ func main() {
 
 	http.HandleFunc("/" + *Key + "/addboard", func(w http.ResponseWriter, r *http.Request) {
 
+		id, _ := GetPasswordFromSession(r)
+		
+		actor := GetActorFromDB(db, Domain)
+
+
+		if id == "" || (id != actor.Id && id != Domain) {
+			t := template.Must(template.ParseFiles("./static/verify.html"))
+			t.Execute(w, "")
+			return
+		}
+		
 		var newActorActivity Activity
 		var board Actor
 		r.ParseForm()
 
-		actor := GetActorFromDB(db, Domain)
-
 		var restrict bool
 		if r.FormValue("restricted") == "True" {
 			restrict = true
@@ -625,10 +635,22 @@ func main() {
 	})
 	
 	http.HandleFunc("/" + *Key + "/postnews", func(w http.ResponseWriter, r *http.Request) {
+
+		id, _ := GetPasswordFromSession(r)
+		
+		actor := GetActorFromDB(db, Domain)
+
+
+		if id == "" || (id != actor.Id && id != Domain) {
+			t := template.Must(template.ParseFiles("./static/verify.html"))
+			t.Execute(w, "")
+			return
+		}
+		
 		var newsitem NewsItem
 		
 		newsitem.Title = r.FormValue("title")
-		newsitem.Content = r.FormValue("summary")
+		newsitem.Content = template.HTML(r.FormValue("summary"))
 		
 		WriteNewsToDB(db, newsitem)
 		
@@ -636,6 +658,18 @@ func main() {
 	})
 	
 	http.HandleFunc("/" + *Key + "/newsdelete/", func(w http.ResponseWriter, r *http.Request){
+
+		id, _ := GetPasswordFromSession(r)
+		
+		actor := GetActorFromDB(db, Domain)
+
+
+		if id == "" || (id != actor.Id && id != Domain) {
+			t := template.Must(template.ParseFiles("./static/verify.html"))
+			t.Execute(w, "")
+			return
+		}
+		
 		timestamp := r.URL.Path[13+len(*Key):]
 		
 		tsint, err := strconv.Atoi(timestamp)
diff --git a/static/anews.html b/static/anews.html
index 127760a..08bfdfa 100644
--- a/static/anews.html
+++ b/static/anews.html
@@ -22,16 +22,16 @@
   <h1>{{ .Title }}</h1>
 
   <div style="margin-top:50px;">
-  <table align="center" style="text-align: left;">
+  <table style="text-align: left;">
     
     {{ range $i, $e := .NewsItems }}
     <tr>
       <td>
+        <div class="box" style="width:800px; padding: 25px; margin-bottom: 25px;">
           {{ if $.Board.ModCred }}<a href="/{{ $.Key }}/newsdelete/{{ $e.Time }}">[Delete] </a>{{end}}
-      <a href="/news/{{.Time}}">{{unixtoreadable $e.Time}} - {{$e.Title}}</a>
-      {{ if eq $i 0 }}
-      <br><p>{{$e.Content}}</p>
-      {{ end }}
+          <a href="/news/{{.Time}}">{{unixtoreadable $e.Time}} - {{$e.Title}}</a>
+          <br><p style="margin-left: 25px;">{{$e.Content}}</p>
+        </div>
       </td>
     </tr>
     {{ end }}
diff --git a/static/index.html b/static/index.html
index 61aeab8..520829e 100644
--- a/static/index.html
+++ b/static/index.html
@@ -20,45 +20,42 @@
 {{ define "content" }}
 <div style="text-align: center; max-width: 800px; margin: 0 auto;">
   <h1>{{ .Title }}</h1>
-  <p style="text-align: justify">{{ .PreferredUsername }} is a federated image board based on activitypub. The current version of the code running the server is still a work in progress, expect a bumpy ride for the time being. Get the server code <a href="https://github.com/FChannel0">here</a>.</p>
+  <p style="text-align: justify">{{ .PreferredUsername }} is a federated image board based on activitypub. The current version of the code running the server is still a work in progress, expect a bumpy ride for the time being. Get the server code at <a href="https://github.com/FChannel0">https://github.com/FChannel0</a>.</p>
   
   <div style="margin-top:50px;">
-
     <div style="display: grid;border-right: 2px solid #820404">
       <div style="display: inline-grid;grid-column: 1 / 4;border-bottom: 2px solid #820404;border-left: 2px solid #820404;border-top: 2px solid #820404;"><span style="font-size: 1.5em;font-weight: bold;">Local boards</span></div>
     {{ range .Boards }}
-      <div style="whitespace: nowrap;display: inline-grid;text-align: left;padding: 5px;border-bottom: 2px solid #820404;border-left: 2px solid #820404;"><a href="{{.Location}}">{{.Name}} - {{.PrefName}}</a></div>
+      <div style="whitespace: nowrap;display: inline-grid;text-align: left;padding: 5px;border-bottom: 2px solid #820404;border-left: 2px solid #820404;"><a href="{{.Location}}"><b>{{.Name}}</b> - {{.PrefName}} {{ if not .Restricted }} [NSFW] {{ end }}</a></div>
     {{ end }}
     {{ range .BoardRemainer }}
       <div style="whitespace: nowrap;display: inline-grid;text-align: left;padding: 5px;border-bottom: 2px solid #820404;border-left: 2px solid #820404;"></div>
     {{ end }}
     </div>
-
   </div>
   
-  <div style="margin-top:50px;">
-  <table align="center" style="text-align: left;">
+  {{ if .NewsItems }}  
+  <div class="popup-box" style="margin-top:50px;">
+    <table style="text-align: left; margin: 25px;">
     <th>
-      <tr><a href="/news">{{ .PreferredUsername }} news</a></tr>
+      <tr><h4><a href="/news">{{ .PreferredUsername }} News</a></h4></tr>
     </th>
-
     {{ range $i, $e := .NewsItems }}
     <tr>
       <td>{{ if $.Board.ModCred }}<a href="/{{ $.Key }}/newsdelete/{{ $e.Time }}">[Delete] </a>{{end}} 
       <a href="/news/{{.Time}}">{{unixtoreadable $e.Time}} - {{$e.Title}}</a>
-      {{ if eq $i 0 }}
-      <br><p>{{$e.Content}}</p>
-      {{ end }}
+      <br><p style="margin-left: 25px;">{{$e.Content}}</p>
       </td>
     </tr>
     {{ end }}
   </table>
   </div>
+  {{ end }}  
   
-  <div style="margin-top:50px;">
-  <table align="center" style="text-align: left;">
+  <div class="popup-box" style="margin-top:50px;">
+  <table style="text-align: left; margin: 25px;">
     <th>
-      <tr>Current known instances</tr>
+      <tr><h4>Current known instances</h4></tr>
     </th>
 
     {{ range .InstanceIndex }}
diff --git a/static/main.html b/static/main.html
index 70e3c23..00b395f 100644
--- a/static/main.html
+++ b/static/main.html
@@ -40,6 +40,14 @@
           background-color: #f9f9e0;
           {{ end }}
       }
+
+      .box {
+          {{ if .Board.Restricted }}
+          background-color: #eff5ff;
+          {{ else }}
+          background-color: #f9f9e0;
+          {{ end }}
+      }      
       
       .quote {
           color: #789922;
@@ -76,8 +84,15 @@
   </head>
   <body>
     <ul style="display: inline; padding:0;">
-      {{range .Boards}}
-      <li style="display: inline;"><a href="{{.Location}}">{{.Name}}</a></li>
+      {{ $l := len .Boards }}
+      {{range $i, $e := .Boards}}
+      {{ if eq $i 0 }}
+      <li style="display: inline;">[<a href="{{.Location}}">{{$e.Name}} </a>/</li>
+      {{ else if eq $i (sub $l 1) }}
+      <li style="display: inline;"><a href="{{.Location}}">{{$e.Name}}</a>]</li>
+      {{ else }}
+      <li style="display: inline;"><a href="{{.Location}}">{{$e.Name}} </a>/</li>      
+      {{ end }}
       {{end}}
     </ul>
     {{ if .Board.ModCred }}
diff --git a/static/nadmin.html b/static/nadmin.html
index 877e1e5..88b92c9 100644
--- a/static/nadmin.html
+++ b/static/nadmin.html
@@ -17,21 +17,24 @@
       <option value="False">False</option>          
     </select>
   </form>
-  
+  <ul style="display: inline-block; padding: 0;">
+    <li style="display: inline-block;"><a href="#following">Subscribed</a></li>
+    <!-- <li style="display: inline-block;"><a href="javascript:show('followers')">Followers</a></li> -->
+    <li style="display: inline-block;"><a href="#reported">Reported</a></li>            
+  </ul>
+</div>
+
+<div class="popup-box" style="margin-bottom: 25px; padding: 12px;">
   <h3>Post News</h3>
   <form id="news" action="/{{ .Key }}/postnews" method="post" enctype="application/x-www-form-urlencoded">
     <label>Title:</label><br>
-    <input type="text" name="title" placeholder="{{.Actor}} was created!" required><input type="submit" value="Post"><br>
+    <input type="text" name="title" placeholder="New Board" required><input type="submit" value="Post"><br>
     <label>Content:</label><br>
     <textarea name="summary" rows="8" cols="50"></textarea><br>
   </form>
+</div>
+
 
-  <ul style="display: inline-block; padding: 0;">
-    <li style="display: inline-block;"><a href="#following">Subscribed</a></li>
-    <!-- <li style="display: inline-block;"><a href="javascript:show('followers')">Followers</a></li> -->
-    <li style="display: inline-block;"><a href="#reported">Reported</a></li>            
-  </ul>
-</div>    
 
 <div id="following" class="popup-box" style="margin-bottom: 25px; padding: 12px;">
   <h4 style="margin: 0; margin-bottom: 5px;">Subscribed</h4>
diff --git a/static/news.html b/static/news.html
index 757c420..4bd43e1 100644
--- a/static/news.html
+++ b/static/news.html
@@ -20,9 +20,9 @@
 {{ define "content" }}
 <div style="text-align: left; max-width: 800px; margin: 0 auto;">
 
-    {{ range .NewsItems }}
-      <p><h1>{{unixtoreadable .Time}} - {{.Title}}</h1><br>{{.Content}}</p>
-    {{ end }}
+  {{ range .NewsItems }}
+  <p><h1>{{unixtoreadable .Time}} - {{.Title}}</h1><br>{{.Content}}</p>
+  {{ end }}
   
 </div>
 {{ end }}
-- 
cgit v1.2.3


From 02d55188670a599048486c36e896416d917e831c Mon Sep 17 00:00:00 2001
From: FChannel <>
Date: Sat, 3 Jul 2021 19:18:29 -0700
Subject: fixed error with CreatePublicKeyFromPrivate with empty actor

---
 database.go       | 5 ++---
 static/index.html | 4 +++-
 verification.go   | 6 ++++--
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/database.go b/database.go
index edab4f6..954ec0f 100644
--- a/database.go
+++ b/database.go
@@ -31,7 +31,7 @@ func GetActorFromDB(db *sql.DB, id string) Actor {
 	}
 
 	nActor.PublicKey = GetActorPemFromDB(db, publicKeyPem)
-	if nActor.PublicKey.PublicKeyPem == ""{
+	if nActor.Id != "" && nActor.PublicKey.PublicKeyPem == ""{
 		err = CreatePublicKeyFromPrivate(db, &nActor, publicKeyPem)
 		CheckError(err, "error creating public key from private")
 	}
@@ -57,8 +57,7 @@ func GetActorByNameFromDB(db *sql.DB, name string) Actor {
 		CheckError(err, "error with actor from db scan ")
 	}
 
-	nActor.PublicKey = GetActorPemFromDB(db, publicKeyPem)	
-	if nActor.PublicKey.PublicKeyPem == ""{
+	if nActor.Id != "" &&  nActor.PublicKey.PublicKeyPem == ""{
 		err = CreatePublicKeyFromPrivate(db, &nActor, publicKeyPem)
 		CheckError(err, "error creating public key from private")
 	}
diff --git a/static/index.html b/static/index.html
index 520829e..bd90059 100644
--- a/static/index.html
+++ b/static/index.html
@@ -21,7 +21,8 @@
 <div style="text-align: center; max-width: 800px; margin: 0 auto;">
   <h1>{{ .Title }}</h1>
   <p style="text-align: justify">{{ .PreferredUsername }} is a federated image board based on activitypub. The current version of the code running the server is still a work in progress, expect a bumpy ride for the time being. Get the server code at <a href="https://github.com/FChannel0">https://github.com/FChannel0</a>.</p>
-  
+
+  {{ if .Boards }}
   <div style="margin-top:50px;">
     <div style="display: grid;border-right: 2px solid #820404">
       <div style="display: inline-grid;grid-column: 1 / 4;border-bottom: 2px solid #820404;border-left: 2px solid #820404;border-top: 2px solid #820404;"><span style="font-size: 1.5em;font-weight: bold;">Local boards</span></div>
@@ -33,6 +34,7 @@
     {{ end }}
     </div>
   </div>
+  {{ end }}
   
   {{ if .NewsItems }}  
   <div class="popup-box" style="margin-top:50px;">
diff --git a/verification.go b/verification.go
index 1e9c50e..555e9ee 100644
--- a/verification.go
+++ b/verification.go
@@ -551,6 +551,7 @@ func CreatePublicKeyFromPrivate(db *sql.DB, actor *Actor, publicKeyPem string) e
 		if block == nil || block.Type != "RSA PRIVATE KEY" {
 			return errors.New("failed to decode PEM block containing public key")
 		}
+		
 		key, err := x509.ParsePKCS1PrivateKey(block.Bytes)
 		CheckError(err, "failed to parse private key")
 
@@ -561,13 +562,14 @@ func CreatePublicKeyFromPrivate(db *sql.DB, actor *Actor, publicKeyPem string) e
 			Headers: nil,
 			Bytes:   publicKeyDer,
 		}
+		
 		publicFileWriter, err := os.Create(publicFilename)
 		CheckError(err, "error creating public pem file for " + actor.Name)
 
 		err = pem.Encode(publicFileWriter, &pubKeyBlock)
 		CheckError(err, "error encoding public pem")
 	}else{
-		fmt.Println(`Unable to locate private key from public key generation. Now,
+		fmt.Println(`\nUnable to locate private key from public key generation. Now,
 this means that you are now missing the proof that you are the
 owner of the "` + actor.Name + `" board. If you are the developer,
 then your job is just as easy as generating a new keypair, but
@@ -633,7 +635,7 @@ func ActivitySign(db *sql.DB, actor Actor, signature string) (string, error) {
 
 		return base64.StdEncoding.EncodeToString(cipher), nil
 	}else{
-		fmt.Println(`Unable to locate private key. Now,
+		fmt.Println(`\n Unable to locate private key. Now,
 this means that you are now missing the proof that you are the
 owner of the "` + actor.Name + `" board. If you are the developer,
 then your job is just as easy as generating a new keypair, but
-- 
cgit v1.2.3


From 068e6caf8dfa3fb36dd9f74b9070f41f801e9c8d Mon Sep 17 00:00:00 2001
From: FChannel <>
Date: Sat, 3 Jul 2021 19:46:32 -0700
Subject: fixed bug with reply/report box not closing when submitting post

---
 static/bottom.html | 4 ++--
 static/top.html    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/static/bottom.html b/static/bottom.html
index 994ad89..9d920c0 100644
--- a/static/bottom.html
+++ b/static/bottom.html
@@ -1,7 +1,7 @@
 {{ define "bottom" }}
 <div id="reply-box" class="popup-box" style="display: none;">
   <div id="reply-header" style="display: inline-block; width: 370px; z-index: 0; cursor: move;"></div><div id="reply-close" style="display: inline-block; float: right;"><a href="javascript:closeReply()">[X]</a></div>
-  <form id="reply-post" action="/post" method="post" enctype="multipart/form-data">
+  <form onsubmit="sessionStorage.setItem('element-closed-reply', true)"  id="reply-post" action="/post" method="post" enctype="multipart/form-data">
     <input id="reply-name" name="name" size="43" type="text" placeholder="Name" maxlength="100">
     <input id="reply-options" name="options" size="43" type="text" placeholder="Options" maxlength="100">
     <textarea id="reply-comment" name="comment" rows="12" cols="54" style="width: 396px;" maxlength="2000" oninput="sessionStorage.setItem('element-reply-comment', document.getElementById('reply-comment').value)"></textarea>
@@ -25,7 +25,7 @@
 
 <div id="report-box" class="popup-box" style="display: none; ">
   <div id="report-header" style="text-align: center; display: inline-block; width: 370px; z-index: 0; cursor: move;"></div><div id="report-close" style="display: inline-block; float: right;"><a href="javascript:closeReport()">[X]</a></div>
-  <form id="report-post" action="/report" method="post">
+  <form onsubmit="sessionStorage.setItem('element-closed-report', true)" id="report-post" action="/report" method="post">
     <label for="comment">Reason:</label>
     <textarea id="report-comment" name="comment" rows="12" cols="54" style="width: 396px;" maxlength="100" oninput="sessionStorage.setItem('element-report-comment', document.getElementById('report-comment').value)"></textarea>
     <input id="report-submit" type="submit" value="Report" style="float: right;">
diff --git a/static/top.html b/static/top.html
index 26c2fcc..fa4cb9e 100644
--- a/static/top.html
+++ b/static/top.html
@@ -9,7 +9,7 @@
   <h3 id="newpostbtn"  state="0" style="text-align: center; margin-top: 80px;"><a href="javascript:newpost()">[Start a New Thread]</a></h3>
   {{ end }}
   <div id="newpost" style="display: none;">    
-    <form id="new-post" action="/post" method="post" enctype="multipart/form-data" style="margin-left: 180px;">        
+    <form onsubmit="sessionStorage.setItem('element-closed-reply', true)" id="new-post" action="/post" method="post" enctype="multipart/form-data" style="margin-left: 180px;">        
       <label for="name">Name:</label><br>
       <input type="text" id="name" name="name" placeholder="Anonymous" maxlength="100"><br>
       <label for="options">Options:</label><br>
-- 
cgit v1.2.3


From 68f3c361656ae343fd809239452a954424a0bcb2 Mon Sep 17 00:00:00 2001
From: FChannel <>
Date: Sat, 3 Jul 2021 19:58:22 -0700
Subject: added report reason to admin manage page

---
 client.go          | 5 +++--
 database.go        | 4 ++--
 main.go            | 2 ++
 static/manage.html | 2 +-
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/client.go b/client.go
index f4575f5..8cb9004 100644
--- a/client.go
+++ b/client.go
@@ -68,6 +68,7 @@ type AdminPage struct {
 type Report struct {
 	ID string
 	Count int
+	Reason string
 }
 
 type Removed struct {
@@ -484,7 +485,7 @@ func CreateLocalReportDB(db *sql.DB, id string, board string, reason string) {
 func GetLocalReportDB(db *sql.DB, board string) []Report {
 	var reported []Report
 	
-	query := `select id, count from reported where board=$1`
+	query := `select id, count, reason from reported where board=$1`
 
 	rows, err := db.Query(query, board)
 
@@ -495,7 +496,7 @@ func GetLocalReportDB(db *sql.DB, board string) []Report {
 	for rows.Next() {
 		var r Report
 
-		rows.Scan(&r.ID, &r.Count)
+		rows.Scan(&r.ID, &r.Count, &r.Reason)
 
 		reported = append(reported, r)
 	}
diff --git a/database.go b/database.go
index 954ec0f..5668a4d 100644
--- a/database.go
+++ b/database.go
@@ -1451,7 +1451,7 @@ func GetActorReportedTotal(db *sql.DB, id string) int {
 func GetActorReportedDB(db *sql.DB, id string) []ObjectBase {
 	var nObj []ObjectBase
 
-	query := `select id, count from reported where board=$1`
+	query := `select id, count, reason from reported where board=$1`
 
 	rows, err := db.Query(query, id)	
 
@@ -1462,7 +1462,7 @@ func GetActorReportedDB(db *sql.DB, id string) []ObjectBase {
 	for rows.Next() {
 		var obj ObjectBase
 
-		rows.Scan(&obj.Id, &obj.Size)
+		rows.Scan(&obj.Id, &obj.Size, &obj.Content)
 
 		nObj = append(nObj, obj)
 	}
diff --git a/main.go b/main.go
index 0c1e4fa..755a0ec 100644
--- a/main.go
+++ b/main.go
@@ -524,6 +524,7 @@ func main() {
 				var r Report
 				r.Count = int(e.Size)
 				r.ID    = e.Id
+				r.Reason = e.Content
 				reports = append(reports, r)
 			}
 
@@ -533,6 +534,7 @@ func main() {
 				var r Report
 				r.Count = e.Count
 				r.ID    = e.ID
+				r.Reason = e.Reason
 				reports = append(reports, r)
 			}			
 
diff --git a/static/manage.html b/static/manage.html
index 4fb417f..e161f18 100644
--- a/static/manage.html
+++ b/static/manage.html
@@ -50,7 +50,7 @@
   <ul style="display: inline-block; padding: 0; margin: 0; list-style-type: none;">
     {{ $domain := .Domain }}
     {{ range .Reported }}
-    <li><a id="rpost" post="{{ .ID }}" href=""></a> - <b>{{ .Count }}</b> <a href="/delete?id={{ .ID }}&board={{ $board.Name }}&manage=t">[Remove Post]</a> <a href="/deleteattach?id={{ .ID }}&board={{ $board.Name }}&manage=t">[Remove Attachment]</a> <a href="/report?id={{ .ID }}&close=1&board={{ $board.Name }}">[Close]</a></li>
+    <li><a id="rpost" post="{{ .ID }}" href=""></a> - <b>{{ .Count }}</b><span> "{{ .Reason }}" </span> <a href="/delete?id={{ .ID }}&board={{ $board.Name }}&manage=t">[Remove Post]</a> <a href="/deleteattach?id={{ .ID }}&board={{ $board.Name }}&manage=t">[Remove Attachment]</a> <a href="/report?id={{ .ID }}&close=1&board={{ $board.Name }}">[Close]</a></li>
     {{ end }}
   </ul>            
 </div>
-- 
cgit v1.2.3


From 978dd92272c4e4139820d575094c62a99cd9c470 Mon Sep 17 00:00:00 2001
From: FChannel <>
Date: Sat, 3 Jul 2021 20:03:29 -0700
Subject: new development version for tracking

---
 static/faq.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/static/faq.html b/static/faq.html
index ed7fed2..917425d 100644
--- a/static/faq.html
+++ b/static/faq.html
@@ -37,7 +37,7 @@
       <p>coming soon(tm).</p>
       
       <h4 id="version">Server Version</h4>
-      <p>v0.0.5c</p>
+      <p>v0.0.6-dev</p>
     </div>
     <div style="width: 500px; margin:0 auto; margin-top: 50px; text-align: center;">
       <a href="/">[Home]</a><a href="/static/rules.html">[Rules]</a><a href="/static/faq.html">[FAQ]</a>
-- 
cgit v1.2.3


From 2d06abf5049e67e05c068461908c492f43ff4026 Mon Sep 17 00:00:00 2001
From: FChannel <>
Date: Sat, 3 Jul 2021 20:27:51 -0700
Subject: formating changes for local board grid when there is only 1 or 2
 boards

---
 static/index.html | 23 ++++++++++++++++-------
 static/main.html  |  4 +++-
 2 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/static/index.html b/static/index.html
index bd90059..d7374f1 100644
--- a/static/index.html
+++ b/static/index.html
@@ -23,16 +23,25 @@
   <p style="text-align: justify">{{ .PreferredUsername }} is a federated image board based on activitypub. The current version of the code running the server is still a work in progress, expect a bumpy ride for the time being. Get the server code at <a href="https://github.com/FChannel0">https://github.com/FChannel0</a>.</p>
 
   {{ if .Boards }}
+  {{ $l := len .Boards }}      
   <div style="margin-top:50px;">
-    <div style="display: grid;border-right: 2px solid #820404">
+    <div style="display: grid;border-right: 2px solid #820404">    
+      {{ if lt $l 2 }}
+      <div style="display: inline-grid; border-bottom: 2px solid #820404;border-left: 2px solid #820404;border-top: 2px solid #820404;"><span style="font-size: 1.5em;font-weight: bold;">Local boards</span></div>
+      {{ else if eq $l 2 }}
+      <div style="display: inline-grid; grid-column: 1 / 3; border-bottom: 2px solid #820404;border-left: 2px solid #820404;border-top: 2px solid #820404;"><span style="font-size: 1.5em;font-weight: bold;">Local boards</span></div>
+      {{ else }}
       <div style="display: inline-grid;grid-column: 1 / 4;border-bottom: 2px solid #820404;border-left: 2px solid #820404;border-top: 2px solid #820404;"><span style="font-size: 1.5em;font-weight: bold;">Local boards</span></div>
-    {{ range .Boards }}
-      <div style="whitespace: nowrap;display: inline-grid;text-align: left;padding: 5px;border-bottom: 2px solid #820404;border-left: 2px solid #820404;"><a href="{{.Location}}"><b>{{.Name}}</b> - {{.PrefName}} {{ if not .Restricted }} [NSFW] {{ end }}</a></div>
-    {{ end }}
-    {{ range .BoardRemainer }}
+      {{ end }}      
+      {{ range .Boards }}
+      <div style="whitespace: nowrap;display: inline-grid;text-align: left;padding: 5px;border-bottom: 2px solid #820404;border-left: 2px solid #820404;"><a href="{{.Location}}"><b>/{{.Name}}/</b> - {{.PrefName}} {{ if not .Restricted }} [NSFW] {{ end }}</a></div>
+      {{ end }}
+      {{ if gt $l 2 }}      
+      {{ range .BoardRemainer }}
       <div style="whitespace: nowrap;display: inline-grid;text-align: left;padding: 5px;border-bottom: 2px solid #820404;border-left: 2px solid #820404;"></div>
-    {{ end }}
-    </div>
+      {{ end }}
+      {{ end }}
+    </div>      
   </div>
   {{ end }}
   
diff --git a/static/main.html b/static/main.html
index 00b395f..ba7e7f5 100644
--- a/static/main.html
+++ b/static/main.html
@@ -86,7 +86,9 @@
     <ul style="display: inline; padding:0;">
       {{ $l := len .Boards }}
       {{range $i, $e := .Boards}}
-      {{ if eq $i 0 }}
+      {{ if eq (sub $l 1) 0 }}
+      <li style="display: inline;">[ <a href="{{.Location}}">{{$e.Name}} </a>]</li>      
+      {{ else if eq $i 0 }}
       <li style="display: inline;">[<a href="{{.Location}}">{{$e.Name}} </a>/</li>
       {{ else if eq $i (sub $l 1) }}
       <li style="display: inline;"><a href="{{.Location}}">{{$e.Name}}</a>]</li>
-- 
cgit v1.2.3