lee/wanderer
1
0
Fork 0
mirror of https://github.com/wanderer-industries/wanderer synced 2026-08-28 16:56:31 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

chore(Map): Add default filtering to search systems

Browse Source
This commit is contained in:
Dmitry Popov
2024-12-22 22:59:28 +01:00
parent 6d4321fead
commit 05ea2fcdbe
2 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/wanderer_app/map/server/map_server_connections_impl.ex
+11 -7
View File
@@ -363,22 +363,26 @@ defmodule WandererApp.Map.Server.ConnectionsImpl do
case scope do
:wormholes ->
not (@prohibited_system_classes |> Enum.member?(system_static_info.system_class)) and
not is_prohibited_system_class?(system_static_info.system_class) and
not (@prohibited_systems |> Enum.member?(solar_system_id)) and
@wh_space |> Enum.member?(system_static_info.system_class)
:stargates ->
not (@prohibited_system_classes |> Enum.member?(system_static_info.system_class)) and
not is_prohibited_system_class?(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))
not is_prohibited_system_class?(system_static_info.system_class)
_ ->
false
end
end
def is_prohibited_system_class?(system_class) do
@prohibited_system_classes |> Enum.member?(system_class)
end
def is_connection_exist(map_id, from_solar_system_id, to_solar_system_id),
do:
not is_nil(
@@ -412,16 +416,16 @@ defmodule WandererApp.Map.Server.ConnectionsImpl do
case scope do
:wormholes ->
not (@prohibited_system_classes |> Enum.member?(from_system_static_info.system_class)) and
not (@prohibited_system_classes |> Enum.member?(to_system_static_info.system_class)) and
not is_prohibited_system_class?(from_system_static_info.system_class) and
not is_prohibited_system_class?(to_system_static_info.system_class) and
not (@prohibited_systems |> Enum.member?(from_solar_system_id)) and
not (@prohibited_systems |> Enum.member?(to_solar_system_id)) and
known_jumps |> Enum.empty?() and to_solar_system_id != @jita and
from_solar_system_id != @jita
:stargates ->
not (@prohibited_system_classes |> Enum.member?(from_system_static_info.system_class)) and
not (@prohibited_system_classes |> Enum.member?(to_system_static_info.system_class)) and
not is_prohibited_system_class?(from_system_static_info.system_class) and
not is_prohibited_system_class?(to_system_static_info.system_class) and
not (known_jumps |> Enum.empty?())
end
end
lib/wanderer_app_web/live/maps/event_handlers/map_systems_event_handler.ex
+6
View File
@@ -317,6 +317,12 @@ defmodule WandererAppWeb.MapSystemsEventHandler do
WandererApp.Api.MapSolarSystem.find_by_name!(%{name: text})
|> Enum.take(100)
|> Enum.map(&map_system/1)
|> Enum.filter(fn system ->
not is_nil(system) && not is_nil(system.system_static_info) &&
not WandererApp.Map.Server.ConnectionsImpl.is_prohibited_system_class?(
system.system_static_info.system_class
)
end)
{:reply, %{systems: systems}, socket}
end