From f116e6487f1041f12b9ea1e4e6a7aef18ff783bb Mon Sep 17 00:00:00 2001
From: stuebinm <stuebinm@disroot.org>
Date: Thu, 14 Apr 2022 01:00:09 +0200
Subject: [PATCH] linter: link hackery for divoc fallback
---
lib/LintConfig.hs | 2 +-
lib/Properties.hs | 4 +++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/lib/LintConfig.hs b/lib/LintConfig.hs
index b0fa3b0..ef4bb54 100644
--- a/lib/LintConfig.hs
+++ b/lib/LintConfig.hs
@@ -182,7 +182,7 @@ expandWorlds config = config { configUriSchemas = configUriSchemas' }
assemblysubsts =
DomainSubstitution (M.fromList generated) ["map"]
where generated = configAssemblies config
- <&> \slug -> (slug, "/@/"<>configEventSlug config<>"/"<>slug)
+ <&> \slug -> (slug, "/_/general/"<>configEventSlug config<>"/"<>slug)
instance (FromJSON (LintConfig a)) => Argument (LintConfig a) where
parseArgument str =
diff --git a/lib/Properties.hs b/lib/Properties.hs
index 291827f..66f817b 100644
--- a/lib/Properties.hs
+++ b/lib/Properties.hs
@@ -683,7 +683,9 @@ unwrapPath str f = case parsePath str of
else complain $ "cannot acess paths \"" <> str <> "\" which is outside your repository."
NotAPath -> complain $ "path \"" <> str <> "\" is invalid."
AbsolutePath -> forbid "absolute paths are disallowed. Use world:// instead."
- UnderscoreMapLink -> forbid "map links using /_/ are disallowed. Use world:// instead."
+ UnderscoreMapLink -> suggest "we know there's been some confusion about links; but you can \
+ \still use world:// instead of /_/ (though the latter is now also \
+ \allowed to keep maps working)"
AtMapLink -> forbid "map links using /@/ are disallowed. Use world:// instead."
PathVarsDisallowed -> forbid "extended API variables are not allowed in asset paths."
--
GitLab