rework pagination (#79)

* rework pagination

* fix "no messages found" message in post display

* simplify retrieving archived threads

* allow logging discord REST requests

main.go

@@ -14,24 +14,35 @@ import (
 	"os/signal"
 	"time"
 
-	_ "net/http/pprof"
-
 	"github.com/diamondburned/arikawa/v3/gateway"
 	"github.com/diamondburned/arikawa/v3/state"
+	"github.com/diamondburned/arikawa/v3/utils/httputil/httpdriver"
 	"github.com/naoina/toml"
 )
 
 //go:embed resources
 var embedfs embed.FS
 
 type config struct {
-	BotToken        string
-	ListenAddr      string
-	Resources       string
-	SiteURL         string
-	ServiceName     string
-	ServerHostedIn  string
-	ReloadTemplates bool
+	BotToken         string
+	ListenAddr       string
+	Resources        string
+	SiteURL          string
+	ServiceName      string
+	ServerHostedIn   string
+	ReloadTemplates  bool
+	TraceDiscordREST bool
+}
+
+type TraceClient struct {
+	httpdriver.Client
+}
+
+func (c TraceClient) Do(req httpdriver.Request) (httpdriver.Response, error) {
+	then := time.Now()
+	resp, err := c.Client.Do(req)
+	log.Printf("Discord REST: %s in %s", req.GetPath(), time.Since(then))
+	return resp, err
 }
 
 func main() {
@@ -81,6 +92,9 @@ func main() {
 	defer done()
 
 	state := state.New("Bot " + config.BotToken)
+	if config.TraceDiscordREST {
+		state.Client.Client.Client = TraceClient{state.Client.Client.Client}
+	}
 	state.AddIntents(0 |
 		gateway.IntentGuildMessages |
 		gateway.IntentGuilds |
@@ -104,8 +118,8 @@ func main() {
 	httpserver := &http.Server{
 		Addr:           config.ListenAddr,
 		Handler:        server,
-		ReadTimeout:    60 * time.Second,
-		WriteTimeout:   60 * time.Second,
+		ReadTimeout:    10 * time.Second,
+		WriteTimeout:   10 * time.Second,
 		MaxHeaderBytes: 1 << 20,
 	}
 	httperr := make(chan error, 1)

resources/static/style.css

@@ -240,7 +240,7 @@ nav .tags select {
     color:#111;
 }
 
-.nav_buttons {
+.more {
     display:block;
     position: relative;
     height: 3em;

resources/templates/forum.gohtml

@@ -19,9 +19,6 @@
         <option value="">All</option>
         {{range .Forum.AvailableTags}}
             {{$selected := false}}
-            {{if eq .ID $.TagFilter}}
-                {{$selected = true}}
-            {{end}}
 
             <option value="{{.ID}}" {{if $selected}}selected{{end}}>{{.Name}}</option>
         {{end}}
@@ -30,7 +27,14 @@
 </form>
 </nav>
 
-{{ template "navbuttons" . }}
+<div class="more">
+{{if .Prev}}
+<a class="prevbtn btn" href="/{{.Guild.ID}}/{{.Forum.ID}}/page/{{.Prev}}">Previous</a><br>
+{{end}}
+{{if .Next}}
+<a class="nextbtn btn" href="/{{.Guild.ID}}/{{.Forum.ID}}/page/{{.Next}}">Next</a><br>
+{{end}}
+</div>
 
 <div class='tabular-list post-list'>
     <div class='header'>Title</div>
@@ -71,6 +75,13 @@
 
 </div>
 
-{{ template "navbuttons" . }}
+<div class="more">
+{{if .Prev}}
+<a class="prevbtn btn" href="/{{.Guild.ID}}/{{.Forum.ID}}/page/{{.Prev}}">Previous</a><br>
+{{end}}
+{{if .Next}}
+<a class="nextbtn btn" href="/{{.Guild.ID}}/{{.Forum.ID}}/page/{{.Next}}">Next</a><br>
+{{end}}
+</div>
 
 {{ template "footer.gohtml" .}}

resources/templates/index.gohtml

@@ -1,9 +1,8 @@
 {{ template "header.gohtml" }}
 <title>dforum</title>
 <meta name="description" content="A service for making discord forums indexable by google.">
-<span class='top'>
-    <h1><a href="/">dforum</a></h1>
-</span>
+
+<h1><a href="/">dforum</a></h1>
 
 <p>this website will display the forums in any server you invite the corresponding bot to in a such a way that Google and other search engines can index and show them. we hope to host as many servers as we can so that we can usher in a new era of online forums, without locking this information behind a service that you have to sign up for (which also has a less then adequate search feature).</p>
 <p>the site is also (hopefully) simple enough that you can print the contents of it to another site, and thus if you want your own url for this stuff you can simply include the site from your own site, via whatever language you plan on using.</p>

resources/templates/post.gohtml

@@ -26,7 +26,7 @@
         {{$image = $firstPost.Author.AvatarURL}}
     {{end}}
 {{else}}
-    <em>wind blowing noises</em><br><em>some dipshit deleted the top post in their thread and not the thread itself...how sad...</em> 
+    <em>No messages found</em>
 {{end}}
 
 <title>{{$title}}</title>
@@ -37,14 +37,14 @@
 <meta property="og:url" content="{{.URL}}/{{.Guild.ID}}/{{.Forum.ID}}/{{.Post.ID}}">
 <meta property="og:image" content="{{$image}}">
 
-<span class='nav_buttons'>
-{{if .PrevID }}
-<a class="prevbtn btn" href="?cur=d{{.PrevID}}">Previous</a><br>
+<div class='more'>
+{{if .Prev }}
+<a class="prevbtn btn" href="?before={{.Prev}}">Previous</a><br>
 {{end}}
-{{if .NextID }}
-<a class="nextbtn btn" href="?cur=a{{.NextID}}">Next</a><br>
+{{if .Next }}
+<a class="nextbtn btn" href="?after={{.Next}}">Next</a><br>
 {{end}}
-</span>
+</div>
 
 <div>
 {{range .MessageGroups}}
@@ -99,12 +99,12 @@
 </div>
 {{end}}
 </div>
-<span class='nav_buttons'>
-{{if .PrevID }}
-<a class="prevbtn btn" href="?cur=d{{.PrevID}}">Previous</a><br>
+<div class='more'>
+{{if .Prev }}
+<a class="prevbtn btn" href="?before={{.Prev}}">Previous</a><br>
 {{end}}
-{{if .NextID }}
-<a class="nextbtn btn" href="?cur=a{{.NextID}}">Next</a><br>
+{{if .Next }}
+<a class="nextbtn btn" href="?after={{.Next}}">Next</a><br>
 {{end}}
 </span>
-{{ template "footer.gohtml" .}}
+{{ template "footer.gohtml" .}}