From fcef969ec4d2763727ad7475b581a72be9240b00 Mon Sep 17 00:00:00 2001 From: Runxi Yu Date: Sun, 06 Apr 2025 10:21:33 +0800 Subject: [PATCH] Remove org-mode support for now, due to dependency issues --- forged/internal/render/readme.go | 7 ------- go.mod | 1 - go.sum | 2 -- diff --git a/forged/internal/render/readme.go b/forged/internal/render/readme.go index 195c87f5099a9a499b25fbe723e3a54db3f604f4..fa1be7ee9da8b9f297e220c906b49e61d253dd2f 100644 --- a/forged/internal/render/readme.go +++ b/forged/internal/render/readme.go @@ -10,7 +10,6 @@ "html/template" "strings" "github.com/microcosm-cc/bluemonday" - "github.com/niklasfasching/go-org/org" "github.com/yuin/goldmark" "github.com/yuin/goldmark/extension" "go.lindenii.runxiyu.org/forge/forged/internal/misc" @@ -29,12 +28,6 @@ if err := markdownConverter.Convert(data, &buf); err != nil { return "Error fetching README", EscapeHTML("Unable to render README: " + err.Error()) } return "README.md", template.HTML(bluemonday.UGCPolicy().SanitizeBytes(buf.Bytes())) //#nosec G203 - case "readme.org": - htmlStr, err := org.New().Parse(strings.NewReader(misc.BytesToString(data)), filename).Write(org.NewHTMLWriter()) - if err != nil { - return "Error fetching README", EscapeHTML("Unable to render README: " + err.Error()) - } - return "README.org", template.HTML(bluemonday.UGCPolicy().Sanitize(htmlStr)) //#nosec G203 default: return filename, template.HTML("
" + html.EscapeString(misc.BytesToString(data)) + "
") //#nosec G203 } diff --git a/go.mod b/go.mod index b782a2a34d7115dc4df2c3ee0445f0642a407f25..b0d559ca110acf5fd0f1e4be8d83d2fcbfdc2ab7 100644 --- a/go.mod +++ b/go.mod @@ -11,7 +11,6 @@ github.com/gliderlabs/ssh v0.3.8 github.com/go-git/go-git/v5 v5.14.0 github.com/jackc/pgx/v5 v5.7.4 github.com/microcosm-cc/bluemonday v1.0.27 - github.com/niklasfasching/go-org v1.7.0 github.com/tdewolff/minify/v2 v2.22.4 github.com/yuin/goldmark v1.7.8 go.lindenii.runxiyu.org/lindenii-common v0.0.0-20250321131425-dda3538a9cd4 diff --git a/go.sum b/go.sum index 2d53ec4e095908286550a538c074d298cd0c1377..272358ea2c269475849c7fea364b6b22b49d8ac0 100644 --- a/go.sum +++ b/go.sum @@ -78,8 +78,6 @@ github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/microcosm-cc/bluemonday v1.0.27 h1:MpEUotklkwCSLeH+Qdx1VJgNqLlpY2KXwXFM08ygZfk= github.com/microcosm-cc/bluemonday v1.0.27/go.mod h1:jFi9vgW+H7c3V0lb6nR74Ib/DIB5OBs92Dimizgw2cA= -github.com/niklasfasching/go-org v1.7.0 h1:vyMdcMWWTe/XmANk19F4k8XGBYg0GQ/gJGMimOjGMek= -github.com/niklasfasching/go-org v1.7.0/go.mod h1:WuVm4d45oePiE0eX25GqTDQIt/qPW1T9DGkRscqLW5o= github.com/onsi/gomega v1.34.1 h1:EUMJIKUjM8sKjYbtxQI9A4z2o+rruxnzNvpknOXie6k= github.com/onsi/gomega v1.34.1/go.mod h1:kU1QgUvBDLXBJq618Xvm2LUX6rSAfRaFRTcdOeDLwwY= github.com/pjbgf/sha1cd v0.3.2 h1:a9wb0bp1oC2TGwStyn0Umc/IGKQnEgF0vVaZ8QF8eo4= -- 2.48.1