Merge pull request #78 from drduh/wip-22nov25

drduh · web-flow · commit 225d21393fcd · 2025-11-23T09:50:00.000-08:00
refactor ui for mobile compatibility, versioned base64 file ids
diff --git a/.github/workflows/test-and-lint.yml b/.github/workflows/test-and-lint.yml
@@ -17,7 +17,7 @@ jobs:
     name: test
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
     - uses: actions/setup-go@v6
       with:
         go-version: stable
@@ -30,7 +30,7 @@ jobs:
     name: lint
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
     - uses: actions/setup-go@v6
       with:
         go-version: stable
diff --git a/assets/style.css b/assets/style.css
@@ -1,10 +1,12 @@
 /* style.css */
+
 * {
   box-sizing: border-box;
   font-family: "Open Sans", "Helvetica Neue", "Helvetica", "Arial", sans-serif;
 }
 
 body {
+  align-items: center;
   animation: var(--bg-animation);
   background: var(--bg-gradient);
   background-size: var(--bg-size);
@@ -13,14 +15,8 @@ body {
   display: flex;
   flex-direction: column;
   font-size: 1em;
-  margin: 0;
-  padding: 0;
-}
-
-.container {
-  display: flex;
-  justify-content: space-between;
-  padding: 1em;
+  margin: 1em auto;
+  max-width: 80%;
 }
 
 .box {
@@ -30,8 +26,8 @@ body {
   box-sizing: border-box;
   color: var(--fg-dark);
   flex: 1;
-  margin: 10px;
-  padding: 20px;
+  margin: 1em;
+  padding: 1em;
   text-align: center;
 }
 
@@ -229,3 +225,20 @@ tr:hover,
   background-color: var(--bg-light);
   transition: background-color var(--animation) ease;
 }
+
+details {
+  padding: 1em;
+  text-align: center;
+}
+
+summary {
+  border-bottom: 1px dotted var(--fg-light);
+  color: var(--fg-light);
+  cursor: pointer;
+  display: inline;
+}
+
+summary::marker {
+  content: "";
+  display: none;
+}
diff --git a/handlers/upload.go b/handlers/upload.go
@@ -106,7 +106,7 @@ func Upload(app *config.App) http.HandlerFunc {
 					},
 				}
 
