Fix #209: move sort arrows to the right of the column label

README.md

@@ -1,7 +1,7 @@
 # Palette
 
 Palette is a fast, self-hosted pastebin. One Go binary, a SQLite database, and
-a web UI for sharing text and small files.
+a web UI for sharing text and small files
 
 > [!NOTE]
 > <table><tr><td>
@@ -10,27 +10,22 @@ a web UI for sharing text and small files.
 
 ## Features
 
-- Text pastes and cans (multiple items in one share)
-- File attachments (one file per paste, up to 25 MB)
+- Multiple files in one paste
 - Password protected pastes
-- Expire after a specified time
+- Expir after a specified time
 - Burn after a number of views
 - Custom URLs
 - Syntax highlighting with language auto-detection (go-enry)
-- Public paste listing with search, sort and pagination
-- Cookie based saved pastes and settings
-- Five base themes (midnight, smooth, pastel-lavender, pastel-peach, pastel-cloud), each with a dark and light variant
-- Dark mode toggle in the topbar and settings, with a configurable default
-- Polished code viewer: line-number gutter sized to the widest number and pinned during horizontal scroll, optional line wrap, jump-to-top/bottom buttons, and theme-aware scrollbars
+- Local cookie based submission history
+- Cookie based settings
+- Themes!
 
 ## Screenshots
 
 | | |
 |---|---|
