diff --git a/cmd/gochan/deleteposts.go b/cmd/gochan/deleteposts.go index b7c59f52..5abf699a 100644 --- a/cmd/gochan/deleteposts.go +++ b/cmd/gochan/deleteposts.go @@ -44,14 +44,16 @@ func deletePosts(checkedPosts []int, writer http.ResponseWriter, request *http.R errEv.Int("boardid", boardid) board, err := gcsql.GetBoardFromID(boardid) if err != nil { - serverutil.ServeErrorPage(writer, "Invalid form data: "+err.Error()) + serverutil.ServeError(writer, "Invalid form data: "+err.Error(), wantsJSON, map[string]interface{}{ + "boardid": boardid, + }) errEv.Err(err).Caller(). Msg("Invalid form data (error populating data") return } if password == "" && rank == 0 { - serverutil.ServeErrorPage(writer, "Password required for post deletion") + serverutil.ServeError(writer, "Password required for post deletion", wantsJSON, nil) return } diff --git a/pkg/building/building.go b/pkg/building/building.go index aa905a38..ed819f70 100644 --- a/pkg/building/building.go +++ b/pkg/building/building.go @@ -32,7 +32,6 @@ func getRecentPosts() ([]recentPost, error) { siteCfg := config.GetSiteConfig() query := `SELECT DBPREFIXposts.id, - DBPREFIXposts.message, DBPREFIXposts.message_raw, (SELECT dir FROM DBPREFIXboards WHERE id = t.board_id) AS dir, f.filename, op.id @@ -62,8 +61,8 @@ func getRecentPosts() ([]recentPost, error) { for rows.Next() { var post recentPost var id, topPostID string - var message, messageRaw, boardDir, filename string - err = rows.Scan(&id, &message, &messageRaw, &boardDir, &filename, &topPostID) + var message, boardDir, filename string + err = rows.Scan(&id, &message, &boardDir, &filename, &topPostID) if err != nil { return nil, err }