From 84076b340bba10c539eb244bd03af9b097ce53db Mon Sep 17 00:00:00 2001
From: Dmitry Popov <dmitriypopovsamara@gmail.com>
Date: Sat, 7 Dec 2024 09:32:24 +0100
Subject: [PATCH] fix(Core): Fix unpkg CDN issues, fix Abyssals sites adding as
 systems on map

---
 .../map/server/map_server_connections_impl.ex    |  5 +++--
 .../components/layouts/root.html.heex            | 16 ++++++++++++----
 lib/wanderer_app_web/router.ex                   |  1 +
 3 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/lib/wanderer_app/map/server/map_server_connections_impl.ex b/lib/wanderer_app/map/server/map_server_connections_impl.ex
index 1e48a90e..2f834553 100644
--- a/lib/wanderer_app/map/server/map_server_connections_impl.ex
+++ b/lib/wanderer_app/map/server/map_server_connections_impl.ex
@@ -356,8 +356,6 @@ defmodule WandererApp.Map.Server.ConnectionsImpl do
 
   def can_add_location(_scope, nil), do: false
 
-  def can_add_location(:all, _solar_system_id), do: true
-
   def can_add_location(:none, _solar_system_id), do: false
 
   def can_add_location(scope, solar_system_id) do
@@ -380,6 +378,9 @@ defmodule WandererApp.Map.Server.ConnectionsImpl do
         not (@prohibited_system_classes |> Enum.member?(system_static_info.system_class)) and
           @known_space |> Enum.member?(system_static_info.system_class)
 
+      :all ->
+        not (@prohibited_system_classes |> Enum.member?(system_static_info.system_class))
+
       _ ->
         false
     end
diff --git a/lib/wanderer_app_web/components/layouts/root.html.heex b/lib/wanderer_app_web/components/layouts/root.html.heex
index e1893ee8..89221e90 100644
--- a/lib/wanderer_app_web/components/layouts/root.html.heex
+++ b/lib/wanderer_app_web/components/layouts/root.html.heex
@@ -32,14 +32,22 @@
     />
     <script
       crossorigin="anonymous"
-      src="https://unpkg.com/react@18/umd/react.production.min.js"
-      integrity={integrity_hash("https://unpkg.com/react@18/umd/react.production.min.js")}
+      src="https://cdn.jsdelivr.net/npm/react@18/umd/react.production.min.js"
+      integrity={
+        integrity_hash(
+          "https://cdn.jsdelivr.net/npm/react-dom@16/umd/react-dom.development.js https://unpkg.com/react@18/umd/react.production.min.js"
+        )
+      }
     >
     </script>
     <script
       crossorigin="anonymous"
-      src="https://unpkg.com/react-dom@18/umd/react-dom.production.min.js"
-      integrity={integrity_hash("https://unpkg.com/react-dom@18/umd/react-dom.production.min.js")}
+      src="https://cdn.jsdelivr.net/npm/react-dom@18/umd/react-dom.production.min.js"
+      integrity={
+        integrity_hash(
+          "https://cdn.jsdelivr.net/npm/react-dom@18/umd/react-dom.production.min.js"
+        )
+      }
     >
     </script>
 
diff --git a/lib/wanderer_app_web/router.ex b/lib/wanderer_app_web/router.ex
index 8a051e2a..fc884b90 100644
--- a/lib/wanderer_app_web/router.ex
+++ b/lib/wanderer_app_web/router.ex
@@ -57,6 +57,7 @@ defmodule WandererAppWeb.Router do
           @script_src,
           ~w('unsafe-inline'),
           ~w(https://unpkg.com),
+          ~w(https://cdn.jsdelivr.net),
           ~w(https://w.appzi.io),
           ~w(https://www.googletagmanager.com),
           ~w(https://cdnjs.cloudflare.com)