-| ![Editor in midnight (dark)](https://git.archfox.org/poslop/palette/wiki/raw/palette-previews%2Fdesktop-editor-new.png) | ![Paste view in pastel-peach (light)](https://git.archfox.org/poslop/palette/wiki/raw/palette-previews%2Fdesktop-paste-pastel-peach-light.png) |
-| ![Public pastes list](https://git.archfox.org/poslop/palette/wiki/raw/palette-previews%2Fdesktop-public.png) | ![Settings and theme picker](https://git.archfox.org/poslop/palette/wiki/raw/palette-previews%2Fdesktop-settings-themes.png) |
-
-
+| ![Editor in midnight](https://git.archfox.org/poslop/palette/wiki/raw/palette-previews%2Fmidnight-new.png) | ![Paste view in pastel-peach](https://git.archfox.org/poslop/palette/wiki/raw/palette-previews%2Fpastel-peach-paste.png) |
+| ![History in pastel-lavender](https://git.archfox.org/poslop/palette/wiki/raw/palette-previews%2Fpastel-lavender-history.png) | ![Saved in pastel-cloud](https://git.archfox.org/poslop/palette/wiki/raw/palette-previews%2Fpastel-cloud-mine.png) |
 
 ## Get Started
 
@@ -66,13 +61,12 @@ go build -o palette ./cmd/palette
 | `PALETTE_ADDR` | `:8080` | Listen address |
 | `PALETTE_DB` | `palette.db` | SQLite database path |
 | `PALETTE_MAX_TEXT` | `5242880` | Max paste size in bytes (5 MB) |
-| `PALETTE_MAX_ITEM` | `26214400` | Max can item / file attachment size in bytes (25 MB) |
+| `PALETTE_MAX_ITEM` | `26214400` | Max can item size in bytes (25 MB) |
 | `PALETTE_ADMIN_KEY` | generated | Admin key; if unset a 32-char hex key is generated and persisted to `<db-dir>/admin-key` (0600) |
 | `PALETTE_DEFAULT_DARK` | dark on | Default dark mode for new visitors. Set `false`, `0`, or `off` to default to light mode. Visitors who toggle dark mode keep their choice in their browser. |
-| `PALETTE_UNLOCK_SECRET` | random per start | HMAC secret for password-unlock cookies. Set a fixed value to keep unlock sessions across restarts or across replicas. |
 
 An `/admin` page exists for runtime settings, protected by a key set at
-install (`PALETTE_ADMIN_KEY` env var) and resettable locally. See
+install (`PALETTE_ADMIN_KEY` env var) and resettable locally — see
 [API](https://git.archfox.org/poslop/palette/wiki/API) and the [design docs](https://git.archfox.org/poslop/palette/wiki/Home) in the wiki for details.
 
 ## API

docker-compose.yml

@@ -32,16 +32,10 @@ services:
       # Default: 5242880 (5 MiB).
       # PALETTE_MAX_TEXT: "5242880"
 
-      # Max size in bytes of a single can item (file/text inside a can) or a
-      # paste file attachment.
+      # Max size in bytes of a single can item (file/text inside a can).
       # Default: 26214400 (25 MiB).
       # PALETTE_MAX_ITEM: "26214400"
 
-      # Default dark mode for new visitors. Unset = dark on; set to "false",
-      # "0" or "off" to default to light mode. Visitors who toggle dark mode
-      # keep their choice in their browser.
-      # PALETTE_DEFAULT_DARK: "false"
-
       # HMAC secret for password-unlock cookies. Default: random per start,
       # which logs out every unlocked browser session on restart. Set a fixed
       # secret (any random string) to keep unlock sessions across restarts,

internal/api/attachments_test.go

@@ -306,64 +306,3 @@ func TestMultipartPasswordFieldAccepted(t *testing.T) {
 		t.Fatalf("paste should require password, got %d", rec2.Code)
 	}
 }
-
-// #281: /raw/{id} must stream the attachment blob for ALL attachment mimes,
-// not just raster images (the old isImageMime gate left non-image
-// attachments serving an empty body from row.Content).
-func TestRawStreamsNonImageAttachment(t *testing.T) {
-	s := testServer(t)
-	h := s.routes()
-
-	body := []byte("hello, this is a plain text attachment body")
-	rec, resp := multipartCreate(t, h, "notes.txt", body, nil)
-	if rec.Code != 201 {
-		t.Fatalf("create: %d %s", rec.Code, rec.Body.String())
-	}
-	if resp["attachment"] == nil {
-		t.Fatalf("no attachment in response: %v", resp)
-	}
-	id, _ := resp["id"].(string)
-
-	req := httptest.NewRequest("GET", "/raw/"+id, nil)
-	rec2 := httptest.NewRecorder()
-	h.ServeHTTP(rec2, req)
-	if rec2.Code != 200 {
-		t.Fatalf("raw: %d %s", rec2.Code, rec2.Body.String())
-	}
-	if got := rec2.Header().Get("Content-Type"); got != "text/plain; charset=utf-8" {
-		t.Fatalf("Content-Type = %q", got)
-	}
-	if got := rec2.Header().Get("X-Content-Type-Options"); got != "nosniff" {
-		t.Fatalf("nosniff = %q", got)
-	}
-	if !bytes.Equal(rec2.Body.Bytes(), body) {
-		t.Fatalf("raw bytes differ: got %d bytes want %d", rec2.Body.Len(), len(body))
-	}
-}
-
-// #281: active-content attachment types still get forced to text/plain on
-// /raw, same rule as the /f/ serving path (#34).
-func TestRawHtmlAttachmentServesAsPlainText(t *testing.T) {
-	s := testServer(t)
-	h := s.routes()
-
-	html := []byte("<html><body><script>alert(1)</script></body></html>")
-	rec, resp := multipartCreate(t, h, "page.html", html, nil)
-	if rec.Code != 201 {
-		t.Fatalf("create: %d %s", rec.Code, rec.Body.String())
-	}
-	id, _ := resp["id"].(string)
-
-	req := httptest.NewRequest("GET", "/raw/"+id, nil)
-	rec2 := httptest.NewRecorder()
-	h.ServeHTTP(rec2, req)
-	if rec2.Code != 200 {
-		t.Fatalf("raw: %d %s", rec2.Code, rec2.Body.String())
-	}
-	if got := rec2.Header().Get("Content-Type"); got != "text/plain; charset=utf-8" {
-		t.Fatalf("Content-Type = %q", got)
-	}
-	if !bytes.Equal(rec2.Body.Bytes(), html) {
-		t.Fatal("raw bytes differ from upload")
-	}
-}

internal/api/clientip.go

@@ -1,27 +0,0 @@
-// clientIP extracts the client IP for rate-limit keying.
-//
-// Trust boundary (issue #280): the bucket key MUST NOT come from any header a
-// client can influence. The previous rightmost-X-Forwarded-For scheme (#85)
-// assumed Traefik appends the real client IP, but the deployed ingress does
-// not rewrite XFF, so a client rotating its own XFF value got a fresh bucket
-// per request and the limit was unenforceable (pentest H1: 6x201 across 8
-// rotating-XFF creates).
-//
-// The bucket key is the actual peer address (RemoteAddr) only. Behind any
-// reverse proxy this is the proxy's address, so all clients share one bucket
-// per endpoint — coarse, but safe. Client-supplied IP headers
-// (X-Forwarded-For, X-Real-Ip) are never trusted.
-package api
-
-import (
-	"net"
-	"net/http"
-)
-
-func clientIP(r *http.Request) string {
-	host := r.RemoteAddr
-	if h, _, err := net.SplitHostPort(r.RemoteAddr); err == nil {
-		host = h
-	}
-	return host
-}

internal/api/issue138_cookie_test.go

@@ -29,7 +29,7 @@ func newTestServer138(t *testing.T) *httptest.ResponseRecorder {
 	globalSettingsFn = ss.get
 	t.Cleanup(func() { globalSettingsFn = nil })
 	a := &apiServer{store: st, cfg: cfg, ui: ui, settings: ss, adminKey: "test-admin-key"}
-	req := httptest.NewRequest("GET", "/public", nil)
+	req := httptest.NewRequest("GET", "/history", nil)
 	rec := httptest.NewRecorder()
 	a.routes().ServeHTTP(rec, req)
 	return rec

internal/api/issue235_type_test.go

@@ -1,40 +0,0 @@
-package api
-
-import "testing"
-
-// #235: Type column. Text pastes show the language, attachment pastes show
-// the file extension (lowercase, no dot).
-func TestDisplayType(t *testing.T) {
-	lang := "python"
-	cases := []struct {
-		lang *string
-		att  string
-		want string
-	}{
-		{nil, "", "text"},
-		{&lang, "", "python"},
-		{&lang, "report.pdf", "pdf"},
-		{nil, "photo.PNG", "png"},
-		{&lang, "archive.tar.gz", "gz"},
-		{&lang, "noext", "python"},     // no extension: fall back to language
-		{&lang, ".hidden", "python"},   // dotfile: no extension
-		{&lang, "dir/name.txt", "txt"}, // path component only
-	}
-	for _, c := range cases {
-		if got := displayType(c.lang, c.att); got != c.want {
-			t.Errorf("displayType(%v, %q) = %q, want %q", c.lang, c.att, got, c.want)
-		}
-	}
-}
-
-func TestAttachmentExtName(t *testing.T) {
-	cases := map[string]string{
-		"a.txt": "txt", "A.PNG": "png", "noext": "", ".hidden": "",
-		"x.": "", "dir/b.md": "md", "": "",
-	}
-	for in, want := range cases {
-		if got := attachmentExtName(in); got != want {
-			t.Errorf("attachmentExtName(%q) = %q, want %q", in, got, want)
-		}
-	}
-}

internal/api/mine_test.go

@@ -58,7 +58,7 @@ func TestMineCreateListDelete(t *testing.T) {
 	a := &apiServer{store: st, cfg: cfg, ui: ui, settings: ss, adminKey: "test-admin-key"}
 	h := a.routes()
 
-	alice := viewerCookieFor(t, h, "/public")
+	alice := viewerCookieFor(t, h, "/history")
 	if alice == "" {
 		t.Fatal("no viewer cookie issued")
 	}
@@ -89,7 +89,7 @@ func TestMineCreateListDelete(t *testing.T) {
 	}
 
 	// a different browser's cookie does NOT see it
-	bob := viewerCookieFor(t, h, "/public")
+	bob := viewerCookieFor(t, h, "/history")
 	rec = doReq(t, h, "GET", "/api/mine", bob, "")
 	json.Unmarshal(rec.Body.Bytes(), &list)
 	if list.Total != 0 {

internal/api/ratelimit.go

@@ -3,6 +3,7 @@ package api
 import (
 	"net/http"
 	"strconv"
+	"strings"
 	"sync"
 	"time"
 )
@@ -47,6 +48,35 @@ func (l *limiter) allow(key string, rate, burst float64) bool {
 	return true
 }
 
+// clientIP extracts the client IP for rate-limit keying (#85).
+//
+// Trust boundary: palette runs behind exactly ONE trusted reverse proxy
+// (Traefik in the k3s pod network). Traefik APPENDS the real client IP to
+// X-Forwarded-For, so the RIGHTMOST entry is the last value the trusted
+// proxy observed and is unspoofable by the client (a client-supplied fake
+// entry only lands on the LEFT and is ignored). This matches chi's
+// middleware.RealIP semantics for a single trusted proxy hop.
+//
+// Direct connections (no XFF header) fall back to RemoteAddr. Directly
+// reachable deployments must NOT expose the app to untrusted networks
+// without a proxy in front, or attackers could forge the rightmost entry.
+func clientIP(r *http.Request) string {
+	if xff := r.Header.Get("X-Forwarded-For"); xff != "" {
+		if i := strings.LastIndex(xff, ","); i >= 0 {
+			return strings.TrimSpace(xff[i+1:])
+		}
+		return strings.TrimSpace(xff)
+	}
+	if xr := r.Header.Get("X-Real-Ip"); xr != "" {
+		return strings.TrimSpace(xr)
+	}
+	host := r.RemoteAddr
+	if i := strings.LastIndex(host, ":"); i > 0 {
+		host = host[:i]
+	}
+	return host
+}
+
 var globalLimiter = newLimiter()
 
 // globalSettingsFn is set at startup; tests can point it at fixed settings.

internal/api/ratelimit_test.go

@@ -166,11 +166,8 @@ func TestHighlightCode(t *testing.T) {
 	if plain != "<b>x</b>" {
 		t.Fatalf("plain escaping wrong: %q", plain)
 	}
-	// #205: newline join preserved as the delimiter paste-lines.js splits on;
-	// per-line segments survive and the client joins with '' so no newline
-	// text node reaches the rendered DOM.
-	hl := lang.HighlightCode("a\nb\nc", "go")
-	if got := len(splitLines(hl)); got != 3 {
+	// line count preserved (gutter alignment)
+	if got := len(splitLines(lang.HighlightCode("a\nb\nc", "go"))); got != 3 {
 		t.Fatalf("want 3 lines, got %d", got)
 	}
 }

internal/api/ratelimit_xff_test.go

@@ -1,50 +1,85 @@
 package api
 
+// Issue #85: the rate limit key must use the rightmost X-Forwarded-For entry
+// (appended by the trusted Traefik proxy), never the raw/leftmost header
+// value a client can forge. A spoofed FIRST XFF entry must not bypass the
+// limit or rotate buckets.
+
 import (
-	"fmt"
+	"bytes"
 	"net/http/httptest"
 	"testing"
 )
 
-func TestClientIPUsesRemoteAddrNotXFF(t *testing.T) {
-	r := httptest.NewRequest("POST", "/api/pastes", nil)
-	r.RemoteAddr = "203.0.113.7:4432"
+func TestClientIPTakesRightmostXFF(t *testing.T) {
+	r := httptest.NewRequest("POST", "/", nil)
+	r.RemoteAddr = "10.42.0.7:51000" // trusted Traefik pod
 	r.Header.Set("X-Forwarded-For", "1.2.3.4, 1.2.3.5, 203.0.113.9")
+	if got := clientIP(r); got != "203.0.113.9" {
+		t.Fatalf("clientIP = %q, want rightmost 203.0.113.9", got)
+	}
+}
+
+func TestClientIPXRealIPFallback(t *testing.T) {
+	r := httptest.NewRequest("POST", "/", nil)
+	r.RemoteAddr = "10.42.0.7:51000"
 	r.Header.Set("X-Real-Ip", "203.0.113.10")
-	if got := clientIP(r); got != "203.0.113.7" {
-		t.Fatalf("clientIP = %q, want peer 203.0.113.7", got)
+	if got := clientIP(r); got != "203.0.113.10" {
+		t.Fatalf("clientIP = %q, want 203.0.113.10", got)
 	}
 }
 
-// A proxy-controlled header is not honored even when set: #280 revision
-// removed the PALETTE_TRUSTED_IP_HEADER mechanism per owner decision, so the
-// bucket key is the peer address only.
-func TestClientIPNeverTrustsHeaders(t *testing.T) {
-	r := httptest.NewRequest("POST", "/api/pastes", nil)
-	r.RemoteAddr = "10.0.1.47:9999"
-	r.Header.Set("CF-Connecting-IP", "198.51.100.9")
-	if got := clientIP(r); got != "10.0.1.47" {
-		t.Fatalf("clientIP = %q, want peer 10.0.1.47", got)
+func TestClientIPDirectFallback(t *testing.T) {
+	r := httptest.NewRequest("POST", "/", nil)
+	r.RemoteAddr = "198.51.100.5:51000"
+	if got := clientIP(r); got != "198.51.100.5" {
+		t.Fatalf("clientIP = %q, want 198.51.100.5", got)
 	}
 }
 
-// Issue #280: rotating X-Forwarded-For must NOT reset the bucket. Pentest
-// repro was 8 creates with rotating XFF -> 6x201.
-func TestRotatingXFFDoesNotResetBucket(t *testing.T) {
-	globalLimiter = newLimiter()
-	s := defaultSettings(Config{}) // burst/limit defaults; header values are ignored anyway
-	var allowed, limited int
-	for i := 0; i < 8; i++ {
-		r := httptest.NewRequest("POST", "/api/pastes", nil)
-		r.RemoteAddr = "198.51.100.1:5000"
-		r.Header.Set("X-Forwarded-For", fmt.Sprintf("9.9.9.%d", i))
-		if rateLimitCreate(r, s) {
-			allowed++
-		} else {
-			limited++
+// TestRateLimitSpoofedFirstXFFDoesNotBypass: an attacker rotating a fake
+// leftmost XFF entry stays limited on their real (rightmost) IP.
+func TestRateLimitSpoofedFirstXFFDoesNotBypass(t *testing.T) {
+	srv := newTestServer(t)
+	h := srv.routes()
+	for i := 0; i < 5; i++ {
+		req := httptest.NewRequest("POST", "/api/pastes", bytes.NewReader([]byte(`{"content":"hi"}`)))
+		req.RemoteAddr = "10.42.0.7:51000"
+		// each request spoofs a DIFFERENT leftmost entry
+		req.Header.Set("X-Forwarded-For", spoofN(i)+", 203.0.113.9")
+		rr := httptest.NewRecorder()
+		h.ServeHTTP(rr, req)
+		if rr.Code != 201 {
+			t.Fatalf("req %d: want 201, got %d", i, rr.Code)
 		}
 	}
-	if float64(allowed) != s.RateLimitBurst || limited != 8-int(s.RateLimitBurst) {
-		t.Fatalf("rotating XFF: allowed=%d limited=%d, want allowed=%v (burst), limited=%d", allowed, limited, s.RateLimitBurst, 8-int(s.RateLimitBurst))
+	// 6th request, still the same real IP, new spoofed prefix: must 429
+	req := httptest.NewRequest("POST", "/api/pastes", bytes.NewReader([]byte(`{"content":"hi"}`)))
+	req.RemoteAddr = "10.42.0.7:51000"
+	req.Header.Set("X-Forwarded-For", "9.9.9.9, 203.0.113.9")
+	rr := httptest.NewRecorder()
+	h.ServeHTTP(rr, req)
+	if rr.Code != 429 {
+		t.Fatalf("spoofed 6th req: want 429, got %d", rr.Code)
+	}
+}
+
+func spoofN(i int) string {
+	return "1.2.3." + string(rune('0'+i))
+}
+
+// Distinct real IPs must still get distinct buckets (no over-limiting).
+func TestRateLimitDistinctRightmostIPsIndependent(t *testing.T) {
+	srv := newTestServer(t)
+	h := srv.routes()
+	for _, ip := range []string{"203.0.113.20", "203.0.113.21"} {
+		req := httptest.NewRequest("POST", "/api/pastes", bytes.NewReader([]byte(`{"content":"hi"}`)))
+		req.RemoteAddr = "10.42.0.7:51000"
+		req.Header.Set("X-Forwarded-For", "6.6.6.6, "+ip)
+		rr := httptest.NewRecorder()
+		h.ServeHTTP(rr, req)
+		if rr.Code != 201 {
+			t.Fatalf("ip %s: want 201, got %d", ip, rr.Code)
+		}
 	}
 }

internal/api/routes_rename_test.go

@@ -1,52 +0,0 @@
-package api
-
-// #256: renamed page routes; old URLs redirect.
-import (
-	"palette/internal/store"
-	"palette/internal/web"
-
-	"net/http"
-	"net/http/httptest"
-	"testing"
-)
-
-func TestRenamedPageRoutes(t *testing.T) {
-	globalLimiter = newLimiter() // fresh rate-limit buckets
-	st, err := store.OpenStore(":memory:")
-	if err != nil {
-		t.Fatal(err)
-	}
-	ui, err := web.New()
-	if err != nil {
-		t.Fatal(err)
-	}
-	cfg := Config{MaxTextBytes: 5 * 1024 * 1024}
-	ss := NewTestSettingsStore(t, cfg)
-	globalSettingsFn = ss.get
-	t.Cleanup(func() { globalSettingsFn = nil })
-	a := &apiServer{store: st, cfg: cfg, ui: ui, settings: ss, adminKey: "test-admin-key"}
-	h := a.routes()
-
-	// new routes render pages
-	for _, path := range []string{"/public", "/saved"} {
-		req := httptest.NewRequest("GET", path, nil)
-		rec := httptest.NewRecorder()
-		h.ServeHTTP(rec, req)
-		if rec.Code != http.StatusOK {
-			t.Fatalf("GET %s: %d, want 200", path, rec.Code)
-		}
-	}
-
-	// old routes redirect
-	for _, tc := range [][2]string{{"/history", "/public"}, {"/mine", "/saved"}, {"/", "/public"}} {
-		req := httptest.NewRequest("GET", tc[0], nil)
-		rec := httptest.NewRecorder()
-		h.ServeHTTP(rec, req)
-		if rec.Code != http.StatusMovedPermanently && rec.Code != http.StatusFound {
-			t.Fatalf("GET %s: %d, want redirect", tc[0], rec.Code)
-		}
-		if loc := rec.Header().Get("Location"); loc != tc[1] {
-			t.Fatalf("GET %s redirects to %s, want %s", tc[0], loc, tc[1])
-		}
-	}
-}

internal/api/server.go

@@ -118,14 +118,11 @@ func (a *apiServer) routes() http.Handler {
 	r.Get("/raw/{id}", a.handleRaw)
 
 	// web pages
-	r.Get("/", http.RedirectHandler("/public", http.StatusFound).ServeHTTP)
+	r.Get("/", http.RedirectHandler("/history", http.StatusFound).ServeHTTP)
 	r.Get("/new", a.ui.Handlers().HandleNewPage)
-	r.Get("/public", a.ui.Handlers().HandleHistoryPage)
-	r.Get("/saved", a.ui.Handlers().HandleMinePage)
+	r.Get("/history", a.ui.Handlers().HandleHistoryPage)
 	r.Get("/settings", a.ui.Handlers().HandleSettingsPage)
-	// #256: old URLs redirect to the renamed pages
-	r.Get("/history", http.RedirectHandler("/public", http.StatusMovedPermanently).ServeHTTP)
-	r.Get("/mine", http.RedirectHandler("/saved", http.StatusMovedPermanently).ServeHTTP)
+	r.Get("/mine", a.ui.Handlers().HandleMinePage)
 	r.Handle("/static/*", a.ui.StaticHandler())
 	r.Get("/unlock/{id}", a.handlePasteView)
 	r.Post("/unlock/{id}", a.handlePasteView)
@@ -318,26 +315,11 @@ func (a *apiServer) handleGetPaste(w http.ResponseWriter, r *http.Request) {
 	writeJSON(w, 200, map[string]any{
 		"id": row.ID, "content": row.Content, "content_type": row.ContentType,
 		"language": store.NullStrPtr(row.Language), "title": store.NullStrPtr(row.Title), "created_at": row.CreatedAt,
-		"type":     a.pasteTypeLabel(row),
 		"view_count": row.ViewCount, "visibility": row.Visibility,
 		"reads_remaining": rem,
 	})
 }
 
-// pasteTypeLabel computes the Type value for a single paste (#235): file
-// extension for attachment pastes, else the stored language, else "text".
-func (a *apiServer) pasteTypeLabel(row *store.PasteRow) string {
-	if att, err := a.store.GetAttachmentForPaste(row.ID); err == nil && att != nil {
-		if ext := attachmentExtName(att.Filename); ext != "" {
-			return ext
-		}
-	}
-	if !row.Language.Valid || row.Language.String == "" {
-		return "text"
-	}
-	return row.Language.String
-}
-
 func (a *apiServer) handleDeletePaste(w http.ResponseWriter, r *http.Request) {
 	id := chi.URLParam(r, "id")
 	row, err := a.store.GetPaste(id)
@@ -394,33 +376,6 @@ func (a *apiServer) deletionAuthorized(r *http.Request, row *store.PasteRow) boo
 		row.ViewerID.String != "" && row.ViewerID.String == vid
 }
 
-// displayType returns the Type-column value for a list row (#235): the file
-// extension for attachment pastes, otherwise the detected language (default
-// "text").
-func displayType(lang *string, attFilename string) string {
-	if ext := attachmentExtName(attFilename); ext != "" {
-		return ext
-	}
-	if lang == nil || *lang == "" {
-		return "text"
-	}
-	return *lang
-}
-
-// attachmentExtName returns the lowercase extension (without dot) of a
-// filename, or "" when there is none.
-func attachmentExtName(filename string) string {
-	name := filename
-	if i := strings.LastIndexByte(name, '/'); i >= 0 {
-		name = name[i+1:]
-	}
-	i := strings.LastIndexByte(name, '.')
-	if i <= 0 || i == len(name)-1 {
-		return ""
-	}
-	return strings.ToLower(name[i+1:])
-}
-
 // handleListMine serves /api/mine: pastes created from this browser (#37).
 func (a *apiServer) handleListMine(w http.ResponseWriter, r *http.Request) {
 	vid := currentViewerID(r)
@@ -439,7 +394,7 @@ func (a *apiServer) handleListMine(w http.ResponseWriter, r *http.Request) {
 	for _, row := range rows {
 		lang, title := store.NullStrPtr(row.Language), store.NullStrPtr(row.Title)
 		items = append(items, map[string]any{
-			"id": row.ID, "title": title, "language": lang, "type": displayType(lang, row.AttFilename),
+			"id": row.ID, "title": title, "language": lang,
 			"created_at": row.CreatedAt, "view_count": row.ViewCount, "size": row.Size,
 			"custom_slug": store.NullStrPtr(row.CustomSlug), "visibility": row.Visibility,
 			"is_can": row.IsCan,
@@ -460,7 +415,7 @@ func (a *apiServer) handleListPublic(w http.ResponseWriter, r *http.Request) {
 	for _, row := range rows {
 		lang, title := store.NullStrPtr(row.Language), store.NullStrPtr(row.Title)
 		items = append(items, map[string]any{
-			"id": row.ID, "title": title, "language": lang, "type": displayType(lang, row.AttFilename),
+			"id": row.ID, "title": title, "language": lang,
 			"created_at": row.CreatedAt, "view_count": row.ViewCount, "size": row.Size,
 			"custom_slug": store.NullStrPtr(row.CustomSlug),
 			"is_can":      row.IsCan,
@@ -496,25 +451,6 @@ func (a *apiServer) handleRaw(w http.ResponseWriter, r *http.Request) {
 		http.Error(w, "not found", 404)
 		return
 	}
-	// #221: raw view of a paste backed by an attachment serves the stored
-	// blob bytes with the sniffed mime, not the (empty) text content — for
-	// ALL attachment mimes (#281); /raw/{id} is the raw fetch for the file
-	// too. serveContentType still forces active-content types (html, svg,
-	// xml) to text/plain per the #34 rule below.
-	if att, err := a.store.GetAttachmentForPaste(row.ID); err == nil && att != nil {
-		blobs := a.store.Blobs()
-		if blobs != nil {
-			if blob, err := blobs.Get(row.ID + "/" + att.SHA256); err == nil {
-				defer blob.Close()
-				a.store.IncrementViews(row.ID, "", 0) // raw views always count (#49/#95)
-				w.Header().Set("Content-Type", serveContentType(att.Mime))
-				w.Header().Set("X-Content-Type-Options", "nosniff")
-				w.Header().Set("Content-Length", fmt.Sprintf("%d", att.Size))
-				http.ServeContent(w, r, "", time.Unix(att.CreatedAt, 0), blob)
-				return
-			}
-		}
-	}
 	// #34: content_type is attacker-controlled via the create API. Serving it
 	// verbatim let a paste be stored with text/html (or image/svg+xml) and
 	// render as active content on this origin when fetched from /raw —

internal/lang/highlight.go

@@ -146,9 +146,5 @@ func HighlightCode(content, langID string) string {
 	for i, line := range lines {
 		out[i] = highlightLine(line, h, langID)
 	}
-	// Note: lines are joined with "\n" on purpose — paste-lines.js splits on
-	// the newline to build its per-line .codeline blocks, then joins those
-	// with "" and strips whitespace-only text nodes (#205), so no newline
-	// text node ever reaches the rendered DOM.
 	return strings.Join(out, "\n")
 }

internal/store/attachment.go

@@ -26,10 +26,7 @@ type Attachment struct {
 	SizeHuman string `json:"-"` // template-only: human-readable size
 }
 
-// MaxFilenameLen caps stored attachment filenames (bytes) to bound DB
-// rows and Content-Disposition echoes. 128 keeps names readable while
-// stopping filename-bloat abuse; longer names truncate.
-const MaxFilenameLen = 128
+const MaxFilenameLen = 255
 
 // ErrFileTooLarge is returned when an attachment exceeds the per-file cap.
 var ErrFileTooLarge = errors.New("file too large")

internal/store/blob_test.go

@@ -105,9 +105,4 @@ func TestSanitizeFilename(t *testing.T) {
 	if got := SanitizeFilename(long); len(got) != MaxFilenameLen {
 		t.Errorf("long name len = %d want %d", len(got), MaxFilenameLen)
 	}
-	// issue #248: a 250-char multipart filename must truncate to the cap
-	repro := strings.Repeat("b", 246) + ".txt"
-	if got := SanitizeFilename(repro); len(got) != MaxFilenameLen {
-		t.Errorf("repro name len = %d want %d", len(got), MaxFilenameLen)
-	}
 }

internal/store/customslug.go

@@ -13,7 +13,6 @@ var reservedSlugs = map[string]bool{
 	"api": true, "raw": true, "can": true, "cans": true, "public": true,
 	"history": true, "static": true, "assets": true, "favicon.ico": true,
 	"new": true, "login": true, "logout": true, "admin": true, "settings": true,
-	"mine": true, "saved": true, "unlock": true, "guess": true, "f": true,
 }
 
 var ErrInvalidSlug = errors.New("custom slug must be 1-64 chars: letters, digits, dash, underscore; must start with letter or digit")

internal/store/store.go

@@ -63,7 +63,6 @@ type PasteRow struct {
 	DeletionToken sql.NullString
 	ViewerID      sql.NullString
 	IsCan         bool // set on list rows that are cans (#4)
-	AttFilename   string // attachment filename when the paste is a file paste (#235); empty otherwise
 }
 
 type CanRow struct {
@@ -305,12 +304,11 @@ func (s *Store) GetPaste(idOrSlug string) (*PasteRow, error) {
 // listed, and password-protected pastes are excluded at the query level
 // (#65) so their metadata (title, slug, existence) never leaks.
 func (s *Store) ListPublic(limit, offset int) ([]PasteRow, int, error) {
-	rows, err := s.db.Query(`SELECT p.id, p.custom_slug, p.content_type, p.language, p.title, p.visibility, p.created_at, p.view_count, LENGTH(p.content), 0, COALESCE(a.filename, '')
-		FROM pastes p
-		LEFT JOIN attachments a ON a.paste_id = p.id
-		WHERE p.visibility='public' AND p.deleted_at IS NULL AND p.can_id IS NULL AND p.password_hash IS NULL AND (p.expires_at IS NULL OR p.expires_at > ?)
+	rows, err := s.db.Query(`SELECT id, custom_slug, content_type, language, title, visibility, created_at, view_count, LENGTH(content), 0
+		FROM pastes
+		WHERE visibility='public' AND deleted_at IS NULL AND can_id IS NULL AND password_hash IS NULL AND (expires_at IS NULL OR expires_at > ?)
 		UNION ALL
-		SELECT id, NULL, 'text/plain', NULL, title, visibility, created_at, 0, 0, 1, ''
+		SELECT id, NULL, 'text/plain', NULL, title, visibility, created_at, 0, 0, 1
 		FROM paste_cans
 		WHERE visibility='public' AND deleted_at IS NULL AND (expires_at IS NULL OR expires_at > ?)
 		ORDER BY created_at DESC LIMIT ? OFFSET ?`, time.Now().Unix(), time.Now().Unix(), limit, offset)
@@ -323,7 +321,7 @@ func (s *Store) ListPublic(limit, offset int) ([]PasteRow, int, error) {
 		var r PasteRow
 		var cs, lang, title sql.NullString
 		var isCan int
-		if err := rows.Scan(&r.ID, &cs, &r.ContentType, &lang, &title, &r.Visibility, &r.CreatedAt, &r.ViewCount, &r.Size, &isCan, &r.AttFilename); err != nil {
+		if err := rows.Scan(&r.ID, &cs, &r.ContentType, &lang, &title, &r.Visibility, &r.CreatedAt, &r.ViewCount, &r.Size, &isCan); err != nil {
 			return nil, 0, err
 		}
 		r.CustomSlug = cs
@@ -341,12 +339,11 @@ func (s *Store) ListPublic(limit, offset int) ([]PasteRow, int, error) {
 
 // ListMine lists pastes created from the given viewer id (browser cookie), newest first.
 func (s *Store) ListMine(viewerID string, limit, offset int) ([]PasteRow, int, error) {
-	rows, err := s.db.Query(`SELECT p.id, p.custom_slug, p.language, p.title, p.visibility, p.created_at, p.view_count, LENGTH(p.content), 0, COALESCE(a.filename, '')
-		FROM pastes p
-		LEFT JOIN attachments a ON a.paste_id = p.id
-		WHERE p.viewer_id = ? AND p.deleted_at IS NULL AND p.can_id IS NULL AND (p.expires_at IS NULL OR p.expires_at > ?)
+	rows, err := s.db.Query(`SELECT id, custom_slug, language, title, visibility, created_at, view_count, LENGTH(content), 0
+		FROM pastes
+		WHERE viewer_id = ? AND deleted_at IS NULL AND can_id IS NULL AND (expires_at IS NULL OR expires_at > ?)
 		UNION ALL
-		SELECT id, NULL, NULL, title, visibility, created_at, 0, 0, 1, ''
+		SELECT id, NULL, NULL, title, visibility, created_at, 0, 0, 1
 		FROM paste_cans
 		WHERE viewer_id = ? AND deleted_at IS NULL AND (expires_at IS NULL OR expires_at > ?)
 		ORDER BY created_at DESC LIMIT ? OFFSET ?`, viewerID, time.Now().Unix(), viewerID, time.Now().Unix(), limit, offset)
@@ -359,7 +356,7 @@ func (s *Store) ListMine(viewerID string, limit, offset int) ([]PasteRow, int, e
 		var r PasteRow
 		var cs, lang, title sql.NullString
 		var isCan int
-		if err := rows.Scan(&r.ID, &cs, &lang, &title, &r.Visibility, &r.CreatedAt, &r.ViewCount, &r.Size, &isCan, &r.AttFilename); err != nil {
+		if err := rows.Scan(&r.ID, &cs, &lang, &title, &r.Visibility, &r.CreatedAt, &r.ViewCount, &r.Size, &isCan); err != nil {
 			return nil, 0, err
 		}
 		r.CustomSlug, r.Language, r.Title = cs, lang, title

internal/web/static/app.css

@@ -216,10 +216,7 @@ body {
 .tag { font-size: 19.8px; color: var(--muted-fg); border: 1px solid var(--border); border-radius: var(--radius-sm); padding: 2px 9px; }
 .paste-title-bar { display: flex; align-items: center; gap: 12px; padding: 12px 18px; flex-wrap: wrap; }
 .paste-title-bar h1 { font-size: 29.2px; font-weight: 600; margin: 0; word-break: normal; overflow-wrap: anywhere; }
-/* #222: .float already draws the border + radius and clips corners; the pill's own
-   tighter border curve was getting clipped thin at the corners. Let .float be the
-   only border/paint surface for the details pill (collapsed and expanded). */
-.stats-pill { border: 0; border-radius: 0; overflow: hidden; }
+.stats-pill { border: 1px solid var(--border); border-radius: var(--radius); overflow: hidden; }
 .stats-head { display: flex; align-items: center; gap: 16px; width: 100%; background: none; border: 0; border-bottom: 1px solid var(--border); color: var(--muted-fg); font: inherit; font-size: 21.6px; padding: 14px 18px; cursor: pointer; text-align: left; }
 .stats-head:hover { color: var(--fg); background: var(--surface-2); }
 .stats-chev { width: 18px; height: 18px; flex: none; transition: transform 0.15s ease; }
@@ -258,8 +255,13 @@ body {
 .theme-grid { display: flex; flex-wrap: wrap; gap: 14px; margin-top: 14px; }
 
 /* #161: more breathing room between settings sections */
-/* #207 r2: owner wants the toggle left aligned (revert #197 centering) */
-#settings-dark-toggle { margin-bottom: 20px; }
+#settings-dark-toggle {
+  margin-bottom: 20px;
+  margin-left: auto;
+  margin-right: auto;
+  display: flex;
+  justify-content: center;
+}
 .settings-body h3 { margin-top: 28px; }
 .settings-body .theme-grid { margin-bottom: 8px; }
 .theme-card {
@@ -299,14 +301,8 @@ html[data-wrap] .float { overflow-x: hidden; }
 .code-head .dot { width: 8px; height: 8px; border-radius: 50%; background: var(--accent); }
 .code {
   font-family: var(--font-mono); font-size: var(--code-fs); line-height: var(--code-lh);
-  padding: 14px 0; display: flex; overflow-x: hidden;
+  padding: 14px 0; display: flex; overflow-x: auto;
 }
-/* #261: horizontal scroll must live on the codebody, not the .code flex
-   container — a container-level scroll takes the gutter with it when the
-   user scrolls long lines. The gutter sits OUTSIDE the scroll container and
-   stays visible; the codebody shrinks to the remaining space and scrolls
-   (min-width: 0 lets it shrink below its content width inside the flex row). */
-.code .codebody { flex: 1 1 auto; min-width: 0; overflow-x: auto; }
 /* #167: the gutter must not drive the flex layout — its content width
    (row count × number width) shrinks the code column, which re-wraps lines,
    which grows the gutter: a feedback loop. Pin the gutter with a fixed
@@ -316,13 +312,11 @@ html[data-wrap] .float { overflow-x: hidden; }
 .code .gutter { flex-shrink: 0; }
 /* gutter/code share line metrics; the editor gutter keeps its own padding (#50) */
 .code .gutter { padding-top: 0; padding-bottom: 0; }
-.codebody { padding: 0 18px; white-space: pre; overflow-x: auto; }
+.codebody { padding: 0 18px; white-space: pre; }
 /* #167: each logical line is its own block so offsetTop identifies its first visual row */
 .codeline { display: block; }
-/* #167: gutter number spans must stack one per visual row (wrap on).
-   #274: the /new editor gutter uses the same .gutline blocks when its own
-   wrap toggle is on, so scope the rule to any gutter, not just .code. */
-.code .gutter .gutline, .editor-wrap .gutter .gutline { display: block; }
+/* #167 rev: gutter number spans must stack one per visual row (wrap on) */
+.code .gutter .gutline { display: block; }
 /* #194: codeline blocks are adjacent (no '\n' text between them), so an
    empty block (blank source line) needs its own line box to stay one row */
 .codeline:empty::before { content: "\200B"; }
@@ -354,15 +348,10 @@ tr:last-child td { border-bottom: none; }
 tr.row { cursor: pointer; }
 tr.row:hover td { background: var(--surface-2); }
 tr.row:hover td a.slug { color: var(--accent); }
-/* #292: highlight the paste NAME uniformly on row hover, titled or not */
-tr.row:hover td .paste-name { color: var(--accent); }
 td a.slug { font-family: var(--font-mono); font-size: 21.6px; color: var(--fg); text-decoration: none; }
-td a.url-link { font-family: inherit; font-size: inherit; color: inherit; text-decoration: none; }
-td a.url-link:hover { color: var(--accent); }
 td a.slug:hover { color: var(--accent); }
 /* PASTE column fallback for untitled pastes: plain text, identical to a titled paste. URL/ID chips keep .slug styling. */
 td a.slug.paste-name { background: none; padding: 0; border-radius: 0; font-family: inherit; font-size: inherit; color: var(--fg); }
-td a.paste-name { color: var(--fg); text-decoration: none; font-family: inherit; font-size: inherit; }
 .badge { font-size: 18.9px; border: 1px solid var(--border); color: var(--muted-fg); border-radius: var(--radius-sm); padding: 1px 8px; }
 .badge.lock { color: var(--accent); border-color: var(--accent); }
 .dim { color: var(--muted-fg); white-space: nowrap; }
@@ -448,15 +437,13 @@ td a.paste-name { color: var(--fg); text-decoration: none; font-family: inherit;
 
 /* protection section rhythm (#20) */
 .protect { display: flex; flex-direction: column; gap: 2px; }
-.protect .pw-row:not(.submenu) { padding: 2px 8px 4px; }
+.protect .pw-row { padding: 2px 8px 4px; }
 
 /* submenu number boxes (#157): styled number inputs + unit selects,
    padded + indented to line up with parent option labels */
 .submenu {
-  /* #240: indent the box under the parent option LABEL text (8px row padding
-     + 16px control + 8px gap = 32px), and match the row control padding rhythm */
-  margin: 4px 0 4px 32px;
-  padding: 6px 10px;
+  margin: 6px 0 4px 8px;
+  padding: 8px 10px;
   background: var(--bg);
   border: 1px solid var(--border);
   border-radius: var(--radius);
@@ -533,7 +520,7 @@ td a.paste-name { color: var(--fg); text-decoration: none; font-family: inherit;
 /* paste name under slug pill in Paste column (#43) */
 .paste-sub { font-size: 19.8px; color: var(--muted-fg); margin-top: 2px; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }
 .paste-sub.dim { color: var(--muted); }
-td a.url-link { max-width: 100%; display: inline-block; vertical-align: middle; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; box-sizing: border-box; }
+td a.slug.url-link { max-width: 100%; display: inline-block; vertical-align: middle; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; box-sizing: border-box; }
 td .id-link { color: var(--muted-fg); text-decoration: none; font-family: var(--font-mono); font-size: 19.8px; }
 td .id-link:hover { color: var(--accent); }
 
@@ -543,9 +530,10 @@ th.sortable:hover { color: var(--fg); }
 th.sortable { cursor: pointer; user-select: none; white-space: nowrap; }
 /* #209: arrow sits RIGHT of the label, vertically centered, and absolutely
    positioned so it never shifts the label text; label aligns with column contents. */
+th.sortable { position: relative; padding-right: 24px; }
 th.sortable .sort-ind {
-  /* #209 r2: inline right after the label text with a fixed gap, not pinned to the column edge */
-  display: inline-block; width: 0; height: 0; margin-left: 6px; vertical-align: middle;
+  position: absolute; right: 8px; top: 50%; transform: translateY(-50%);
+  display: inline-block; width: 0; height: 0;
   border-left: 5px solid transparent; border-right: 5px solid transparent;
 }
 th.sorted.asc .sort-ind { border-bottom: 6px solid var(--accent); }
@@ -593,20 +581,6 @@ a.admin-link:hover { color: var(--fg); text-decoration: underline; }
   border-color: var(--ok);
 }
 
-/* #260: static-width success feedback. Label and checkmark stack in one
-   grid cell, so the button is always as wide as the wider of the two and
-   never shifts on click. Feedback is a pure .ok class toggle. */
-.swapbtn {
-  display: inline-grid;
-}
-.swapbtn > * {
-  grid-area: 1 / 1;
-  justify-self: center;
-}
-.swapbtn .swap-check { visibility: hidden; }
-.swapbtn.ok .swap-check { visibility: visible; }
-.swapbtn.ok .swap-label { visibility: hidden; }
-
 /* headings: unified treatment (mirrors .side-section h3) */
 .settings-head h1, .paste-title-bar h1, .head-row h1, .inner h1 {
   letter-spacing: -0.01em;
@@ -841,67 +815,23 @@ button[type="submit"]:focus-visible,
   font-size: 22px; padding: 0 4px; border-radius: var(--radius-sm);
 }
 .file-chip .file-chip-remove:hover { color: var(--danger, #c0392b); }
-.attachment-bar { display: flex; flex-direction: column; gap: 10px; padding: 12px; }
-/* #221: the link pill under an image preview stays a small inline chip,
-   left-aligned under the image, not stretched above it. */
-.attachment-bar .attachment-chip {
+.attachment-bar { display: flex; flex-direction: column; gap: 10px; }
+.attachment-chip {
   display: inline-flex; align-items: center; gap: 12px; align-self: flex-start;
   border: 1px solid var(--border); border-radius: var(--radius);
-  padding: 6px 14px; text-decoration: none; color: var(--fg);
-  background: var(--surface-2); font-size: 19px;
-}
-.attachment-bar .attachment-chip:hover { border-color: var(--accent); }
-.attachment-bar .attachment-chip .attachment-name {
-  min-width: 0;
-  flex: 1;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-}
-/* #232: long filenames are truncated but the pill stays a reasonable
-   width; on narrow viewports it shrinks to the container instead of
-   overflowing the card. */
-.attachment-bar .attachment-chip {
-  max-width: 100%;
-}
-.attachment-bar .attachment-chip .attachment-name:hover {
-  white-space: normal;
-  overflow-wrap: anywhere;
-}
-/* #221: images scale to fit the viewer box, aspect ratio preserved. */
-.attachment-preview {
-  max-width: 100%;
-  align-self: flex-start;
-  /* #229: no inner border/radius of its own; the .float wrapper already
-     frames the pill (inner borders get corner-clipped by overflow:hidden).
-     Padding on .attachment-bar gives the image breathing room from the
-     pill border. */
-  border: 0;
-  border-radius: 0;
-  background: var(--surface-2);
-  overflow: hidden;
-}
-.attachment-preview img {
-  display: block;
-  max-width: 100%;
-  max-height: 70vh;
-  width: auto;
-  height: auto;
-  object-fit: contain;
+  padding: 8px 16px; text-decoration: none; color: var(--fg);
+  background: var(--surface-2); font-size: 21.6px;
 }
+.attachment-chip:hover { border-color: var(--accent); }
+.attachment-chip .attachment-size { color: var(--muted-fg); font-size: 19px; }
+.attachment-preview img { max-width: 480px; max-height: 360px; border-radius: var(--radius); border: 1px solid var(--border); }
 
 /* #139: CSP-safe replacements for inline style attributes (style-src 'self') */
 .hidden { display: none; }
 .can-page { max-width: 900px; width: 100%; }
 .col-a { width: 260px; } .col-b { width: 140px; } .col-c { width: 120px; }
-.col-d { width: 90px; } .col-d2 { width: 150px; } .col-e { width: 150px; }
-.col-f { width: 100px; } .col-g { width: 120px; }
-/* #255: history's URL column had its own narrow width (col-f doubles as
-   /mine's ID column); give it a dedicated class. */
-.col-url { width: 230px; }
-/* #210: /mine rows render a delete button cell that had no declared column,
-   so under table-layout:fixed it overlapped the ID column. */
-.col-del { width: 64px; }
+.col-d { width: 96px; } .col-d2 { width: 150px; } .col-e { width: 190px; }
+.col-f { width: 100px; } .col-g { width: 190px; }
 .spacer-flex { flex: 1; }
 .input-num { width: 80px; }
 .input-num-sm { width: 64px; }
@@ -914,33 +844,3 @@ button[type="submit"]:focus-visible,
 .created-banner { display: block; }
 /* #167: gutter rows for wrapped paste view — one row per visual code line */
 .gutline { display: block; }
-
-/* #267: jump to top/bottom pills for long pastes and the editor.
-   Hidden unless JS (jump.js) detects content more than 2x the viewport. */
-.jumpnav {
-  position: fixed;
-  right: 18px;
-  bottom: 18px;
-  z-index: 50;
-  display: flex;
-  flex-direction: column;
-  gap: 8px;
-}
-.jumpnav.hidden { display: none; }
-.jump-btn { box-shadow: 0 4px 16px rgba(0, 0, 0, 0.25); }
-
-/* #273: theme-aware scrollbars. Standard properties first (Firefox, and
-   Chromium >= 121 honors scrollbar-color), then ::-webkit rules for finer
-   Chromium styling. Colors come from CSS vars so they track the preset. */
-* {
-  scrollbar-width: thin;
-  scrollbar-color: var(--border) transparent;
-}
-::-webkit-scrollbar { width: 10px; height: 10px; }
-::-webkit-scrollbar-track { background: transparent; }
-::-webkit-scrollbar-thumb {
-  background: var(--border);
-  border-radius: 5px;
-}
-::-webkit-scrollbar-thumb:hover { background: var(--muted-fg); }
-::-webkit-scrollbar-corner { background: transparent; }

internal/web/static/history.js

@@ -6,12 +6,12 @@ const t = PaletteTable.init({
   rowHtml: it =>
     `<tr class="row" data-href="/${t.esc(it.id)}"><td>` +
     (it.title
-      ? `<a class="paste-name" href="/${t.esc(it.id)}">${t.esc(it.title)}</a>${it.is_can ? ' <span class="badge" title="Can — bundle of items">can</span>' : ''}`
+      ? `${t.esc(it.title)}${it.is_can ? ' <span class="badge" title="Can — bundle of items">can</span>' : ''}`
       : `<a class="slug paste-name" href="/${t.esc(it.id)}">${t.esc(it.id)}</a>${it.is_can ? ' <span class="badge" title="Can — bundle of items">can</span>' : ''}`) +
     `</td>` +
-    `<td><span class="badge">${t.esc(it.type || it.language || 'text')}</span></td>` +
+    `<td><span class="badge">${t.esc(it.language || 'text')}</span></td>` +
     `<td class="dim">${t.fmtSize(it.size)}</td><td class="dim">${it.view_count}</td><td class="dim" data-ts="${it.created_at}">${t.ago(it.created_at)}</td>` +
-    (it.custom_slug ? `<td class="dim"><a class="url-link" href="/${t.esc(it.custom_slug)}">/${t.esc(it.custom_slug)}</a></td>` : `<td class="dim">none</td>`) +
+    (it.custom_slug ? `<td><a class="slug url-link" href="/${t.esc(it.custom_slug)}">/${t.esc(it.custom_slug)}</a></td>` : `<td class="dim">none</td>`) +
     `<td class="dim"><a class="id-link" href="/${t.esc(it.id)}">${t.esc(it.id)}</a></td></tr>`,
   emptyFiltered: 'No pastes match your search.',
   emptyAll: 'No pastes yet. Create the first one.',

internal/web/static/jump.js

@@ -1,51 +0,0 @@
-/* #267: jump to top / bottom controls for long content.
-   Paste view scrolls the window; the /new editor scrolls its textarea.
-   The active scroller is chosen via data-jump-scroll on the script tag. */
-(function () {
-  var nav = document.getElementById('jumpnav');
-  if (!nav) return;
-  var scroller = window;
-  var sel = nav.dataset.jumpScroll;
-  if (sel) scroller = document.querySelector(sel);
-
-  function el() {
-    return scroller === window ? document.scrollingElement : scroller;
-  }
-  function isLarge() {
-    var e = el();
-    if (!e) return false;
-    var visible = scroller === window ? window.innerHeight : e.clientHeight;
-    return e.scrollHeight > visible * 2;
-  }
-  function refresh() {
-    nav.classList.toggle('hidden', !isLarge());
-  }
-  function jump(toTop) {
-    var e = el();
-    if (!e) return;
-    if (scroller === window) {
-      window.scrollTo({ top: toTop ? 0 : e.scrollHeight });
-    } else {
-      e.scrollTop = toTop ? 0 : e.scrollHeight;
-    }
-  }
-  nav.addEventListener('click', function (ev) {
-    var b = ev.target.closest('[data-jump]');
-    if (!b) return;
-    ev.preventDefault();
-    jump(b.dataset.jump === 'top');
-  });
-  window.addEventListener('resize', refresh);
-  if (scroller !== window && scroller) scroller.addEventListener('input', refresh);
-  refresh();
-  /* #282: the first evaluation can run before the layout settles (media
-     queries, web fonts, async highlighting) and under-measure the content,
-     leaving the nav hidden on long pages. Re-check once a real layout exists
-     and after load; the ResizeObserver also catches late content growth. */
-  requestAnimationFrame(function () { requestAnimationFrame(refresh); });
-  window.addEventListener('load', refresh);
-  window.setTimeout(refresh, 300);
-  if (window.ResizeObserver && scroller === window && document.body) {
-    new ResizeObserver(refresh).observe(document.body);
-  }
-})();

internal/web/static/mine.js

@@ -18,12 +18,12 @@ const t = PaletteTable.init({
   rowHtml: it =>
     `<tr class="row" data-href="/${t.esc(it.id)}"><td>` +
     (it.title
-      ? `<a class="paste-name" href="/${t.esc(it.id)}">${t.esc(it.title)}</a>${it.is_can ? ' <span class="badge" title="Can — bundle of items">can</span>' : ''}`
+      ? `${t.esc(it.title)}${it.is_can ? ' <span class="badge" title="Can — bundle of items">can</span>' : ''}`
       : `<a class="slug paste-name" href="/${t.esc(it.id)}">${t.esc(it.id)}</a>${it.is_can ? ' <span class="badge" title="Can — bundle of items">can</span>' : ''}`) +
     `</td>` +
-    `<td><span class="badge">${t.esc(it.type || it.language || 'text')}</span></td>` +
+    `<td><span class="badge">${t.esc(it.language || 'text')}</span></td>` +
     `<td class="dim">${t.fmtSize(it.size)}</td><td class="dim" data-ts="${it.created_at}">${t.ago(it.created_at)}</td>` +
-    (it.custom_slug ? `<td class="dim"><a class="url-link" href="/${t.esc(it.custom_slug)}">/${t.esc(it.custom_slug)}</a></td>` : `<td class="dim">none</td>`) +
+    (it.custom_slug ? `<td><a class="slug url-link" href="/${t.esc(it.custom_slug)}">/${t.esc(it.custom_slug)}</a></td>` : `<td class="dim">none</td>`) +
     `<td class="dim"><a class="id-link" href="/${t.esc(it.id)}">${t.esc(it.id)}</a></td>` +
     `<td><button class="btn btn-icon del" data-id="${t.esc(it.id)}" title="Delete paste" aria-label="Delete paste">&times;</button></td></tr>`,
   emptyFiltered: 'No pastes from this browser match your search.',

internal/web/static/new.js

@@ -2,73 +2,13 @@
 const $ = id => document.getElementById(id);
 const content = $('content'), gutter = $('gutter');
 
-// #274: with wrap on, a logical line occupies several VISUAL rows in the
-// textarea, so one number per logical line drifts off its text (same bug the
-// paste view fixed in #167). A textarea can't be split into spans, so the
-// wrapped row count per logical line is measured with a hidden mirror div
-// that shares the editor's font, line metrics and wrapping rules, and the
-// gutter renders one .gutline block per visual row with the number on the
-// FIRST row of its logical line (fillers elsewhere).
-let mirror = null;
-function measureRows(lines) {
-  if (!mirror) {
-    mirror = document.createElement('div');
-    mirror.style.position = 'absolute';
-    mirror.style.visibility = 'hidden';
-    mirror.style.top = '0';
-    mirror.style.left = '-9999px';
-    document.body.appendChild(mirror);
-  }
-  const cs = getComputedStyle(content);
-  mirror.style.font = cs.font;
-  mirror.style.lineHeight = cs.lineHeight;
-  mirror.style.whiteSpace = 'pre-wrap';
-  mirror.style.overflowWrap = 'anywhere';
-  mirror.style.wordBreak = 'break-all';
-  mirror.style.width = (content.clientWidth - parseFloat(cs.paddingLeft) - parseFloat(cs.paddingRight)) + 'px';
-  const lh = parseFloat(cs.lineHeight) || 1;
-  const starts = [];
-  let total = 0;
-  const n = Math.max(lines.length, 1);
-  for (let i = 0; i < n; i++) {
-    // A trailing newline yields an empty last line: it still occupies one row.
-    mirror.textContent = lines[i] + '\n';
-    let rows = Math.max(1, Math.round(mirror.getBoundingClientRect().height / lh));
-    starts.push(total);
-    total += rows;
-  }
-  return { starts, total };
-}
-
 function updateGutter() {
-  const lines = content.value.split('\n');
-  const n = Math.max(lines.length, 1);
-  if (!document.documentElement.hasAttribute('data-wrap')) {
+  const lines = content.value.split('\n').length;
   let s = '';
-    for (let i = 1; i <= n; i++) s += i + '\n';
-    gutter.textContent = s.slice(0, -1);
-    return;
-  }
-  const { starts, total } = measureRows(lines);
-  gutter.textContent = '';
-  const frag = document.createDocumentFragment();
-  const spans = [];
-  for (let r = 0; r < total; r++) {
-    const c = document.createElement('span');
-    c.className = 'gutline';
-    c.textContent = '\u00a0';
-    spans.push(c);
-    frag.appendChild(c);
-  }
-  gutter.appendChild(frag);
-  for (let j = 0; j < starts.length; j++) spans[starts[j]].textContent = String(j + 1);
+  for (let i = 1; i <= Math.max(lines, 1); i++) s += i + '\n';
+  gutter.textContent = s;
 }
 content.addEventListener('input', updateGutter);
-// #274: the wrap toggle and width changes re-wrap the textarea; re-measure.
-new MutationObserver(updateGutter).observe(document.documentElement, { attributes: true, attributeFilter: ['data-wrap'] });
-window.addEventListener('resize', updateGutter);
-// #259: the editor scrolls itself; keep the gutter's numbers in step with it.
-content.addEventListener('scroll', () => { gutter.scrollTop = content.scrollTop; });
 updateGutter();
 
 function toast(msg, kind) {
@@ -250,16 +190,15 @@ async function create() {
 // button, password auto-unlock, then redirect to the paste.
 function finishCreate(data) {
   const url = location.origin + '/' + (data.custom_slug || data.id);
-  // #260 attempt 2: .swapbtn markup — label and checkmark share one grid
-  // cell, so the button width is static and feedback is a class toggle.
-  showResult('<a href="' + url + '">' + url + '</a> <button class="btn btn-icon swapbtn" id="result-copy" title="Copy URL" type="button"><span class="swap-label">Copy</span><span class="swap-check">✓</span></button>', 'ok');
+  showResult('<a href="' + url + '">' + url + '</a> <button class="btn btn-icon" id="result-copy" title="Copy URL" type="button">⧉</button>', 'ok');
   $('result').dataset.token = data.deletion_token || '';
   const copyBtn = document.getElementById('result-copy');
   copyBtn.addEventListener('click', () => {
     try {
       navigator.clipboard.writeText(url);
       copyBtn.classList.add('ok');               // in-place success feedback (#53)
-      setTimeout(() => copyBtn.classList.remove('ok'), 2000);
+      copyBtn.textContent = 'Success!';
+      setTimeout(() => { copyBtn.classList.remove('ok'); copyBtn.textContent = '⧉'; }, 2000);
     } catch(e) { toast('Copy failed', 'error'); }
   });
   // token carried via sessionStorage, never in the URL (#143)
@@ -368,19 +307,21 @@ function setAttachedFile(file) {
   attachedFile = file;
   renderFileChip();
   setHidden('file-text-note', false);
-  // #233: title auto-fill — the file's own name always wins when the
-  // title is still blank; fallback is date.fileextension (e.g.
-  // 2026-09-10.txt) when the name is missing or unusable. Never
-  // overwrite a typed title.
+  // #171/#184: title auto-fill — images take the file name; text files
+  // use the language-placeholder convention (e.g. Python.py, fallback
+  // Text.txt). Only when the title is still blank; never overwrite a
+  // typed title.
   if (!$('title').value.trim()) {
-    const raw = (file.name || '').trim();
-    if (raw) {
-      $('title').value = raw;
+    if (IMAGE_RE.test(file.type)) {
+      $('title').value = file.name;
     } else {
-      const d = new Date();
-      const iso = d.getFullYear() + '-' + String(d.getMonth() + 1).padStart(2, '0') + '-' + String(d.getDate()).padStart(2, '0');
-      const ext = extOf(raw || file.name);
-      $('title').value = ext ? iso + '.' + ext : iso;
+      const lang = LANG_BY_EXT[extOf(file.name)];
+      if (lang) {
+        const fn = defaultFilename(lang);
+        if (fn) $('title').value = fn;
+      } else if (TEXT_EXTS.has(extOf(file.name))) {
+        $('title').value = defaultFilename('text') || 'Text.txt';
+      }
     }
   }
   showFileInEditor(file);

internal/web/static/paste-lines.js

@@ -17,10 +17,7 @@
   // because HighlightCode highlights per line) in a .codeline block. The
   // spans are display:block, so they are joined with '' — a '\n' join leaves
   // newline text nodes between blocks that pre-wrap renders as an extra line
-  // box per line, which would shift every following number down one row (#167,
-  // #205). Whitespace-only text nodes are also stripped defensively below: any
-  // that reach the DOM (older cached HTML, other templates) render as phantom
-  // rows under white-space: pre and drift the gutter.
+  // box per line, which would shift every following number down one row (#167).
   function splitLines() {
     var html = body.innerHTML;
     var parts = html.split('\n');
@@ -29,12 +26,6 @@
       out.push('<span class="codeline">' + parts[i] + '</span>');
     }
     body.innerHTML = out.join('');
-    // #205: strip whitespace-only text nodes between the .codeline blocks.
-    var ws = [];
-    for (var n = body.firstChild; n; n = n.nextSibling) {
-      if (n.nodeType === 3 && !/\S/.test(n.nodeValue)) ws.push(n);
-    }
-    for (var w = 0; w < ws.length; w++) body.removeChild(ws[w]);
   }
 
   // One .gutline block per visual row. The gutter must reproduce the code
@@ -44,23 +35,6 @@
   // measured, not derived from span counts or heights.
   function renumber() {
     var lines = body.querySelectorAll('.codeline');
-    // #257: size the gutter column to the widest line number so numbers in
-    // the 100s+ fit their own column instead of bleeding into the code text.
-    // The gutter is box-sizing: border-box, so the column width must be the
-    // digits PLUS the 10px left + 10px right padding; at the CSS default 3ch
-    // the padding alone leaves only ~19px of content, and any 2+ digit
-    // number overflows into the code. Numbers are right-aligned, and the
-    // width below fits the widest number exactly. Set via CSSOM (CSP
-    // forbids inline style attributes). Only touch the width when it
-    // changes: the resize observer below re-runs renumber() when the gutter
-    // width reflows the code column, and rewriting the same value would
-    // ping-pong the fixed point forever.
-    var digits = String(lines.length || 1).length;
-    var w = 'calc(' + digits + 'ch + 20px)';
-    if (gutter.style.width !== w) {
-      gutter.style.minWidth = w;
-      gutter.style.width = w;
-    }
     if (!wrapOn() || !lines.length) {
       // wrap OFF: one number per logical line (pre-existing behavior,
       // including the gutter scrolling with horizontal scroll).

internal/web/static/paste.js

@@ -16,26 +16,17 @@ function toggleStats() {
   pill.classList.toggle('open', open);
   btn.setAttribute('aria-expanded', open ? 'true' : 'false');
 }
-function copyFeedback(btn) {
-  if (!btn) return;
-  // #260 attempt 2: .swapbtn stacks the label and checkmark in the same grid
-  // cell, so the button width is always the wider of the two and never moves.
-  // Feedback is a pure class toggle; no width pinning, no textContent swap.
-  btn.classList.add('ok');
-  clearTimeout(btn._okh);
-  btn._okh = setTimeout(() => btn.classList.remove('ok'), 2000);
-}
 function copyContent(btn) {
-  navigator.clipboard.writeText(document.getElementById('raw-content').value)
-    .then(() => copyFeedback(btn))
-    .catch(() => toast('Copy failed'));
-}
-// #243: copy the paste LINK (full URL), not the paste id or content
-function copyLink(btn) {
-  const url = location.origin + location.pathname;
-  navigator.clipboard.writeText(url)
-    .then(() => copyFeedback(btn))
-    .catch(() => toast('Copy failed'));
+  navigator.clipboard.writeText(document.getElementById('raw-content').value);
+  // in-place success feedback (#53)
+  if (btn) {
+    btn.classList.add('ok');
+    btn.textContent = 'Success!';
+    clearTimeout(btn._okh);
+    btn._okh = setTimeout(() => { btn.classList.remove('ok'); btn.textContent = 'copy'; }, 2000);
+  } else {
+    toast('Link Copied', 'success');
+  }
 }
 function redeem() {
   if (!confirm('Hard delete this paste immediately?')) return;
@@ -43,15 +34,13 @@ function redeem() {
   try { tok = sessionStorage.getItem('deletion_token_' + PASTE_ID) || ''; } catch(e) {}
   if (!tok) { alert('deletion token not available in this browser'); return; }
   fetch('/api/pastes/' + PASTE_ID + '/redeem', {method: 'DELETE', headers: {'Authorization': 'Bearer ' + tok}})
-    .then(r => { if (r.ok) location.href = '/public'; else alert('delete failed'); });
+    .then(r => { if (r.ok) location.href = '/history'; else alert('delete failed'); });
 }
 
 // wiring (moved from inline handlers for CSP #139)
 var PASTE_ID = document.currentScript.getAttribute('data-paste-id');
 var copyBtn = document.getElementById('copy-btn');
 if (copyBtn) copyBtn.addEventListener('click', function (e) { e.preventDefault(); copyContent(copyBtn); });
-var copyLinkBtn = document.getElementById('copy-link-btn');
-if (copyLinkBtn) copyLinkBtn.addEventListener('click', function (e) { e.preventDefault(); copyLink(copyLinkBtn); });
 var delBtn = document.getElementById('delete-btn');
 
 // #168: show the compact paste-created pill in the bottom corner, then fade it out

internal/web/static/settings.js

@@ -73,10 +73,7 @@
     });
     btn.addEventListener('click', function () {
       var dark = state().dark;
-      // #294: use the generic variant resolvers - midnight is dark-first
-      // (dark preset = 'midnight', light = 'midnight-light'), so a raw
-      // t.id + '-dark' build landed on nonexistent/forced-dark presets.
-      document.documentElement.dataset.preset = dark ? darkPreset(t.id) : lightPreset(t.id);
+      document.documentElement.dataset.preset = dark ? t.id + '-dark' : t.id;
       try { localStorage.setItem('palette-theme', t.id); } catch (e) {}
       Object.keys(cards).forEach(function (k) { cards[k].setAttribute('aria-pressed', 'false'); });
       btn.setAttribute('aria-pressed', 'true');

internal/web/static/table.js

@@ -16,7 +16,7 @@ const PaletteTable = (() => {
   const sortVal = (it, k) => {
     let v = it[k];
     if (k === 'title' || k === 'custom_slug') v = (v == null || v === '') ? null : String(v).toLowerCase();
-    if (k === 'language' || k === 'type') v = (v == null || v === '') ? 'text' : String(v).toLowerCase();
+    if (k === 'language') v = (v == null || v === '') ? 'text' : String(v).toLowerCase();
     if (k === 'size' || k === 'view_count' || k === 'created_at') return v == null ? -1 : v;
     return v == null ? null : v;
   };
@@ -104,7 +104,7 @@ const PaletteTable = (() => {
             const btns = [];
             const add = (label, target, o={}) => btns.push(`<button ${o.on?'class="on"':''} ${o.dis?'disabled':''} data-p="${target}">${label}</button>`);
             add('‹', state.page-1, {dis: state.page===1});
-            const win = new Set([1, state.page-1, state.page, state.page+1, filtPages]);
+            const win = new Set([1, 2, state.page-1, state.page, state.page+1, filtPages]);
             let last = 0;
             for (let i = 1; i <= filtPages; i++) {
               if (win.has(i)) {
@@ -121,7 +121,7 @@ const PaletteTable = (() => {
             const btns = [];
             const add = (label, target, o={}) => btns.push(`<button ${o.on?'class="on"':''} ${o.dis?'disabled':''} data-p="${target}">${label}</button>`);
             add('‹', state.page-1, {dis: state.page===1});
-            const win = new Set([1, state.page-1, state.page, state.page+1, pages]);
+            const win = new Set([1, 2, state.page-1, state.page, state.page+1, pages]);
             let last = 0;
             for (let i = 1; i <= pages; i++) {
               if (win.has(i)) {

internal/web/templates/history.html

@@ -8,15 +8,15 @@
   <div class="search"><input id="filter" placeholder="Search…"><span class="search-spinner" id="search-spinner"></span></div>
   <div class="float">
     <table>
-      <colgroup><col class="col-a"><col class="col-b"><col class="col-c"><col class="col-d"><col class="col-e"><col class="col-url"><col class="col-g"></colgroup>
+      <colgroup><col class="col-a"><col class="col-b"><col class="col-c"><col class="col-d"><col class="col-e"><col class="col-f"><col class="col-g"></colgroup>
       <thead><tr>
-        <th data-sort="title" class="sortable">Paste<span class="sort-ind"></span></th>
-        <th data-sort="type" class="sortable">Type<span class="sort-ind"></span></th>
-        <th data-sort="size" class="sortable">Size<span class="sort-ind"></span></th>
-        <th data-sort="view_count" class="sortable">Views<span class="sort-ind"></span></th>
-        <th data-sort="created_at" class="sortable">Created<span class="sort-ind"></span></th>
-        <th data-sort="custom_slug" class="sortable">URL<span class="sort-ind"></span></th>
-        <th data-sort="id" class="sortable">ID<span class="sort-ind"></span></th>
+        <th data-sort="title" class="sortable"><span class="sort-ind"></span>Paste</th>
+        <th data-sort="language" class="sortable"><span class="sort-ind"></span>Language</th>
+        <th data-sort="size" class="sortable"><span class="sort-ind"></span>Size</th>
+        <th data-sort="view_count" class="sortable"><span class="sort-ind"></span>Views</th>
+        <th data-sort="created_at" class="sortable"><span class="sort-ind"></span>Created</th>
+        <th data-sort="custom_slug" class="sortable"><span class="sort-ind"></span>URL</th>
+        <th data-sort="id" class="sortable"><span class="sort-ind"></span>ID</th>
       </tr></thead>
       <tbody id="rows"></tbody>
     </table>

internal/web/templates/layout.html

@@ -8,11 +8,11 @@
 
 {{define "topbar"}}
   <div class="topbar">
-    <a class="logo" href="/public">Palette <em>/ {{ version }}</em></a>
+    <a class="logo" href="/history">Palette <em>/ {{ version }}</em></a>
     <nav>
       <a href="/new" {{if eq .Page "new"}}class="on"{{end}}>New</a>
-      <a href="/public" {{if eq .Page "public"}}class="on"{{end}}>Public</a>
-      <a href="/saved" {{if eq .Page "saved"}}class="on"{{end}}>Saved</a>
+      <a href="/history" {{if eq .Page "history"}}class="on"{{end}}>Public</a>
+      <a href="/mine" {{if eq .Page "mine"}}class="on"{{end}}>Saved</a>
       <a href="https://git.archfox.org/poslop/palette" target="_blank" rel="noopener">Git<svg class="ext" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><path d="M18 13v6a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V8a2 2 0 0 1 2-2h6"/><polyline points="15 3 21 3 21 9"/><line x1="10" y1="14" x2="21" y2="3"/></svg></a>
     </nav>
     <div class="spacer"></div>

internal/web/templates/mine.html

@@ -8,15 +8,14 @@
   <div class="search"><input id="filter" placeholder="Search…"><span class="search-spinner" id="search-spinner"></span></div>
   <div class="float">
     <table>
-      <colgroup><col class="col-a"><col class="col-b"><col class="col-c"><col class="col-d2"><col class="col-url"><col class="col-f"><col class="col-del"></colgroup>
+      <colgroup><col class="col-a"><col class="col-b"><col class="col-c"><col class="col-d2"><col class="col-e"><col class="col-f"></colgroup>
       <thead><tr>
-        <th data-sort="title" class="sortable">Paste<span class="sort-ind"></span></th>
-        <th data-sort="type" class="sortable">Type<span class="sort-ind"></span></th>
-        <th data-sort="size" class="sortable">Size<span class="sort-ind"></span></th>
-        <th data-sort="created_at" class="sortable">Created<span class="sort-ind"></span></th>
-        <th data-sort="custom_slug" class="sortable">URL<span class="sort-ind"></span></th>
-        <th data-sort="id" class="sortable">ID<span class="sort-ind"></span></th>
-        <th aria-label="Delete"></th>
+        <th data-sort="title" class="sortable"><span class="sort-ind"></span>Paste</th>
+        <th data-sort="language" class="sortable"><span class="sort-ind"></span>Language</th>
+        <th data-sort="size" class="sortable"><span class="sort-ind"></span>Size</th>
+        <th data-sort="created_at" class="sortable"><span class="sort-ind"></span>Created</th>
+        <th data-sort="custom_slug" class="sortable"><span class="sort-ind"></span>URL</th>
+        <th data-sort="id" class="sortable"><span class="sort-ind"></span>ID</th>
       </tr></thead>
       <tbody id="rows"></tbody>
     </table>

internal/web/templates/new.html

@@ -19,7 +19,7 @@
           <option>markdown</option><option>text</option>
         </select>
         <button class="btn btn-icon" id="reguess" title="Re-detect language" type="button"><svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2.4" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><path d="M21 12a9 9 0 1 1-2.64-6.36"/><polyline points="21 3 21 9 15 9"/></svg></button>
-        <button type="button" class="btn btn-icon wrap-toggle" id="wrap-toggle" title="Toggle line wrap" aria-pressed="false">Wrap</button>
+        <button type="button" class="btn btn-icon wrap-toggle" id="wrap-toggle" title="Toggle line wrap" aria-pressed="false">wrap</button>
         </div>
       </div>
     </div>
@@ -33,10 +33,6 @@
       <div class="spacer spacer-flex"></div>
       <button class="btn" id="create">Create</button>
     </div>
-    <div class="jumpnav hidden" id="jumpnav" data-jump-scroll="#content">
-      <button type="button" class="btn jump-btn" data-jump="top">Top</button>
-      <button type="button" class="btn jump-btn" data-jump="bottom">Bottom</button>
-    </div>
   </div>
 
   <div class="pane-r">
@@ -94,5 +90,4 @@
   </div>
 </div>
 <script src="/static/new.js" defer></script>
-<script src="/static/jump.js" defer></script>
 {{template "foot" .}}

internal/web/templates/paste.html

@@ -6,11 +6,10 @@
       <h1>{{if .Title}}{{.Title}}{{else}}Untitled paste{{end}}</h1>
       {{if .CustomSlug}}<span class="slug">/{{.CustomSlug}}</span>{{end}}
       <div class="spacer"></div>
-      <button type="button" class="iconbtn wrap-toggle" title="Toggle line wrap" aria-pressed="false">Wrap</button>
-      <a class="iconbtn" href="/raw/{{.ID}}">Raw</a>
-      <a class="iconbtn swapbtn" href="#" id="copy-link-btn"><span class="swap-label">Link</span><span class="swap-check">✓</span></a>
-      <a class="iconbtn swapbtn" href="#" id="copy-btn"><span class="swap-label">Copy</span><span class="swap-check">✓</span></a>
-      {{if .DeletionToken}}<a class="iconbtn danger" href="#" id="delete-btn">Delete</a>{{end}}
+      <button type="button" class="iconbtn wrap-toggle" title="Toggle line wrap" aria-pressed="false">wrap</button>
+      <a class="iconbtn" href="/raw/{{.ID}}">raw</a>
+      <a class="iconbtn" href="#" id="copy-btn">copy</a>
+      {{if .DeletionToken}}<a class="iconbtn danger" href="#" id="delete-btn">delete</a>{{end}}
     </div>
   </div>
   <div class="float">
@@ -21,7 +20,7 @@
       </button>
       <div class="stats-body" id="stats-body" hidden>
         <div class="stats-grid">
-          <span class="stats-k">Type</span><span class="stats-v">{{.TypeLabel}}</span>
+          <span class="stats-k">Language</span><span class="stats-v">{{if .Language}}{{.Language}}{{else}}text{{end}}</span>
           <span class="stats-k">Size</span><span class="stats-v">{{.SizeHuman}} ({{.LineCount}} lines)</span>
           <span class="stats-k">Views</span><span class="stats-v">{{.ViewCount}}</span>
           <span class="stats-k">Created</span><span class="stats-v" data-ts="{{.CreatedAtUnix}}">{{.CreatedAgo}}</span>
@@ -40,28 +39,21 @@
   {{if .Attachment}}
   <div class="float">
     <div class="attachment-bar">
-      {{if .AttachmentImage}}
-      <div class="attachment-preview"><img src="/f/{{.Attachment.ID}}/{{.Attachment.Filename}}" alt="{{.Attachment.Filename}}"></div>
-      {{end}}
       <a class="attachment-chip" href="/f/{{.Attachment.ID}}/{{.Attachment.Filename}}" data-mime="{{.Attachment.Mime}}">
         <span class="attachment-name">{{.Attachment.Filename}}</span>
         <span class="attachment-size">{{.Attachment.SizeHuman}}</span>
       </a>
+      {{if or (eq .Attachment.Mime "image/png") (eq .Attachment.Mime "image/jpeg") (eq .Attachment.Mime "image/gif") (eq .Attachment.Mime "image/webp")}}
+      <div class="attachment-preview"><img src="/f/{{.Attachment.ID}}/{{.Attachment.Filename}}" alt="{{.Attachment.Filename}}"></div>
+      {{end}}
     </div>
   </div>
   {{end}}
-  {{if not .Attachment}}
   <div class="float">
     <div class="code" id="code"><div class="gutter" id="gutter">{{.Gutter}}</div><div class="codebody" id="codebody">{{.ContentHTML}}</div></div>
   </div>
-  {{end}}
-  <div class="jumpnav hidden" id="jumpnav">
-    <button type="button" class="btn jump-btn" data-jump="top">Top</button>
-    <button type="button" class="btn jump-btn" data-jump="bottom">Bottom</button>
-  </div>
 </div>
 <input type="hidden" id="raw-content" value="{{.ContentAttr}}">
 <script src="/static/paste.js" defer data-paste-id="{{.ID}}"></script>
 <script src="/static/paste-lines.js" defer></script>
-<script src="/static/jump.js" defer></script>
 {{template "foot" .}}

internal/web/web.go

@@ -231,20 +231,6 @@ func (h *Handlers) renderPageStatus(w http.ResponseWriter, name string, status i
 	}
 }
 
-// attachmentExt returns the lowercase file extension (without dot) of a
-// filename, or "" when the name has none. Used by the Type display (#235).
-func attachmentExt(filename string) string {
-	name := filename
-	if i := strings.LastIndexByte(name, '/'); i >= 0 {
-		name = name[i+1:]
-	}
-	i := strings.LastIndexByte(name, '.')
-	if i <= 0 || i == len(name)-1 {
-		return ""
-	}
-	return strings.ToLower(name[i+1:])
-}
-
 func (h *Handlers) renderPaste(w http.ResponseWriter, row *store.PasteRow, justCreated bool, deletionToken string, readsRemaining *int) {
 	lines := strings.Count(row.Content, "\n") + 1
 	gutter := ""
@@ -259,62 +245,27 @@ func (h *Handlers) renderPaste(w http.ResponseWriter, row *store.PasteRow, justC
 	if lang == "" {
 		lang = "text"
 	}
+	summary := fmt.Sprintf("%s · %s · %d views · %s", lang, humanSize(len(row.Content)), row.ViewCount, agoString(row.CreatedAt))
 	// #38: one optional file attachment per paste; nil when none.
 	attachment, err := h.Store.GetAttachmentForPaste(row.ID)
 	if err != nil {
 		http.Error(w, "db error", 500)
 		return
 	}
-	// #221: for attachment pastes the stored text content is empty (the file
-	// replaced it), so the summary size must come from the attachment blob,
-	// not len(row.Content), or the summary shows "0 B".
-	summarySize := len(row.Content)
-	if attachment != nil {
-		summarySize = int(attachment.Size)
-	}
-	// #235: column renamed to "Type". Text pastes keep the detected
-	// language; attachment pastes show the file extension instead.
-	attExt := ""
-	typeLabel := lang
-	if attachment != nil {
-		if ext := attachmentExt(attachment.Filename); ext != "" {
-			attExt = ext
-			typeLabel = ext
-		}
-	}
-	summary := fmt.Sprintf("%s · %s · %d views · %s", typeLabel, humanSize(summarySize), row.ViewCount, agoString(row.CreatedAt))
-	// #221: image attachments render the image, not a text/code box. Size
-	// comes from the attachment's actual file size, not the text content.
-	attImage := false
-	if attachment != nil {
-		switch attachment.Mime {
-		case "image/png", "image/jpeg", "image/gif", "image/webp":
-			attImage = true
-		}
-	}
-	sizeHuman := humanSize(len(row.Content))
-	lineCount := lines
-	if attachment != nil {
-		sizeHuman = attachment.SizeHuman
-		lineCount = 1
-	}
 	data := map[string]any{
 		"Page":          "paste",
 		"ID":            row.ID,
 		"Title":         row.Title.String,
-		"Language":      typeLabel,
-		"TypeLabel":     typeLabel,
-		"HasAttachment":  attachment != nil,
-		"AttachmentExt": attExt,
+		"Language":      row.Language.String,
 		"StatsSummary":  summary,
-		"SizeHuman":     sizeHuman,
+		"SizeHuman":     humanSize(len(row.Content)),
 		"HasPassword":   row.PasswordHash.Valid,
 		"BurnAfterRead": row.BurnAfterRead,
 		"CustomSlug":    row.CustomSlug.String,
 		"ContentHTML":   template.HTML(langpkg.HighlightCode(row.Content, row.Language.String)), // safe: HighlightCode escapes all non-span text
 		"ContentAttr":   row.Content,
 		"Gutter":        strings.TrimSuffix(gutter, "\n"),
-		"LineCount":     lineCount,
+		"LineCount":     lines,
 		"SizeBytes":     len(row.Content),
 		"CreatedAgo":    agoString(row.CreatedAt),
 		"CreatedAtUnix": row.CreatedAt,
@@ -328,7 +279,6 @@ func (h *Handlers) renderPaste(w http.ResponseWriter, row *store.PasteRow, justC
 		"ReadsTotal":    int(row.ReadsLimit.Int64),
 		"JustCreated":   justCreated,
 		"Attachment":    attachment,
-		"AttachmentImage": attImage,
 		"Host":          "this host",
 	}
 	h.renderPage(w, "paste.html", data)
@@ -433,9 +383,9 @@ func (h *Handlers) HandleNewPage(w http.ResponseWriter, r *http.Request) {
 	h.renderPage(w, "new.html", map[string]any{"Page": "new"})
 }
 
-// HandleHistoryPage serves /public.
+// HandleHistoryPage serves /history.
 func (h *Handlers) HandleHistoryPage(w http.ResponseWriter, r *http.Request) {
-	h.renderPage(w, "history.html", map[string]any{"Page": "public"})
+	h.renderPage(w, "history.html", map[string]any{"Page": "history"})
 }
 
 // HandleSettingsPage serves /settings.
@@ -452,9 +402,9 @@ func (h *Handlers) HandleSettingsPage(w http.ResponseWriter, r *http.Request) {
 	h.renderPage(w, "settings.html", map[string]any{"Page": "settings", "Themes": themes})
 }
 
-// HandleMinePage serves /saved.
+// HandleMinePage serves /mine.
 func (h *Handlers) HandleMinePage(w http.ResponseWriter, r *http.Request) {
-	h.renderPage(w, "mine.html", map[string]any{"Page": "saved"})
+	h.renderPage(w, "mine.html", map[string]any{"Page": "mine"})
 }
 
 // HandleAdminPage serves /admin.