fix: remove unused net/http import in require2fa.go

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
Merge pull request 'feat: smart wiki filenames' (#215 ) from fix/wiki-smart-filenames into dev
2026-05-26 13:39:15 -05:00 · 2026-05-26 18:28:14 +00:00 · 2026-05-26 18:28:05 +00:00 · 2026-05-26 13:22:21 -05:00
2 changed files with 16 additions and 3 deletions
@@ -4,8 +4,6 @@
 package org

 import (
-	"net/http"
-
 	auth_model "git.mokoconsulting.tech/MokoConsulting/MokoGitea/models/auth"
 	"git.mokoconsulting.tech/MokoConsulting/MokoGitea/modules/setting"
 	"git.mokoconsulting.tech/MokoConsulting/MokoGitea/services/context"
@@ -6,6 +6,7 @@ package wiki
 import (
 	"net/url"
 	"path"
+	"regexp"
 	"strings"

 	repo_model "git.mokoconsulting.tech/MokoConsulting/MokoGitea/models/repo"
@@ -148,10 +149,24 @@ func WebPathFromRequest(s string) WebPath {
 	return WebPath(s)
 }

+var multiHyphenRe = regexp.MustCompile(`-{2,}`)
+var nonAlphanumRe = regexp.MustCompile(`[^a-zA-Z0-9\-]`)
+
+// sanitizeWikiTitle converts a user-provided title into a clean, URL-friendly slug.
+// Spaces and special characters become hyphens, consecutive hyphens collapse to one.
+func sanitizeWikiTitle(title string) string {
+	title = strings.TrimSpace(title)
+	title = strings.ReplaceAll(title, " ", "-")
+	title = nonAlphanumRe.ReplaceAllString(title, "-")
+	title = multiHyphenRe.ReplaceAllString(title, "-")
+	title = strings.Trim(title, "-")
+	return title
+}
+
 func UserTitleToWebPath(base, title string) WebPath {
 	// TODO: no support for subdirectory, because the old wiki code's behavior is always using %2F, instead of subdirectory.
 	// So we do not add the support for writing slashes in title at the moment.
-	title = strings.TrimSpace(title)
+	title = sanitizeWikiTitle(title)
 	title = util.PathJoinRelX(base, escapeSegToWeb(title, false))
 	if title == "" || title == "." {
 		title = "unnamed"
Author	SHA1	Message	Date
Jonathan Miller	0cc7297f23	fix: remove unused net/http import in require2fa.go Branch Policy Check / Verify merge target (pull_request) Successful in 1s Details PR RC Release / Build RC Release (pull_request) Successful in 2s Details Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>	2026-05-26 13:39:15 -05:00
jmiller	9dc85cfc2d	Merge pull request 'feat: smart wiki filenames' (#215 ) from fix/wiki-smart-filenames into dev	2026-05-26 18:28:14 +00:00
jmiller	6bc0cb5bc8	Merge pull request 'feat: org-level 2FA requirement (#208 )' (#214 ) from feat/208-org-2fa-requirement into dev	2026-05-26 18:28:05 +00:00
Jonathan Miller	1fb97eeeeb	feat: smart wiki filenames — sanitize special characters to hyphens Branch Policy Check / Verify merge target (pull_request) Successful in 1s Details PR RC Release / Build RC Release (pull_request) Successful in 3s Details New wiki page titles are now sanitized before creating the git file: - Spaces and special characters replaced with hyphens - Consecutive hyphens collapsed to single hyphen - Leading/trailing hyphens trimmed Examples: - "My Page Name" -> "My-Page-Name" - "API & Docs (v2)" -> "API-Docs-v2" - "100% Complete!!" -> "100-Complete" Only affects NEW pages. Existing wiki pages with legacy filenames (spaces, URL encoding) continue to work — the read path is unchanged. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>	2026-05-26 13:22:21 -05:00