From 322b0603fbfd21f3bb88c16f18f7839cee49c0e7 Mon Sep 17 00:00:00 2001 From: Timur Ismagilov Date: Tue, 14 Jun 2022 22:26:13 +0300 Subject: [PATCH] Interwiki: Make prefices behave like hypha names I/e case-insensitive, among other things --- interwiki/interwiki.go | 3 +++ shroom/mycomarkup_options.go | 1 - 2 files changed, 3 insertions(+), 1 deletion(-) delete mode 100644 shroom/mycomarkup_options.go diff --git a/interwiki/interwiki.go b/interwiki/interwiki.go index 72692a0..a1fc69c 100644 --- a/interwiki/interwiki.go +++ b/interwiki/interwiki.go @@ -5,6 +5,7 @@ import ( "encoding/json" "github.com/bouncepaw/mycomarkup/v5/options" "github.com/bouncepaw/mycorrhiza/files" + "github.com/bouncepaw/mycorrhiza/util" "log" "os" ) @@ -32,6 +33,7 @@ func Init() { } func HrefLinkFormatFor(prefix string) (string, options.InterwikiError) { + prefix = util.CanonicalName(prefix) if wiki, ok := theMap.byName[prefix]; ok { return wiki.LinkHrefFormat, options.Ok } @@ -39,6 +41,7 @@ func HrefLinkFormatFor(prefix string) (string, options.InterwikiError) { } func ImgSrcFormatFor(prefix string) (string, options.InterwikiError) { + prefix = util.CanonicalName(prefix) if wiki, ok := theMap.byName[prefix]; ok { return wiki.ImgSrcFormat, options.Ok } diff --git a/shroom/mycomarkup_options.go b/shroom/mycomarkup_options.go deleted file mode 100644 index 4bc19b2..0000000 --- a/shroom/mycomarkup_options.go +++ /dev/null @@ -1 +0,0 @@ -package shroom