Disallow Domains in Multiple Mappings & IP Addresses (#4529)

* feat: disallow domains in multiple mappings

* feat: error for invalid domains

* chore: update msg

* chore: server fixes!!!

* chore: last fix

* chore: actual last fix

---------

Co-authored-by: Anakin <[email protected]>

Author: wi

.scripts/validate.py

@@ -218,6 +218,7 @@ def check_metadata(args: argparse.Namespace) -> defaultdict[str, list[str]]:
             messages[server_id] = [f"{server_id} is being edited but is in the inactive file!"]
 
     # Looping over each server folder
+    seen_domains = defaultdict(set)
     for root, _, _ in os.walk(args.servers_dir):
         server_id = root.split(os.path.sep)[-1]
         if (
@@ -241,6 +242,8 @@ def check_metadata(args: argparse.Namespace) -> defaultdict[str, list[str]]:
                     primary_domain = get_tld(server.get("primaryAddress", ""), as_object=True, fail_silently=True, fix_protocol=True)
                     if primary_domain is not None and primary_domain.fld not in server["addresses"]:
                         messages[server_id].append(f"The primary address' domain ({primary_domain.fld}) is not in the addresses list. Or the primary address is not a valid domain.")
+                    elif primary_domain is None:
+                        messages[server_id].append(f"The primary address `{server.get('primaryAddress', '')}` is not a valid domain. Please review the [documentation](https://lunarclient.dev/server-mappings/adding-servers/metadata).")
 
 
                     all_versions = get_all_versions(server["minecraftVersions"])
@@ -256,6 +259,13 @@ def check_metadata(args: argparse.Namespace) -> defaultdict[str, list[str]]:
                         domain = get_tld(address, as_object=True, fail_silently=True, fix_protocol=True)
                         if domain is not None and domain.subdomain:
                             messages[server_id].append(f"{address} does not follow the [documentation](https://lunarclient.dev/server-mappings/adding-servers/metadata). Please make sure the address is a valid domain, and does not have a subdomain.")
+                        
+                        if domain is not None and domain.fld in seen_domains:
+                            messages[server_id].append(f"The domain {domain.fld} is also present in {', '.join(map(lambda s: f"`{s}`", seen_domains[domain.fld]))}. Please ensure each server has a unique domain(s).")
+                        elif domain is not None:
+                            seen_domains[domain.fld].add(server_id)
+                        else:
+                            messages[server_id].append(f"`{address}` is not a valid domain. Please review the [documentation](https://lunarclient.dev/server-mappings/adding-servers/metadata).")
 
                     if primary_region := server.get("primaryRegion"):
                         if not (regions := server.get("regions")) or primary_region not in regions:

inactive.json

@@ -45,6 +45,7 @@
     "cometmc",
     "corepvp",
     "craftoriya",
+    "crimsonsmp",
     "crystal",
     "crobarus",
     "crove",
@@ -201,6 +202,7 @@
     "mysticlands",
     "mythicnetwork",
     "nasgar",
+    "naturemc",
     "navybridge",
     "neptunemc",
     "nexopvp",
@@ -259,6 +261,7 @@
     "plasma",
     "evamc",
     "voidmc",
+    "voidpixel",
     "mushroomnet",
     "zeromc",
     "asrbw",

servers/akyto/metadata.json

@@ -5,7 +5,6 @@
     "addresses": [
         "akyto.club",
         "akyto.net",
-        "potted.gg",
         "groupezk.fr",
         "pvptemple.it"
     ],

servers/beemc/metadata.json

@@ -4,8 +4,7 @@
     "website": "https://beemc.pl/",
     "store": "https://sklep.beemc.pl/",
     "addresses": [
-        "beemc.pl",
-        "193.41.226.236"
+        "beemc.pl"
     ],
     "primaryAddress": "mc.beemc.pl",
     "primaryColor": "#FFD700",

servers/bte/metadata.json

@@ -15,9 +15,7 @@
         "bteuk.net",
         "btefrance.fr",
         "bteoce.com",
-        "139.99.91.188",
         "btehkmu.net",
-        "142.202.222.202",
         "btemexca.net",
         "bteconosur.com",
         "bteromania.ro",

servers/ember/metadata.json

@@ -6,8 +6,7 @@
         "emberpvp.es",
         "emberpvp.club",
         "pvpsurge.com",
-        "varant.es",
-        "exempvp.es"
+        "varant.es"
     ],
     "primaryAddress": "emberpvp.es",
     "primaryColor": "#f62c22",

servers/eternitymcnet/metadata.json

@@ -4,8 +4,7 @@
     "website": "https://eternitymc.net/",
     "store": "https://store.eternitymc.net/",
     "addresses": [
-        "eternitymc.net",
-        "pvpmania.eu"
+        "eternitymc.net"
     ],
     "primaryAddress": "mc.eternitymc.net",
     "primaryColor": "#00aaaa",

servers/exodiamc/metadata.json

@@ -5,7 +5,6 @@
     "store": "https://tienda.exodiamc.net",
     "description": "A Spanish-speaking server that offers fair gameplay for everyone.",
     "addresses": [
-        "gamesmadeinpola.com",
         "exodiamc.net"
     ],
     "primaryAddress": "exodiamc.net",

servers/gapplemc/metadata.json

@@ -5,8 +5,6 @@
     "store": "https://store.gapplemc.net",
     "description": "GappleMC is THE Hispanic server you're looking for.",
     "addresses": [
-        "gegmc.net",
-        "gegcraft.org",
         "gapplemc.com"
     ],
     "primaryAddress": "gapplemc.com",

servers/kaiya/metadata.json

@@ -4,7 +4,6 @@
     "website": "https://kaiya.rip/",
     "addresses": [
         "kaiya.rip",
-        "rengo.us",
         "kuda.rip"
     ],
     "primaryAddress": "kaiya.rip",