-				f.Scan(app.IdLength)
+				f.Scan()
 				app.Files[f.Name] = f
 
 				upload = storage.File{
diff --git a/settings/config.go b/settings/config.go
@@ -175,9 +175,6 @@ type Limit struct {
 	// Wall character length
 	CharsWall int `json:"charsWall,omitempty"`
 
-	// File identification string length
-	IdLength int `json:"idLength,omitempty"`
-
 	// Maximum file size (in Megabytes)
 	MaxSizeMb int64 `json:"maxSizeMb,omitempty"`
 
diff --git a/settings/defaultSettings.json b/settings/defaultSettings.json
@@ -70,8 +70,7 @@
   "limit": {
     "charsMsg":    128,
     "charsWall":   1280,
-    "idLength":    32,
-    "maxSizeMb":   20,
+    "maxSizeMb":   256,
     "perMinute":   30,
     "ticker":      "30s"
   },
diff --git a/storage/config.go b/storage/config.go
@@ -6,6 +6,8 @@ import (
 	"time"
 )
 
+const storageVersion = "1"
+
 // Storage represents content uploaded by users.
 type Storage struct {
 
diff --git a/storage/scan.go b/storage/scan.go
@@ -9,16 +9,16 @@ import (
 )
 
 // Scan identifies and sets File attributes.
-func (f *File) Scan(idLength int) {
-	f.setId(idLength)
+func (f *File) Scan() {
+	f.setId()
 	f.setSize()
 	f.setSum()
 	f.setType()
 }
 
-// SetId sets the identifier with length.
-func (f *File) setId(length int) {
-	f.Id = util.RandomHex(length)
+// SetId sets versioned File id with encoded entropy bytes.
+func (f *File) setId() {
+	f.Id = storageVersion + util.RandomId()
 }
 
 // SetSize sets the content length and readable file size.
diff --git a/storage/scan_test.go b/storage/scan_test.go
@@ -1,21 +1,19 @@
 package storage
 
 import (
-	"regexp"
 	"strings"
 	"testing"
 )
 
-// TestSetId tests File id is a valid hex string.
+// TestSetId tests File id is a valid string.
 func TestSetId(t *testing.T) {
 	f := &File{}
-	f.setId(32)
+	f.setId()
 	if f.Id == "" {
-		t.Fatalf("Id is empty; want hex string")
+		t.Fatalf("Id is empty")
 	}
-	valid := regexp.MustCompile(`^[0-9a-fA-F]+$`)
-	if !valid.MatchString(f.Id) {
-		t.Fatalf("Id = %q; want hex characters", f.Id)
+	if len(f.Id) != 44 {
+		t.Fatalf("Id is wrong size: %v", len(f.Id))
 	}
 }
 
diff --git a/templates/data/config.tmpl b/templates/data/config.tmpl
@@ -0,0 +1,10 @@
+<!-- config.tmpl -->
+{{ define "config" }}
+  {{ if .Style.AllowPick }} 
+    <details><summary>config</summary>
+      <div class="box">
+        {{ template "selectTheme" . }}
+      </div>
+  </details>
+  {{ end }}
+{{ end }}
diff --git a/templates/data/files.tmpl b/templates/data/files.tmpl
@@ -1,5 +1,13 @@
 <!-- files.tmpl -->
 {{ define "files" }}
-    {{ if .Paths.Upload }}    {{- template "upload" . -}}    {{ end }}
-    {{ if .Paths.List }}      {{- template "list" . -}}      {{ end }}
+  {{ if .Paths.Upload }}
+  <details><summary>upload</summary>
+    {{- template "upload" . -}}
+  </details>
+  {{ end }}
+  {{ if .Paths.List }}
+  <details><summary>download</summary>
+    {{- template "list" . -}}
+  </details>
+  {{ end }}
 {{ end }}
diff --git a/templates/data/footer.tmpl b/templates/data/footer.tmpl
@@ -1,13 +1,12 @@
 <!-- footer.tmpl -->
 {{ define "footer" }}
-    <div class="footer">
-      {{ if .ShowBuild }}
-      <div class="message">{{ .Version.id }}
-        <span class="owner"> {{ template "version" . }} </span>
-      </div>
-      {{ end }}
-      {{ if .Style.AllowPick }} {{ template "selectTheme" . }} {{ end }}
+  {{ if .ShowBuild }}
+  <div class="footer">
+    <div class="message">{{ .Version.id }}
+      <span class="owner">{{ template "version" . }}</span>
     </div>
+  </div>
+  {{ end }}
   </body>
 </html>
 {{ end }}
diff --git a/templates/data/index.tmpl b/templates/data/index.tmpl
@@ -1,7 +1,8 @@
 <!-- index.tmpl -->
 {{ define "index" }}
 {{- template "header" . -}}
-  <div class="container"> {{- template "files"  . -}} </div>
-  <div class="container"> {{- template "text"   . -}} </div>
+{{- template "files"  . -}}
+{{- template "text"   . -}}
+{{- template "config" . -}}
 {{- template "footer" . -}}
 {{ end }}
diff --git a/templates/data/list.tmpl b/templates/data/list.tmpl
@@ -37,10 +37,10 @@
                  type="radio"
                 value="{{ .Id }}" required>
           </td>
-          <td> <label for="{{ .Id }}">{{ .Size }}</label>          </td>
-          <td> <label for="{{ .Id }}">{{ .Type }}</label>          </td>
-          <td> <label for="{{ .Id }}">{{ .Owner.Mask }}</label>    </td>
-          <td> <label for="{{ .Id }}">{{ .Time.Remain }}</label>   </td>
+          <td><label for="{{ .Id }}">{{ .Size }}</label></td>
+          <td><label for="{{ .Id }}">{{ .Type }}</label></td>
+          <td><label for="{{ .Id }}">{{ .Owner.Mask }}</label></td>
+          <td><label for="{{ .Id }}">{{ .Time.Remain }}</label></td>
         </tr>
         {{ end }}
         </tbody>
diff --git a/templates/data/text.tmpl b/templates/data/text.tmpl
@@ -1,5 +1,13 @@
 <!-- text.tmpl -->
 {{ define "text" }}
-    {{ if .Paths.Message }}   {{- template "message" . -}}   {{ end }}
-    {{ if .Paths.Wall }}      {{- template "wall" . -}}      {{ end }}
+  {{ if .Paths.Message }}
+  <details><summary>message</summary>
+    {{- template "message" . -}}
+  </details>
+  {{ end }}
+  {{ if .Paths.Wall }}
+  <details><summary>wall</summary>
+    {{- template "wall" . -}}
+  </details>
+  {{ end }}
 {{ end }}
diff --git a/templates/data/wall.tmpl b/templates/data/wall.tmpl
@@ -6,7 +6,7 @@
               id="wall"
           method="post">
       <textarea class="wallContent"
-                 cols="40" rows="12"
+                 cols="32" rows="12"
                  form="wall"
                    id="wall"
             maxlength="{{ .Limit.CharsWall }}"
diff --git a/util/random.go b/util/random.go
@@ -2,14 +2,13 @@ package util
 
 import (
 	"crypto/rand"
+	"encoding/base64"
 	"encoding/hex"
 	"fmt"
 	"math/big"
 	"strings"
 )
 
-const defaultLength = 20
-
 var defaultNames = []string{
 	"Alice", "Bob", "Charlie", "Diana", "Eve",
 	"Frank", "Grace", "Henry", "Ivan", "Judy",
@@ -90,6 +89,16 @@ func RandomNumber() string {
 	return fmt.Sprintf("%03d", n)
 }
 
+// RandomId returns a 32-byte URL-encoded random string;
+// or "unknown" on error.
+func RandomId() string {
+	bytes := make([]byte, 32)
+	if _, err := rand.Read(bytes); err != nil {
+		return "unknown"
+	}
+	return base64.RawURLEncoding.EncodeToString(bytes)
+}
+
 // Random returns a random string of a given length.
 func Random(length int) string {
 	const charset = "ABCDEFGHJKLMNPQRTVWXYZabcdefghijkmnpqrtvwxyz2346789"
@@ -107,12 +116,15 @@ func Random(length int) string {
 
 // GetRandom returns a random string by requested path.
 func GetRandom(path string) string {
+	const defaultLength = 20
 	var response string
 	switch path {
 	case "coin":
 		response = FlipCoin()
 	case "hex":
 		response = RandomHex(defaultLength)
+	case "id":
+		response = RandomId()
 	case "name":
 		response = RandomName()
 	case "nato":

Original file line number	Diff line number	Diff line change
`@@ -106,7 +106,7 @@ func Upload(app *config.App) http.HandlerFunc {`
`106`	`106`	`},`
`107`	`107`	`}`
`108`	`108`
`109`		`- f.Scan(app.IdLength)`
	`109`	`+ f.Scan()`
`110`	`110`	`app.Files[f.Name] = f`
`111`	`111`
`112`	`112`	`upload = storage.File{`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,8 @@ import (`
`6`	`6`	`"time"`
`7`	`7`	`)`
`8`	`8`
	`9`	`+const storageVersion = "1"`
	`10`	`+`
`9`	`11`	`// Storage represents content uploaded by users.`
`10`	`12`	`type Storage struct {`
`11`	`13`
Original file line number	Diff line number	Diff line change
`@@ -9,16 +9,16 @@ import (`
`9`	`9`	`)`
`10`	`10`
`11`	`11`	`// Scan identifies and sets File attributes.`
`12`		`-func (f *File) Scan(idLength int) {`
`13`		`- f.setId(idLength)`
	`12`	`+func (f *File) Scan() {`
	`13`	`+ f.setId()`
`14`	`14`	`f.setSize()`
`15`	`15`	`f.setSum()`
`16`	`16`	`f.setType()`
`17`	`17`	`}`
`18`	`18`
`19`		`-// SetId sets the identifier with length.`
`20`		`-func (f *File) setId(length int) {`
`21`		`- f.Id = util.RandomHex(length)`
	`19`	`+// SetId sets versioned File id with encoded entropy bytes.`
	`20`	`+func (f *File) setId() {`
	`21`	`+ f.Id = storageVersion + util.RandomId()`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`// SetSize sets the content length and readable file size.`
Original file line number	Diff line number	Diff line change
`@@ -1,21 +1,19 @@`
`1`	`1`	`package storage`
`2`	`2`
`3`	`3`	`import (`
`4`		`- "regexp"`
`5`	`4`	`"strings"`
`6`	`5`	`"testing"`
`7`	`6`	`)`
`8`	`7`
`9`		`-// TestSetId tests File id is a valid hex string.`
	`8`	`+// TestSetId tests File id is a valid string.`
`10`	`9`	`func TestSetId(t *testing.T) {`
`11`	`10`	`f := &File{}`
`12`		`- f.setId(32)`
	`11`	`+ f.setId()`
`13`	`12`	`if f.Id == "" {`
`14`		`- t.Fatalf("Id is empty; want hex string")`
	`13`	`+ t.Fatalf("Id is empty")`
`15`	`14`	`}`
`16`		- valid := regexp.MustCompile(`^[0-9a-fA-F]+$`)
`17`		`- if !valid.MatchString(f.Id) {`
`18`		`- t.Fatalf("Id = %q; want hex characters", f.Id)`
	`15`	`+ if len(f.Id) != 44 {`
	`16`	`+ t.Fatalf("Id is wrong size: %v", len(f.Id))`
`19`	`17`	`}`
`20`	`18`	`}`
`21`	`19`