Add ability to delete threads. Fix thread deletion logic

internal/database/handlers.go

@@ -2,6 +2,8 @@ package database
 
 import (
 	"database/sql"
+	"errors"
+	"io/fs"
 	"os"
 	"path"
 
@@ -223,7 +225,7 @@ func PutPost(db Queryer, boardSlug string, threadId int, body string, mediaPath
 func DeleteThread(db Queryer, threadId int) error {
 	// cleanup images
 	rows, err := db.Query(`
-		SELECT media_path 
+		SELECT media_path, thumb_path
 		FROM posts
 		WHERE thread_id = ?`, threadId)
 	if err != nil {
@@ -231,23 +233,26 @@ func DeleteThread(db Queryer, threadId int) error {
 	}
 	defer rows.Close()
 
-	var pruneMediaPaths []string
 	for rows.Next() {
-		var pruneMediaPath string
+		var (
-		if err := rows.Scan(&pruneMediaPath); err != nil {
+			pruneMediaThumbPath string
+			pruneMediaFullPath  string
+		)
+		if err := rows.Scan(&pruneMediaFullPath, &pruneMediaThumbPath); err != nil {
 			return err
 		}
-		pruneMediaPaths = append(pruneMediaPaths, pruneMediaPath)
-	}
 
-	for _, pruneMediaPath := range pruneMediaPaths {
+		if err := os.Remove(path.Join(util.POST_MEDIA_FULL_PATH, pruneMediaFullPath)); err != nil {
-		if err := os.Remove(path.Join(util.POST_MEDIA_FULL_PATH, pruneMediaPath)); err != nil && !os.IsNotExist(err) {
+			if !errors.Is(err, fs.ErrNotExist) {
 				return err
 			}
-		if err := os.Remove(path.Join(util.POST_MEDIA_THUMB_PATH, pruneMediaPath)); err != nil && !os.IsNotExist(err) {
+		}
+		if err := os.Remove(path.Join(util.POST_MEDIA_THUMB_PATH, pruneMediaThumbPath)); err != nil {
+			if !errors.Is(err, fs.ErrNotExist) {
 				return err
 			}
 		}
+	}
 
 	// delete thread
 	_, err = db.Exec(`

web/main.go

@@ -154,7 +154,7 @@ func main() {
 
 		// check cooldown
 		timeRemaining := util.GetRemainingCooldown(ip, util.ThreadCooldowns, util.THREAD_COOLDOWN)
-		if timeRemaining > 0 {
+		if timeRemaining > 0 && !isAdmin(r) {
 			response := fmt.Sprintf("Please wait %.0f seconds", timeRemaining.Seconds())
 			io.Copy(io.Discard, r.Body)
 			http.Error(w, response, http.StatusTooManyRequests)
@@ -247,7 +247,7 @@ func main() {
 
 		// check cooldown
 		timeRemaining := util.GetRemainingCooldown(ip, util.PostCooldowns, util.POST_COOLDOWN)
-		if timeRemaining > 0 {
+		if timeRemaining > 0 && !isAdmin(r) {
 			response := fmt.Sprintf("Please wait %.0f seconds", timeRemaining.Seconds())
 			io.Copy(io.Discard, r.Body)
 			http.Error(w, response, http.StatusTooManyRequests)
@@ -377,6 +377,7 @@ func main() {
 			previews = append(previews, views.CatalogThreadPreview{
 				Subject:    thread.Subject,
 				Body:       op.Body,
+				ThreadId:   thread.Id,
 				ThreadURL:  fmt.Sprintf("/%s/threads/%d", slug, thread.Id),
 				ThumbPath:  op.ThumbPath,
 				ReplyCount: len(posts),
@@ -384,7 +385,10 @@ func main() {
 			})
 		}
 
-		views.ThreadsCatalog(previews, isAdmin(r)).Render(r.Context(), w)
+		views.ThreadsCatalog(previews, views.CatalogContext{
+			IsAdmin:   isAdmin(r),
+			BoardSlug: slug,
+		}).Render(r.Context(), w)
 	})
 
 	// THREAD POSTS
@@ -498,6 +502,23 @@ func main() {
 				Path:     "/",
 			})
 		})
+
+		r.Delete("/{slug}/threads/{threadId}", func(w http.ResponseWriter, r *http.Request) {
+			// slug := chi.URLParam(r, "slug")
+			threadIdStr := chi.URLParam(r, "threadId")
+			threadId, err := strconv.Atoi(threadIdStr)
+			if err != nil {
+				http.Error(w, "Invalid thread id", http.StatusBadRequest)
+				return
+			}
+
+			err = database.DeleteThread(db, threadId)
+			if err != nil {
+				log.Println("DeleteThread: %v", err)
+				http.Error(w, "Error deleting thread: "+threadIdStr, http.StatusInternalServerError)
+			}
+		})
+
 	})
 
 	// -----------------

web/static/index.js

@@ -95,3 +95,7 @@ function applyCatalogSearch() {
         }
     }
 }
+
+function currentBoardSlug() {
+    return window.location.pathname.split("/")[1] || "";
+}

web/views/board.templ

@@ -52,13 +52,19 @@ templ Board(board database.Board, isAdmin bool) {
 type CatalogThreadPreview struct {
 	Subject    string
 	Body       string
+	ThreadId   int
 	ThreadURL  string
 	ThumbPath  string
 	ReplyCount int
 	IpCount    int
 }
 
-templ ThreadsCatalog(previews []CatalogThreadPreview, isAdmin bool) {
+type CatalogContext struct {
+	IsAdmin   bool
+	BoardSlug string
+}
+
+templ ThreadsCatalog(previews []CatalogThreadPreview, catalogContext CatalogContext) {
 	<div id="catalog">
 		for _, preview := range previews {
 			{{ replyCount := strconv.FormatInt(int64(preview.ReplyCount), 10) }}
@@ -79,8 +85,12 @@ templ ThreadsCatalog(previews []CatalogThreadPreview, isAdmin bool) {
 				<p>
 					@templ.Raw(util.EnrichPost(preview.Body))
 				</p>
-				if isAdmin {
+				if catalogContext.IsAdmin {
-					<button>X</button>
+					<button
+						hx-delete={ fmt.Sprintf("/admin/%s/threads/%d", catalogContext.BoardSlug, preview.ThreadId) }
+						hx-swap="none"
+						_="on htmx:afterRequest trigger refreshPosts on body"
+					>X</button>
 				}
 			</div>
 		}