From e4b0ae395f3207f4bbaebbf42a3d3a28a516489d Mon Sep 17 00:00:00 2001
From: stuebinm <stuebinm@disroot.org>
Date: Tue, 11 Oct 2022 13:10:18 +0200
Subject: [PATCH] Revert "linter: link hackery for divoc fallback"
This reverts commit f116e6487f1041f12b9ea1e4e6a7aef18ff783bb.
---
lib/LintConfig.hs | 4 +---
lib/Properties.hs | 4 +---
2 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/lib/LintConfig.hs b/lib/LintConfig.hs
index a84740d..b0fa3b0 100644
--- a/lib/LintConfig.hs
+++ b/lib/LintConfig.hs
@@ -182,9 +182,7 @@ expandWorlds config = config { configUriSchemas = configUriSchemas' }
assemblysubsts =
DomainSubstitution (M.fromList generated) ["map"]
where generated = configAssemblies config
- <&> \slug -> if slug == "lobby"
- then (slug, "/_/global/raw.githubusercontent.com/c0c0bird/bridging-bubbles")
- else (slug, "/_/global/maps.world.di.c3voc.de/assembly/"<>slug)
+ <&> \slug -> (slug, "/@/"<>configEventSlug config<>"/"<>slug)
instance (FromJSON (LintConfig a)) => Argument (LintConfig a) where
parseArgument str =
diff --git a/lib/Properties.hs b/lib/Properties.hs
index 66f817b..291827f 100644
--- a/lib/Properties.hs
+++ b/lib/Properties.hs
@@ -683,9 +683,7 @@ 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 -> 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)"
+ UnderscoreMapLink -> forbid "map links using /_/ are disallowed. Use world:// instead."
AtMapLink -> forbid "map links using /@/ are disallowed. Use world:// instead."
PathVarsDisallowed -> forbid "extended API variables are not allowed in asset paths."
--
GitLab