diff options
| author | stuebinm | 2022-10-11 13:10:18 +0200 |
|---|---|---|
| committer | stuebinm | 2022-10-11 13:10:18 +0200 |
| commit | e4b0ae395f3207f4bbaebbf42a3d3a28a516489d (patch) | |
| tree | 8475395f72ebd98577a82ce812b06e4ef4a87923 | |
| parent | f124e3373b56297cb7f469d59f8ab3193a80990f (diff) | |
Revert "linter: link hackery for divoc fallback"
This reverts commit f116e6487f1041f12b9ea1e4e6a7aef18ff783bb.
| -rw-r--r-- | lib/LintConfig.hs | 4 | ||||
| -rw-r--r-- | 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." |