chore: release version v1.16.0

feat(Signatures): Add additional filters support to signature list, show description icon
chore: release version v1.15.5
2025-11-12 04:15:25 +00:00 · 2024-11-15 07:59:04 +00:00 · 2024-11-15 08:58:25 +01:00 · 2024-11-14 12:57:21 +00:00 · 2024-11-14 13:56:52 +01:00 · 2024-11-14 08:28:05 +00:00
39 changed files with 1155 additions and 526 deletions
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -1,12 +1,7 @@
-FROM elixir:1.16-otp-25
+FROM elixir:1.17-otp-27

-RUN apt update -yq
-RUN apt install -yq curl gnupg mc inotify-tools
+RUN apt install -yq curl gnupg
 RUN apt --fix-broken install
-RUN apt remove -y nodejs nodejs-doc
-RUN curl -sL https://deb.nodesource.com/setup_18.x  | bash -
-RUN apt install -y nodejs
-RUN npm install --global yarn

 RUN mix local.hex --force

--- a/.devcontainer/docker-compose.yml
+++ b/.devcontainer/docker-compose.yml
@@ -2,7 +2,7 @@ version: "0.1"

 services:
  db:
-    image: postgres:14.3
+    image: postgres:13-alpine
    restart: always
    environment:
      POSTGRES_USER: postgres
@@ -10,13 +10,13 @@ services:
    ports:
      - "5432:5432"
    volumes:
-      - db:/var/lib/postgresql/data
+      - db-new:/var/lib/postgresql/data

  wanderer:
    environment:
      PORT: 8000
      DB_HOST: db
-      WEB_APP_URL: "http://localhost:4444"
+      WEB_APP_URL: "http://localhost:8000"
      ERL_AFLAGS: "-kernel shell_history enabled"
    build:
      context: .
@@ -33,4 +33,4 @@ services:

 volumes:
  elixir-artifacts: {}
-  db: {}
+  db-new: {}
--- a/.github/workflows/release_actions.yml
+++ b/.github/workflows/release_actions.yml
@@ -18,4 +18,4 @@ jobs:
          key: ${{ secrets.SSH_KEY }}
          port: ${{ secrets.PORT }}
          script: |
-            /app/release/linux/deploy.sh ${{ github.event.release.tag_name }}
+            /home/wanderer/app/deploy.sh ${{ github.event.release.tag_name }}
--- a/.tool-versions
+++ b/.tool-versions
@@ -1,3 +1,3 @@
-erlang 25.3
-elixir 1.16-otp-25
+erlang 26.2.5.5
+elixir 1.17.3-otp-26
 nodejs 18.0.0
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,112 @@
 # Change Log

 <!-- changelog -->
+
+## [v1.16.0](https://github.com/wanderer-industries/wanderer/compare/v1.15.5...v1.16.0) (2024-11-15)
+
+
+
+
+### Features:
+
+* Signatures: Add additional filters support to signature list, show description icon
+
+## [v1.15.5](https://github.com/wanderer-industries/wanderer/compare/v1.15.4...v1.15.5) (2024-11-14)
+
+
+
+
+## [v1.15.4](https://github.com/wanderer-industries/wanderer/compare/v1.15.3...v1.15.4) (2024-11-14)
+
+
+
+
+### Bug Fixes:
+
+* Core: Untracked characters still tracked on map (#63)
+
+## [v1.15.3](https://github.com/wanderer-industries/wanderer/compare/v1.15.2...v1.15.3) (2024-11-13)
+
+
+
+
+## [v1.15.2](https://github.com/wanderer-industries/wanderer/compare/v1.15.1...v1.15.2) (2024-11-07)
+
+
+
+
+## [v1.15.1](https://github.com/wanderer-industries/wanderer/compare/v1.15.0...v1.15.1) (2024-11-07)
+
+
+
+
+### Bug Fixes:
+
+* Dev: Update .devcontainer instructions
+
+## [v1.15.0](https://github.com/wanderer-industries/wanderer/compare/v1.14.1...v1.15.0) (2024-11-07)
+
+
+
+
+### Features:
+
+* Connections: Add connection mark EOL time (#56)
+
+## [v1.14.1](https://github.com/wanderer-industries/wanderer/compare/v1.14.0...v1.14.1) (2024-11-06)
+
+
+
+
+### Bug Fixes:
+
+* Core: Fix character tracking permissions
+
+## [v1.14.0](https://github.com/wanderer-industries/wanderer/compare/v1.13.12...v1.14.0) (2024-11-05)
+
+
+
+
+### Features:
+
+* ACL: Add an ability to assign member role without DnD
+
+## [v1.13.12](https://github.com/wanderer-industries/wanderer/compare/v1.13.11...v1.13.12) (2024-11-04)
+
+
+
+
+### Bug Fixes:
+
+* Map: Fix system revert issues
+
+## [v1.13.11](https://github.com/wanderer-industries/wanderer/compare/v1.13.10...v1.13.11) (2024-11-02)
+
+
+
+
+### Bug Fixes:
+
+* Map: Fix system revert issues
+
+## [v1.13.10](https://github.com/wanderer-industries/wanderer/compare/v1.13.9...v1.13.10) (2024-11-01)
+
+
+
+
+### Bug Fixes:
+
+* Map: Fix system revert issues
+
+## [v1.13.9](https://github.com/wanderer-industries/wanderer/compare/v1.13.8...v1.13.9) (2024-11-01)
+
+
+
+
+## [v1.13.8](https://github.com/wanderer-industries/wanderer/compare/v1.13.7...v1.13.8) (2024-10-28)
+
+
+
 ## [v1.13.0](https://github.com/wanderer-industries/wanderer/compare/v1.12.11...v1.13.0) (2024-10-28)


--- a/README.md
+++ b/README.md
@@ -20,11 +20,11 @@ Interested to learn more? [Check more on our website](https://wanderer.ltd/news)

 Wanderer is open source project and we have a free as in beer and self-hosted solution called [Wanderer Community Edition (CE)](https://wanderer.ltd/news/community-edition). Here are the differences between Wanderer and Wanderer CE:

-|  | Wanderer Cloud  | Wanderer Community Edition |
-| ------------- | ------------- | ------------- |
-| **Infrastructure management** | Easy and convenient. It takes 2 minutes to register your character and create a map. We manage everything so you don’t have to worry about anything and can focus on gameplay. | You do it all yourself. You need to get a server and you need to manage your infrastructure. You are responsible for installation, maintenance, upgrades, server capacity, uptime, backup, security, stability, consistency, loading time and so on.|
-| **Release schedule** | Continuously developed and improved with new features and updates multiple times per week. | Latest features and improvements won't be immediately available.|
-| **Server location** | All visitor data is exclusively processed on EU-owned cloud infrastructure. We keep your site data on a secure, encrypted and green energy powered server in Germany. This ensures that your site data is protected by the strict European Union data privacy laws and ensures compliance with GDPR. Your website data never leaves the EU. | You have full control and can host your instance on any server in any country that you wish. Host it on a server in your basement or host it with any cloud provider wherever you want, even those that are not GDPR compliant.|
+|                               | Wanderer Cloud                                                                                                                                                                                                                                                                                                                              | Wanderer Community Edition                                                                                                                                                                                                                           |
+| ----------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| **Infrastructure management** | Easy and convenient. It takes 2 minutes to register your character and create a map. We manage everything so you don’t have to worry about anything and can focus on gameplay.                                                                                                                                                              | You do it all yourself. You need to get a server and you need to manage your infrastructure. You are responsible for installation, maintenance, upgrades, server capacity, uptime, backup, security, stability, consistency, loading time and so on. |
+| **Release schedule**          | Continuously developed and improved with new features and updates multiple times per week.                                                                                                                                                                                                                                                  | Latest features and improvements won't be immediately available.                                                                                                                                                                                     |
+| **Server location**           | All visitor data is exclusively processed on EU-owned cloud infrastructure. We keep your site data on a secure, encrypted and green energy powered server in Germany. This ensures that your site data is protected by the strict European Union data privacy laws and ensures compliance with GDPR. Your website data never leaves the EU. | You have full control and can host your instance on any server in any country that you wish. Host it on a server in your basement or host it with any cloud provider wherever you want, even those that are not GDPR compliant.                      |

 Interested in self-hosting Wanderer CE on your server? Take a look at our [Wanderer CE installation instructions](https://github.com/wanderer-industries/community-edition/).

@@ -54,7 +54,13 @@ Now you can visit [`localhost:8000`](http://localhost:8000) from your browser.
 #### Using .devcontainer

 - Run devcontainer
- See how to start server in #setup section
+- Install additional dependencies inside Dev container
+- `root@0d0a785313b6:/app# apt update`
+- `root@0d0a785313b6:/app# curl -sL https://deb.nodesource.com/setup_18.x  | bash -`
+- `root@0d0a785313b6:/app# apt-get install nodejs inotify-tools -y`
+- `root@0d0a785313b6:/app# mix setup`
+
+- See how to run server in #Run section

 #### Using nix flakes

--- a/assets/js/hooks/Mapper/components/mapInterface/components/SystemLinkSignatureDialog/SystemLinkSignatureDialog.tsx
+++ b/assets/js/hooks/Mapper/components/mapInterface/components/SystemLinkSignatureDialog/SystemLinkSignatureDialog.tsx
@@ -10,13 +10,17 @@ import {
  Setting,
  COSMIC_SIGNATURE,
 } from '@/hooks/Mapper/components/mapInterface/widgets/SystemSignatures/SystemSignatureSettingsDialog';
+import { SignatureGroup } from '@/hooks/Mapper/types';

 interface SystemLinkSignatureDialogProps {
  data: CommandLinkSignatureToSystem;
  setVisible: (visible: boolean) => void;
 }

-const signatureSettings: Setting[] = [{ key: COSMIC_SIGNATURE, name: 'Show Cosmic Signatures', value: true }];
+const signatureSettings: Setting[] = [
+  { key: COSMIC_SIGNATURE, name: 'Show Cosmic Signatures', value: true },
+  { key: SignatureGroup.Wormhole, name: 'Wormhole', value: true },
+];

 export const SystemLinkSignatureDialog = ({ data, setVisible }: SystemLinkSignatureDialogProps) => {
  const { outCommand } = useMapRootState();
@@ -59,6 +63,7 @@ export const SystemLinkSignatureDialog = ({ data, setVisible }: SystemLinkSignat
    >
      <SystemSignaturesContent
        systemId={`${data.solar_system_source}`}
+        hideLinkedSignatures
        settings={signatureSettings}
        onSelect={handleSelect}
        selectable={true}
--- a/assets/js/hooks/Mapper/components/mapInterface/widgets/SystemSignatures/SystemSignatures.tsx
+++ b/assets/js/hooks/Mapper/components/mapInterface/widgets/SystemSignatures/SystemSignatures.tsx
@@ -12,6 +12,7 @@ import {
  SHIP,
  DRONE,
 } from './SystemSignatureSettingsDialog';
+import { SignatureGroup } from '@/hooks/Mapper/types';

 import React, { useCallback, useEffect, useState } from 'react';

@@ -27,6 +28,12 @@ const settings: Setting[] = [
  { key: STARBASE, name: 'Show Starbase', value: true },
  { key: SHIP, name: 'Show Ships', value: true },
  { key: DRONE, name: 'Show Drones And Charges', value: true },
+  { key: SignatureGroup.Wormhole, name: 'Show Wormholes', value: true },
+  { key: SignatureGroup.RelicSite, name: 'Show Relic Sites', value: true },
+  { key: SignatureGroup.DataSite, name: 'Show Data Sites', value: true },
+  { key: SignatureGroup.OreSite, name: 'Show Ore Sites', value: true },
+  { key: SignatureGroup.GasSite, name: 'Show Gas Sites', value: true },
+  { key: SignatureGroup.CombatSite, name: 'Show Combat Sites', value: true },
 ];

 const SIGNATURE_SETTINGS_KEY = 'wanderer_system_signature_settings';
@@ -91,8 +98,7 @@ export const SystemSignatures = () => {
                    </InfoDrawer>
                    <InfoDrawer title={<b className="text-slate-50">How to delete?</b>}>
                      For delete any signature first of all you need select before
-                      <br /> and then use <b className="text-sky-500">Del</b> or{' '}
-                      <b className="text-sky-500">Backspace</b>
+                      <br /> and then use <b className="text-sky-500">Backspace</b>
                    </InfoDrawer>
                  </div>
                ) as React.ReactNode,
--- a/assets/js/hooks/Mapper/components/mapInterface/widgets/SystemSignatures/SystemSignaturesContent/SystemSignaturesContent.tsx
+++ b/assets/js/hooks/Mapper/components/mapInterface/widgets/SystemSignatures/SystemSignaturesContent/SystemSignaturesContent.tsx
@@ -3,6 +3,7 @@ import { useClipboard } from '@/hooks/Mapper/hooks/useClipboard';
 import { parseSignatures } from '@/hooks/Mapper/helpers';
 import { Commands, OutCommand } from '@/hooks/Mapper/types/mapHandlers.ts';
 import { WdTooltip, WdTooltipHandlers } from '@/hooks/Mapper/components/ui-kit';
+import { GROUPS_LIST } from '@/hooks/Mapper/components/mapInterface/widgets/SystemSignatures/constants.ts';

 import { DataTable, DataTableRowClickEvent, DataTableRowMouseEvent, SortOrder } from 'primereact/datatable';
 import { Column } from 'primereact/column';
@@ -30,6 +31,7 @@ import { PrimeIcons } from 'primereact/api';
 import { SignatureSettings } from '@/hooks/Mapper/components/mapRootContent/components/SignatureSettings';
 import { useMapEventListener } from '@/hooks/Mapper/events';
 import { WdTooltipWrapper } from '@/hooks/Mapper/components/ui-kit/WdTooltipWrapper';
+import { COSMIC_SIGNATURE } from '@/hooks/Mapper/components/mapInterface/widgets/SystemSignatures/SystemSignatureSettingsDialog';

 type SystemSignaturesSortSettings = {
  sortField: string;
@@ -44,10 +46,17 @@ const SORT_DEFAULT_VALUES: SystemSignaturesSortSettings = {
 interface SystemSignaturesContentProps {
  systemId: string;
  settings: Setting[];
+  hideLinkedSignatures?: boolean;
  selectable?: boolean;
  onSelect?: (signature: SystemSignature) => void;
 }
-export const SystemSignaturesContent = ({ systemId, settings, selectable, onSelect }: SystemSignaturesContentProps) => {
+export const SystemSignaturesContent = ({
+  systemId,
+  settings,
+  hideLinkedSignatures,
+  selectable,
+  onSelect,
+}: SystemSignaturesContentProps) => {
  const { outCommand } = useMapRootState();

  const [signatures, setSignatures, signaturesRef] = useRefState<SystemSignature[]>([]);
@@ -80,13 +89,32 @@ export const SystemSignaturesContent = ({ systemId, settings, selectable, onSele
    }
  }, []);

+  const groupSettings = useMemo(() => settings.filter(s => (GROUPS_LIST as string[]).includes(s.key)), [settings]);
+
  const filteredSignatures = useMemo(() => {
    return signatures
-      .filter(x => settings.find(y => y.key === x.kind)?.value)
+      .filter(x => {
+        if (hideLinkedSignatures && !!x.linked_system) {
+          return false;
+        }
+
+        const isCosmicSignature = x.kind === COSMIC_SIGNATURE;
+
+        if (isCosmicSignature) {
+          const showCosmicSignatures = settings.find(y => y.key === COSMIC_SIGNATURE)?.value;
+          if (showCosmicSignatures) {
+            return !x.group || groupSettings.find(y => y.key === x.group)?.value;
+          } else {
+            return !!x.group && groupSettings.find(y => y.key === x.group)?.value;
+          }
+        }
+
+        return settings.find(y => y.key === x.kind)?.value;
+      })
      .sort((a, b) => {
        return new Date(b.updated_at || 0).getTime() - new Date(a.updated_at || 0).getTime();
      });
-  }, [signatures, settings]);
+  }, [signatures, settings, groupSettings, hideLinkedSignatures]);

  const handleGetSignatures = useCallback(async () => {
    const { signatures } = await outCommand({
@@ -354,13 +382,15 @@ export const SystemSignaturesContent = ({ systemId, settings, selectable, onSele
                sortable
              ></Column>

-              <Column
-                bodyClassName="p-0 pl-1 pr-2"
-                field="group"
-                body={renderToolbar}
-                // headerClassName={headerClasses}
-                style={{ maxWidth: 26, minWidth: 26, width: 26 }}
-              ></Column>
+              {!selectable && (
+                <Column
+                  bodyClassName="p-0 pl-1 pr-2"
+                  field="group"
+                  body={renderToolbar}
+                  // headerClassName={headerClasses}
+                  style={{ maxWidth: 26, minWidth: 26, width: 26 }}
+                ></Column>
+              )}
            </DataTable>
          </>
        )}
@@ -370,12 +400,14 @@ export const SystemSignaturesContent = ({ systemId, settings, selectable, onSele
          content={hoveredSig ? <SignatureView {...hoveredSig} /> : null}
        />

-        <SignatureSettings
-          systemId={systemId}
-          show={showSignatureSettings}
-          onHide={() => setShowSignatureSettings(false)}
-          signatureData={selectedSignature}
-        />
+        {showSignatureSettings && (
+          <SignatureSettings
+            systemId={systemId}
+            show
+            onHide={() => setShowSignatureSettings(false)}
+            signatureData={selectedSignature}
+          />
+        )}

        {askUser && (
          <div className="absolute left-[1px] top-[29px] h-[calc(100%-30px)] w-[calc(100%-3px)] bg-stone-900/10 backdrop-blur-sm">
--- a/assets/js/hooks/Mapper/components/mapInterface/widgets/SystemSignatures/renders/renderInfoColumn.tsx
+++ b/assets/js/hooks/Mapper/components/mapInterface/widgets/SystemSignatures/renders/renderInfoColumn.tsx
@@ -1,5 +1,9 @@
+import { PrimeIcons } from 'primereact/api';
 import { SignatureGroup, SystemSignature } from '@/hooks/Mapper/types';
 import { SystemViewStandalone, WHClassView } from '@/hooks/Mapper/components/ui-kit';
+
+import { WdTooltipWrapper } from '@/hooks/Mapper/components/ui-kit/WdTooltipWrapper';
+
 import clsx from 'clsx';
 import { renderName } from './renderName.tsx';
 import classes from './renderInfoColumn.module.scss';
@@ -32,13 +36,23 @@ export const renderInfoColumn = (row: SystemSignature) => {
            </span>
          </>
        )}
+        {row.description && (
+          <WdTooltipWrapper content={row.description}>
+            <span className={clsx(PrimeIcons.EXCLAMATION_CIRCLE, 'text-[12px]')}></span>
+          </WdTooltipWrapper>
+        )}
      </div>
    );
  }

-  if (row.description != null && row.description.length > 0) {
-    return <span title={row.description}>{row.description}</span>;
-  }
-
-  return renderName(row);
+  return (
+    <div className="flex gap-1 items-center">
+      {renderName(row)}{' '}
+      {row.description && (
+        <WdTooltipWrapper content={row.description}>
+          <span className={clsx(PrimeIcons.EXCLAMATION_CIRCLE, 'text-[12px]')}></span>
+        </WdTooltipWrapper>
+      )}
+    </div>
+  );
 };
--- a/assets/js/hooks/Mapper/components/mapRootContent/components/Connections/Connections.tsx
+++ b/assets/js/hooks/Mapper/components/mapRootContent/components/Connections/Connections.tsx
@@ -1,13 +1,20 @@
 import classes from './Connections.module.scss';
 import { Sidebar } from 'primereact/sidebar';
-import { useEffect, useMemo, useState } from 'react';
+import { useEffect, useMemo, useState, useCallback } from 'react';
 import { useMapRootState } from '@/hooks/Mapper/mapRootProvider';
 import { VirtualScroller, VirtualScrollerTemplateOptions } from 'primereact/virtualscroller';
 import clsx from 'clsx';
-import { ConnectionOutput, OutCommand, Passage, SolarSystemConnection } from '@/hooks/Mapper/types';
+import {
+  ConnectionOutput,
+  ConnectionInfoOutput,
+  OutCommand,
+  Passage,
+  SolarSystemConnection,
+} from '@/hooks/Mapper/types';
 import { PassageCard } from './PassageCard';
 import { InfoDrawer, SystemView } from '@/hooks/Mapper/components/ui-kit';
 import { kgToTons } from '@/hooks/Mapper/utils/kgToTons.ts';
+import { TimeAgo } from '@/hooks/Mapper/components/ui-kit';

 const sortByDate = (a: string, b: string) => new Date(a).getTime() - new Date(b).getTime();

@@ -69,25 +76,44 @@ export const Connections = ({ selectedConnection, onHide }: OnTheMapProps) => {
  }, [connections, selectedConnection]);

  const [passages, setPassages] = useState<Passage[]>([]);
+  const [info, setInfo] = useState<ConnectionInfoOutput>(null);
+
+  const loadInfo = useCallback(
+    async (connection: SolarSystemConnection) => {
+      const result = await outCommand<ConnectionInfoOutput>({
+        type: OutCommand.getConnectionInfo,
+        data: {
+          from: connection.source,
+          to: connection.target,
+        },
+      });
+
+      setInfo(result);
+    },
+    [outCommand],
+  );
+
+  const loadPassages = useCallback(
+    async (connection: SolarSystemConnection) => {
+      const result = await outCommand<ConnectionOutput>({
+        type: OutCommand.getPassages,
+        data: {
+          from: connection.source,
+          to: connection.target,
+        },
+      });
+
+      setPassages(result.passages.sort((a, b) => sortByDate(b.inserted_at, a.inserted_at)));
+    },
+    [outCommand],
+  );

  useEffect(() => {
    if (!selectedConnection) {
      return;
    }
-
-    const loadInfo = async () => {
-      const result = await outCommand<ConnectionOutput>({
-        type: OutCommand.getPassages,
-        data: {
-          from: selectedConnection.source,
-          to: selectedConnection.target,
-        },
-      });
-
-      setPassages(result.passages.sort((a, b) => sortByDate(b.inserted_at, a.inserted_at)));
-    };
-
-    loadInfo();
+    loadInfo(selectedConnection);
+    loadPassages(selectedConnection);
  }, [selectedConnection]);

  const approximateMass = useMemo(() => {
@@ -132,6 +158,10 @@ export const Connections = ({ selectedConnection, onHide }: OnTheMapProps) => {
            {kgToTons(approximateMass)}
          </InfoDrawer>

+          <InfoDrawer title="Mark EOL Time" rightSide>
+            {info?.marl_eol_time ? <TimeAgo timestamp={info.marl_eol_time} /> : ' unknown '}
+          </InfoDrawer>
+
          <div className="flex gap-2"></div>
        </div>

--- a/assets/js/hooks/Mapper/types/connectionPassages.ts
+++ b/assets/js/hooks/Mapper/types/connectionPassages.ts
@@ -11,6 +11,10 @@ export type Passage = {
  character: PassageLimitedCharacterType;
 };

+export type ConnectionInfoOutput = {
+  marl_eol_time: string;
+};
+
 export type ConnectionOutput = {
  passages: Passage[];
 };
--- a/assets/js/hooks/Mapper/types/mapHandlers.ts
+++ b/assets/js/hooks/Mapper/types/mapHandlers.ts
@@ -118,6 +118,7 @@ export enum OutCommand {
  getCharacterJumps = 'get_character_jumps',
  getSignatures = 'get_signatures',
  getSystemStaticInfos = 'get_system_static_infos',
+  getConnectionInfo = 'get_connection_info',
  updateConnectionTimeStatus = 'update_connection_time_status',
  updateConnectionMassStatus = 'update_connection_mass_status',
  updateConnectionShipSizeType = 'update_connection_ship_size_type',
--- a/assets/js/hooks/drag.ts
+++ b/assets/js/hooks/drag.ts
@@ -8,7 +8,7 @@ export default {
    const selector = '#' + this.el.id;

    const droppable = new Droppable(containers, {
-      delay: 150,
+      delay: 100,
      draggable: '.draggable',
      dropzone: '.dropzone',
      mirror: {
--- a/config/runtime.exs
+++ b/config/runtime.exs
@@ -138,6 +138,7 @@ config :ueberauth, WandererApp.Ueberauth.Strategy.Eve.OAuth,
    System.get_env("EVE_CLIENT_WITH_CORP_WALLET_SECRET", "<EVE_CLIENT_WITH_CORP_WALLET_SECRET>")

 config :logger,
+  truncate: :infinity,
  level:
    String.to_existing_atom(
      System.get_env(
@@ -171,43 +172,65 @@ config :wanderer_app, WandererApp.Scheduler,
  timeout: :infinity

 if config_env() == :prod do
-  database_url =
-    System.get_env("DATABASE_URL") ||
-      raise """
-      environment variable DATABASE_URL is missing.
-      For example: ecto://USER:PASS@HOST/DATABASE
-      """
+  database_unix_socket =
+    System.get_env("DATABASE_UNIX_SOCKET")

-  maybe_ipv6 =
-    config_dir
-    |> get_var_from_path_or_env("ECTO_IPV6", "false")
-    |> String.to_existing_atom()
+  database =
+    database_unix_socket
    |> case do
-      true -> [:inet6]
-      _ -> []
-    end
+      nil ->
+        System.get_env("DATABASE_URL") ||
+          raise """
+          environment variable DATABASE_URL is missing.
+          For example: ecto://USER:PASS@HOST/DATABASE
+          """

-  db_ssl_enabled =
-    config_dir
-    |> get_var_from_path_or_env("DATABASE_SSL_ENABLED", "false")
-    |> String.to_existing_atom()
-
-  db_ssl_verify_none =
-    config_dir
-    |> get_var_from_path_or_env("DATABASE_SSL_VERIFY_NONE", "false")
-    |> String.to_existing_atom()
-
-  client_opts =
-    if db_ssl_verify_none do
-      [verify: :verify_none]
+      _ ->
+        System.get_env("DATABASE_NAME") ||
+          raise """
+          environment variable DATABASE_NAME is missing.
+          For example: "wanderer"
+          """
    end

  config :wanderer_app, WandererApp.Repo,
-    url: database_url,
-    ssl: db_ssl_enabled,
-    ssl_opts: client_opts,
-    pool_size: String.to_integer(System.get_env("POOL_SIZE") || "10"),
-    socket_options: maybe_ipv6
+    pool_size: String.to_integer(System.get_env("POOL_SIZE") || "10")
+
+  if not is_nil(database_unix_socket) do
+    config :wanderer_app, WandererApp.Repo,
+      socket_dir: database_unix_socket,
+      database: database
+  else
+    db_ssl_enabled =
+      config_dir
+      |> get_var_from_path_or_env("DATABASE_SSL_ENABLED", "false")
+      |> String.to_existing_atom()
+
+    db_ssl_verify_none =
+      config_dir
+      |> get_var_from_path_or_env("DATABASE_SSL_VERIFY_NONE", "false")
+      |> String.to_existing_atom()
+
+    client_opts =
+      if db_ssl_verify_none do
+        [verify: :verify_none]
+      end
+
+    maybe_ipv6 =
+      config_dir
+      |> get_var_from_path_or_env("ECTO_IPV6", "false")
+      |> String.to_existing_atom()
+      |> case do
+        true -> [:inet6]
+        _ -> []
+      end
+
+    config :wanderer_app, WandererApp.Repo,
+      url: database,
+      ssl: db_ssl_enabled,
+      ssl_opts: client_opts,
+      socket_options: maybe_ipv6
+  end

  # The secret key base is used to sign/encrypt cookies and other secrets.
  # A default value is used in config/dev.exs and config/test.exs but you
--- a/fly.toml
+++ b/fly.toml
@@ -3,9 +3,10 @@
 # See https://fly.io/docs/reference/configuration/ for information about how to use this file.
 #

-app = 'wanderer'
+app = 'wanderer-test'
 primary_region = 'ams'
 kill_signal = 'SIGTERM'
+swap_size_mb = 512

 [build]

@@ -13,18 +14,14 @@ kill_signal = 'SIGTERM'
  release_command = '/app/bin/migrate.sh'

 [env]
-  PHX_HOST = 'wanderer.fly.dev'
+  PHX_HOST = 'wanderer-test.fly.dev'
  PHX_SERVER = 'true'
  PORT = '8080'

-[metrics]
-port = 4021
-path = "/metrics"
-
 [http_service]
  internal_port = 8080
  force_https = true
-  auto_stop_machines = false
+  auto_stop_machines = 'off'
  auto_start_machines = false
  min_machines_running = 0
  processes = ['app']
@@ -35,6 +32,9 @@ path = "/metrics"
    soft_limit = 1000

 [[vm]]
-  memory = '1gb'
-  cpu_kind = 'shared'
-  cpus = 1
+  size = 'shared-cpu-1x'
+
+[[metrics]]
+  port = 4021
+  path = '/metrics'
+  https = false
--- a/lib/wanderer_app/api/calculations/calc_map_permissions.ex
+++ b/lib/wanderer_app/api/calculations/calc_map_permissions.ex
@@ -4,8 +4,6 @@ defmodule WandererApp.Api.Calculations.CalcMapPermissions do
  use Ash.Resource.Calculation
  require Ash.Query

-  import Bitwise
-
  @impl true
  def load(_query, _opts, _context) do
    [
@@ -17,116 +15,8 @@ defmodule WandererApp.Api.Calculations.CalcMapPermissions do
  end

  @impl true
-  def calculate([record], _opts, %{actor: actor}) do
-    characters = actor.characters
-
-    character_ids = characters |> Enum.map(& &1.id)
-    character_eve_ids = characters |> Enum.map(& &1.eve_id)
-
-    character_corporation_ids =
-      characters |> Enum.map(& &1.corporation_id) |> Enum.map(&to_string/1)
-
-    character_alliance_ids = characters |> Enum.map(& &1.alliance_id) |> Enum.map(&to_string/1)
-
-    result =
-      record.acls
-      |> Enum.reduce([0, 0], fn acl, acc ->
-        is_owner? = acl.owner_id in character_ids
-
-        is_character_member? =
-          acl.members |> Enum.any?(fn member -> member.eve_character_id in character_eve_ids end)
-
-        is_corporation_member? =
-          acl.members
-          |> Enum.any?(fn member -> member.eve_corporation_id in character_corporation_ids end)
-
-        is_alliance_member? =
-          acl.members
-          |> Enum.any?(fn member -> member.eve_alliance_id in character_alliance_ids end)
-
-        if is_owner? || is_character_member? || is_corporation_member? || is_alliance_member? do
-          case acc do
-            [_, -1] ->
-              [-1, -1]
-
-            [-1, char_acc] ->
-              char_acl_mask =
-                acl.members
-                |> Enum.filter(fn member ->
-                  member.eve_character_id in character_eve_ids
-                end)
-                |> Enum.reduce(0, fn member, acc ->
-                  case acc do
-                    -1 -> -1
-                    _ -> WandererApp.Permissions.calc_role_mask(member.role, acc)
-                  end
-                end)
-
-              char_acc =
-                case char_acl_mask do
-                  -1 -> -1
-                  _ -> char_acc ||| char_acl_mask
-                end
-
-              [-1, char_acc]
-
-            [any_acc, char_acc] ->
-              any_acl_mask =
-                acl.members
-                |> Enum.filter(fn member ->
-                  member.eve_character_id in character_eve_ids ||
-                    member.eve_corporation_id in character_corporation_ids ||
-                    member.eve_alliance_id in character_alliance_ids
-                end)
-                |> Enum.reduce(0, fn member, acc ->
-                  case acc do
-                    -1 -> -1
-                    _ -> WandererApp.Permissions.calc_role_mask(member.role, acc)
-                  end
-                end)
-
-              char_acl_mask =
-                acl.members
-                |> Enum.filter(fn member ->
-                  member.eve_character_id in character_eve_ids
-                end)
-                |> Enum.reduce(0, fn member, acc ->
-                  case acc do
-                    -1 -> -1
-                    _ -> WandererApp.Permissions.calc_role_mask(member.role, acc)
-                  end
-                end)
-
-              any_acc =
-                case any_acl_mask do
-                  -1 -> -1
-                  _ -> any_acc ||| any_acl_mask
-                end
-
-              char_acc =
-                case char_acl_mask do
-                  -1 -> -1
-                  _ -> char_acc ||| char_acl_mask
-                end
-
-              [any_acc, char_acc]
-          end
-        else
-          acc
-        end
-      end)
-
-    case result do
-      [_, -1] ->
-        [-1]
-
-      [-1, char_acc] ->
-        [char_acc]
-
-      [any_acc, _char_acc] ->
-        [any_acc]
-    end
-  end
+  def calculate([record], _opts, %{actor: actor}),
+    do: WandererApp.Permissions.check_characters_access(actor.characters, record.acls)

  @impl true
  def calculate(_records, _opts, _context) do
--- a/lib/wanderer_app/api/map_character_settings.ex
+++ b/lib/wanderer_app/api/map_character_settings.ex
@@ -17,12 +17,12 @@ defmodule WandererApp.Api.MapCharacterSettings do
      action: :read_by_map
    )

-    define(:tracked_by_map,
-      action: :tracked_by_map
+    define(:tracked_by_map_filtered,
+      action: :tracked_by_map_filtered
    )

    define(:tracked_by_map_all,
-      action: :read_tracked_by_map
+      action: :tracked_by_map_all
    )

    define(:track, action: :track)
@@ -38,7 +38,7 @@ defmodule WandererApp.Api.MapCharacterSettings do

    defaults [:create, :read, :update, :destroy]

-    read :tracked_by_map do
+    read :tracked_by_map_filtered do
      argument(:map_id, :string, allow_nil?: false)
      argument(:character_ids, {:array, :uuid}, allow_nil?: false)

@@ -52,7 +52,7 @@ defmodule WandererApp.Api.MapCharacterSettings do
      filter(expr(map_id == ^arg(:map_id)))
    end

-    read :read_tracked_by_map do
+    read :tracked_by_map_all do
      argument(:map_id, :string, allow_nil?: false)
      filter(expr(map_id == ^arg(:map_id) and tracked == true))
    end
--- a/lib/wanderer_app/api/map_system_signature.ex
+++ b/lib/wanderer_app/api/map_system_signature.ex
@@ -16,6 +16,7 @@ defmodule WandererApp.Api.MapSystemSignature do
    define(:update, action: :update)
    define(:update_linked_system, action: :update_linked_system)
    define(:update_type, action: :update_type)
+    define(:update_group, action: :update_group)

    define(:by_id,
      get_by: [:id],
@@ -86,6 +87,10 @@ defmodule WandererApp.Api.MapSystemSignature do
      accept [:type]
    end

+    update :update_group do
+      accept [:group]
+    end
+
    read :by_system_id do
      argument(:system_id, :string, allow_nil?: false)

--- a/lib/wanderer_app/application.ex
+++ b/lib/wanderer_app/application.ex
@@ -3,6 +3,8 @@ defmodule WandererApp.Application do

  use Application

+  require Logger
+
  @impl true
  def start(_type, _args) do
    children =
@@ -45,7 +47,16 @@ defmodule WandererApp.Application do
    # See https://hexdocs.pm/elixir/Supervisor.html
    # for other strategies and supported options
    opts = [strategy: :one_for_one, name: WandererApp.Supervisor]
+
    Supervisor.start_link(children, opts)
+    |> case do
+      {:ok, _pid} = ok ->
+        ok
+
+      {:error, info} = e ->
+        Logger.error("Failed to start application: #{inspect(info)}")
+        e
+    end
  end

  # Tell Phoenix to update the endpoint configuration
--- a/lib/wanderer_app/esi/api_client.ex
+++ b/lib/wanderer_app/esi/api_client.ex
@@ -37,32 +37,32 @@ defmodule WandererApp.Esi.ApiClient do

  @logger Application.compile_env(:wanderer_app, :logger)

-  def get_server_status, do: _get("/status")
+  def get_server_status, do: get("/status")

-  def set_autopilot_waypoint(add_to_beginning, clear_other_waypoints, destination_id, opts \\ []) do
-    _post_esi(
-      "/ui/autopilot/waypoint",
-      opts
-      |> Keyword.merge(
-        params: %{
-          add_to_beginning: add_to_beginning,
-          clear_other_waypoints: clear_other_waypoints,
-          destination_id: destination_id
-        }
+  def set_autopilot_waypoint(add_to_beginning, clear_other_waypoints, destination_id, opts \\ []),
+    do:
+      post_esi(
+        "/ui/autopilot/waypoint",
+        opts
+        |> Keyword.merge(
+          params: %{
+            add_to_beginning: add_to_beginning,
+            clear_other_waypoints: clear_other_waypoints,
+            destination_id: destination_id
+          }
+        )
      )
-    )
-  end

  def post_characters_affiliation(character_eve_ids, _opts)
-      when is_list(character_eve_ids) do
-    _post(
-      "#{@base_url}/characters/affiliation/",
-      json: character_eve_ids,
-      params: %{
-        datasource: "tranquility"
-      }
-    )
-  end
+      when is_list(character_eve_ids),
+      do:
+        post(
+          "#{@base_url}/characters/affiliation/",
+          json: character_eve_ids,
+          params: %{
+            datasource: "tranquility"
+          }
+        )

  def find_routes(map_id, origin, hubs, routes_settings) do
    origin = origin |> String.to_integer()
@@ -184,7 +184,7 @@ defmodule WandererApp.Esi.ApiClient do
    routes =
      all_routes
      |> Enum.map(fn route_info ->
-        _map_route_info(route_info)
+        map_route_info(route_info)
      end)
      |> Enum.filter(fn route_info -> not is_nil(route_info) end)

@@ -200,7 +200,7 @@ defmodule WandererApp.Esi.ApiClient do
        {:ok, result}

      _ ->
-        case _get_all_routes_custom(hubs, origin, params) do
+        case get_all_routes_custom(hubs, origin, params) do
          {:ok, result} ->
            WandererApp.Cache.insert(
              cache_key,
@@ -210,22 +210,21 @@ defmodule WandererApp.Esi.ApiClient do

            {:ok, result}

-          {:error, error} ->
-            @logger.error("Error getting custom routes for #{inspect(origin)}: #{inspect(error)}")
+          {:error, _error} ->
            @logger.error("Error getting custom routes for #{inspect(origin)}: #{inspect(hubs)}")

            @logger.error(
              "Error getting custom routes for #{inspect(origin)}: #{inspect(params)}"
            )

-            _get_all_routes_eve(hubs, origin, params, opts)
+            get_all_routes_eve(hubs, origin, params, opts)
        end
    end
  end

-  defp _get_all_routes_custom(hubs, origin, params),
+  defp get_all_routes_custom(hubs, origin, params),
    do:
-      _post(
+      post(
        "#{get_custom_route_base_url()}/route/multiple",
        [
          json: %{
@@ -239,7 +238,7 @@ defmodule WandererApp.Esi.ApiClient do
        |> Keyword.merge(@timeout_opts)
      )

-  def _get_all_routes_eve(hubs, origin, params, opts),
+  def get_all_routes_eve(hubs, origin, params, opts),
    do:
      {:ok,
       hubs
@@ -308,7 +307,7 @@ defmodule WandererApp.Esi.ApiClient do
              opts: [ttl: @ttl]
            )
  def get_character_info(eve_id, opts \\ []) do
-    case _get(
+    case get(
           "/characters/#{eve_id}/",
           opts |> _with_cache_opts()
         ) do
@@ -385,7 +384,7 @@ defmodule WandererApp.Esi.ApiClient do

  defp _get_routes_eve(origin, destination, params, opts),
    do:
-      _get(
+      get(
        "/route/#{origin}/#{destination}/?#{params |> Plug.Conn.Query.encode()}",
        opts |> _with_cache_opts()
      )
@@ -394,14 +393,14 @@ defmodule WandererApp.Esi.ApiClient do

  defp _get_alliance_info(alliance_eve_id, info_path, opts),
    do:
-      _get(
+      get(
        "/alliances/#{alliance_eve_id}/#{info_path}",
        opts |> _with_cache_opts()
      )

  defp _get_corporation_info(corporation_eve_id, info_path, opts),
    do:
-      _get(
+      get(
        "/corporations/#{corporation_eve_id}/#{info_path}",
        opts |> _with_cache_opts()
      )
@@ -416,7 +415,7 @@ defmodule WandererApp.Esi.ApiClient do
    character_id = opts |> Keyword.get(:character_id, nil)

    if not _is_access_token_expired?(character_id) do
-      _get(
+      get(
        path,
        auth_opts,
        opts
@@ -437,7 +436,7 @@ defmodule WandererApp.Esi.ApiClient do

  defp _get_corporation_auth_data(corporation_eve_id, info_path, opts),
    do:
-      _get(
+      get(
        "/corporations/#{corporation_eve_id}/#{info_path}",
        [params: opts[:params] || []] ++
          (opts |> _get_auth_opts() |> _with_cache_opts()),
@@ -448,14 +447,14 @@ defmodule WandererApp.Esi.ApiClient do
    opts |> Keyword.merge(@cache_opts) |> Keyword.merge(cache_dir: System.tmp_dir!())
  end

-  defp _post_esi(path, opts),
+  defp post_esi(path, opts),
    do:
-      _post(
+      post(
        "#{@base_url}#{path}",
        [params: opts[:params] || []] ++ (opts |> _get_auth_opts())
      )

-  defp _get(path, api_opts \\ [], opts \\ []) do
+  defp get(path, api_opts \\ [], opts \\ []) do
    try do
      case Req.get("#{@base_url}#{path}", api_opts |> Keyword.merge(@retry_opts)) do
        {:ok, %{status: 200, body: body}} ->
@@ -487,7 +486,7 @@ defmodule WandererApp.Esi.ApiClient do
    end
  end

-  defp _post(url, opts) do
+  defp post(url, opts) do
    try do
      case Req.post("#{url}", opts) do
        {:ok, %{status: status, body: body}} when status in [200, 201] ->
@@ -525,7 +524,7 @@ defmodule WandererApp.Esi.ApiClient do
        {:ok, token} ->
          auth_opts = [access_token: token.access_token] |> _get_auth_opts()

-          _get(
+          get(
            path,
            api_opts |> Keyword.merge(auth_opts),
            opts |> Keyword.merge(retry_count: retry_count + 1)
@@ -600,7 +599,7 @@ defmodule WandererApp.Esi.ApiClient do
    end
  end

-  defp _map_route_info(
+  defp map_route_info(
         %{
           "origin" => origin,
           "destination" => destination,
@@ -609,14 +608,14 @@ defmodule WandererApp.Esi.ApiClient do
         } = _route_info
       ),
       do:
-         _map_route_info(%{
+         map_route_info(%{
           origin: origin,
           destination: destination,
           systems: result_systems,
           success: success
         })

-  defp _map_route_info(
+  defp map_route_info(
         %{origin: origin, destination: destination, systems: result_systems, success: success} =
           _route_info
       ) do
@@ -638,5 +637,5 @@ defmodule WandererApp.Esi.ApiClient do
    }
  end

-  defp _map_route_info(_), do: nil
+  defp map_route_info(_), do: nil
 end
--- a/lib/wanderer_app/map.ex
+++ b/lib/wanderer_app/map.ex
@@ -8,6 +8,7 @@ defmodule WandererApp.Map do
  defstruct map_id: nil,
            name: nil,
            scope: :none,
+            owner_id: nil,
            characters: [],
            systems: Map.new(),
            hubs: [],
@@ -16,11 +17,12 @@ defmodule WandererApp.Map do
            characters_limit: nil,
            hubs_limit: nil

-  def new(%{id: map_id, name: name, scope: scope, acls: acls, hubs: hubs}) do
+  def new(%{id: map_id, name: name, scope: scope, owner_id: owner_id, acls: acls, hubs: hubs}) do
    map =
      struct!(__MODULE__,
        map_id: map_id,
        scope: scope,
+        owner_id: owner_id,
        name: name,
        acls: acls,
        hubs: hubs
@@ -214,7 +216,7 @@ defmodule WandererApp.Map do
      %{visible: true} = system ->
        system

-      _ ->
+      _system ->
        nil
    end
  end
@@ -262,7 +264,7 @@ defmodule WandererApp.Map do
    case not Map.has_key?(systems, solar_system_id) do
      true ->
        map_id
-        |> update_map(%{systems: Map.put_new(systems, solar_system_id, system)})
+        |> update_map(%{systems: Map.put(systems, solar_system_id, system)})

        :ok

--- a/lib/wanderer_app/map/map_server.ex
+++ b/lib/wanderer_app/map/map_server.ex
@@ -183,6 +183,12 @@ defmodule WandererApp.Map.Server do
      |> map_pid!
      |> GenServer.cast({&Impl.delete_connection/2, [connection_info]})

+  def get_connection_info(map_id, connection_info) when is_binary(map_id),
+    do:
+      map_id
+      |> map_pid!
+      |> GenServer.call({&Impl.get_connection_info/2, [connection_info]}, :timer.minutes(1))
+
  def update_connection_time_status(map_id, connection_info) when is_binary(map_id),
    do:
      map_id
--- a/lib/wanderer_app/map/map_server_impl.ex
+++ b/lib/wanderer_app/map/map_server_impl.ex
@@ -77,6 +77,7 @@ defmodule WandererApp.Map.Server.Impl do
  # @unknown 100_100

  @systems_cleanup_timeout :timer.minutes(30)
+  @characters_cleanup_timeout :timer.minutes(1)
  @connections_cleanup_timeout :timer.minutes(2)

  @connection_time_status_eol 1
@@ -112,20 +113,28 @@ defmodule WandererApp.Map.Server.Impl do
  end

  def load_state(%__MODULE__{map_id: map_id} = state) do
-    with {:ok, map} <- WandererApp.MapRepo.get(map_id, [:acls, :characters]),
+    with {:ok, map} <-
+           WandererApp.MapRepo.get(map_id, [
+             :owner,
+             :characters,
+             acls: [
+               :owner_id,
+               members: [:role, :eve_character_id, :eve_corporation_id, :eve_alliance_id]
+             ]
+           ]),
         {:ok, systems} <- WandererApp.MapSystemRepo.get_visible_by_map(map_id),
         {:ok, connections} <- WandererApp.MapConnectionRepo.get_by_map(map_id),
         {:ok, subscription_settings} <-
           WandererApp.Map.SubscriptionManager.get_active_map_subscription(map_id) do
      state
-      |> _init_map(
+      |> init_map(
        map,
        subscription_settings,
        systems,
        connections
      )
-      |> _init_map_systems(systems)
-      |> _init_map_cache()
+      |> init_map_systems(systems)
+      |> init_map_cache()
    else
      error ->
        @logger.error("Failed to load map state: #{inspect(error, pretty: true)}")
@@ -134,7 +143,7 @@ defmodule WandererApp.Map.Server.Impl do
  end

  def start_map(%__MODULE__{map: map, map_id: map_id} = state) do
-    with :ok <- _track_acls(map.acls |> Enum.map(& &1.id)) do
+    with :ok <- track_acls(map.acls |> Enum.map(& &1.id)) do
      @pubsub_client.subscribe(
        WandererApp.PubSub,
        "maps:#{map_id}"
@@ -144,7 +153,8 @@ defmodule WandererApp.Map.Server.Impl do
      Process.send_after(self(), :update_tracked_characters, 100)
      Process.send_after(self(), :update_presence, @update_presence_timeout)
      Process.send_after(self(), :cleanup_connections, 5000)
-      Process.send_after(self(), :cleanup_systems, 10000)
+      Process.send_after(self(), :cleanup_systems, 10_000)
+      Process.send_after(self(), :cleanup_characters, :timer.minutes(5))
      Process.send_after(self(), :backup_state, @backup_state_timeout)

      WandererApp.Cache.insert("map_#{map_id}:started", true)
@@ -169,7 +179,7 @@ defmodule WandererApp.Map.Server.Impl do
    :telemetry.execute([:wanderer_app, :map, :stopped], %{count: 1})

    state
-    |> _maybe_stop_rtree()
+    |> maybe_stop_rtree()
  end

  def get_map(%{map: map} = _state), do: {:ok, map}
@@ -249,37 +259,37 @@ defmodule WandererApp.Map.Server.Impl do
        state,
        update
      ),
-      do: state |> _update_system(:update_name, [:name], update)
+      do: state |> update_system(:update_name, [:name], update)

  def update_system_description(
        state,
        update
      ),
-      do: state |> _update_system(:update_description, [:description], update)
+      do: state |> update_system(:update_description, [:description], update)

  def update_system_status(
        state,
        update
      ),
-      do: state |> _update_system(:update_status, [:status], update)
+      do: state |> update_system(:update_status, [:status], update)

  def update_system_tag(
        state,
        update
      ),
-      do: state |> _update_system(:update_tag, [:tag], update)
+      do: state |> update_system(:update_tag, [:tag], update)

  def update_system_locked(
        state,
        update
      ),
-      do: state |> _update_system(:update_locked, [:locked], update)
+      do: state |> update_system(:update_locked, [:locked], update)

  def update_system_labels(
        state,
        update
      ),
-      do: state |> _update_system(:update_labels, [:labels], update)
+      do: state |> update_system(:update_labels, [:labels], update)

  def update_system_position(
        %{rtree_name: rtree_name} = state,
@@ -287,7 +297,7 @@ defmodule WandererApp.Map.Server.Impl do
      ),
      do:
        state
-        |> _update_system(
+        |> update_system(
          :update_position,
          [:position_x, :position_y],
          update,
@@ -435,12 +445,34 @@ defmodule WandererApp.Map.Server.Impl do
    state
  end

+  def get_connection_info(
+        %{map_id: map_id} = _state,
+        %{
+          solar_system_source_id: solar_system_source_id,
+          solar_system_target_id: solar_system_target_id
+        } = _connection_info
+      ) do
+    WandererApp.Map.find_connection(
+      map_id,
+      solar_system_source_id,
+      solar_system_target_id
+    )
+    |> case do
+      {:ok, %{id: connection_id}} ->
+        connection_mark_eol_time = get_connection_mark_eol_time(map_id, connection_id, nil)
+        {:ok, %{marl_eol_time: connection_mark_eol_time}}
+
+      _ ->
+        {:error, :not_found}
+    end
+  end
+
  def update_connection_time_status(
        %{map_id: map_id} = state,
        connection_update
      ),
      do:
-        _update_connection(state, :update_time_status, [:time_status], connection_update, fn
+        update_connection(state, :update_time_status, [:time_status], connection_update, fn
          %{id: connection_id, time_status: time_status} ->
            case time_status == @connection_time_status_eol do
              true ->
@@ -459,25 +491,25 @@ defmodule WandererApp.Map.Server.Impl do
        state,
        connection_update
      ),
-      do: _update_connection(state, :update_mass_status, [:mass_status], connection_update)
+      do: update_connection(state, :update_mass_status, [:mass_status], connection_update)

  def update_connection_ship_size_type(
        state,
        connection_update
      ),
-      do: _update_connection(state, :update_ship_size_type, [:ship_size_type], connection_update)
+      do: update_connection(state, :update_ship_size_type, [:ship_size_type], connection_update)

  def update_connection_locked(
        state,
        connection_update
      ),
-      do: _update_connection(state, :update_locked, [:locked], connection_update)
+      do: update_connection(state, :update_locked, [:locked], connection_update)

  def update_connection_custom_info(
        state,
        connection_update
      ),
-      do: _update_connection(state, :update_custom_info, [:custom_info], connection_update)
+      do: update_connection(state, :update_custom_info, [:custom_info], connection_update)

  def import_settings(%{map_id: map_id} = state, settings, user_id) do
    WandererApp.Cache.put(
@@ -487,9 +519,9 @@ defmodule WandererApp.Map.Server.Impl do

    state =
      state
-      |> _maybe_import_systems(settings, user_id, nil)
-      |> _maybe_import_connections(settings, user_id)
-      |> _maybe_import_hubs(settings, user_id)
+      |> maybe_import_systems(settings, user_id, nil)
+      |> maybe_import_connections(settings, user_id)
+      |> maybe_import_hubs(settings, user_id)

    WandererApp.Cache.take("map_#{map_id}:importing")

@@ -509,11 +541,11 @@ defmodule WandererApp.Map.Server.Impl do
    |> Enum.map(fn character_id ->
      Task.start_link(fn ->
        character_updates =
-          _maybe_update_online(map_id, character_id) ++
-            _maybe_update_location(map_id, character_id) ++
-            _maybe_update_ship(map_id, character_id) ++
-            _maybe_update_alliance(map_id, character_id) ++
-            _maybe_update_corporation(map_id, character_id)
+          maybe_update_online(map_id, character_id) ++
+            maybe_update_location(map_id, character_id) ++
+            maybe_update_ship(map_id, character_id) ++
+            maybe_update_alliance(map_id, character_id) ++
+            maybe_update_corporation(map_id, character_id)

        character_updates
        |> Enum.filter(fn update -> update != :skip end)
@@ -521,7 +553,7 @@ defmodule WandererApp.Map.Server.Impl do
          update
          |> case do
            {:character_location, location_info, old_location_info} ->
-              _update_location(
+              update_location(
                character_id,
                location_info,
                old_location_info,
@@ -537,9 +569,25 @@ defmodule WandererApp.Map.Server.Impl do
              :broadcast

            {:character_alliance, _info} ->
+              WandererApp.Cache.insert_or_update(
+                "map_#{map_id}:invalidate_character_ids",
+                [character_id],
+                fn ids ->
+                  [character_id | ids]
+                end
+              )
+
              :broadcast

            {:character_corporation, _info} ->
+              WandererApp.Cache.insert_or_update(
+                "map_#{map_id}:invalidate_character_ids",
+                [character_id],
+                fn ids ->
+                  [character_id | ids]
+                end
+              )
+
              :broadcast

            _ ->
@@ -569,17 +617,21 @@ defmodule WandererApp.Map.Server.Impl do
    Process.send_after(self(), :update_tracked_characters, @update_tracked_characters_timeout)

    Task.start_link(fn ->
-      map_characters =
+      {:ok, map_tracked_character_ids} =
        map_id
-        |> WandererApp.Map.get_map!()
-        |> Map.get(:characters, [])
+        |> WandererApp.MapCharacterSettingsRepo.get_tracked_by_map_all()
+        |> case do
+          {:ok, settings} -> {:ok, settings |> Enum.map(&Map.get(&1, :character_id))}
+          _ -> {:ok, []}
+        end

      {:ok, tracked_characters} = WandererApp.Cache.lookup("tracked_characters", [])

-      map_tracked_characters =
-        map_characters |> Enum.filter(fn character -> character in tracked_characters end)
+      map_active_tracked_characters =
+        map_tracked_character_ids
+        |> Enum.filter(fn character -> character in tracked_characters end)

-      WandererApp.Cache.insert("maps:#{map_id}:tracked_characters", map_tracked_characters)
+      WandererApp.Cache.insert("maps:#{map_id}:tracked_characters", map_active_tracked_characters)

      :ok
    end)
@@ -590,29 +642,37 @@ defmodule WandererApp.Map.Server.Impl do
  def handle_event(:update_presence, %{map_id: map_id} = state) do
    Process.send_after(self(), :update_presence, @update_presence_timeout)

-    _update_presence(map_id)
+    update_presence(map_id)

    state
  end

  def handle_event(:backup_state, state) do
    Process.send_after(self(), :backup_state, @backup_state_timeout)
-    {:ok, _map_state} = state |> _save_map_state()
+    {:ok, _map_state} = state |> save_map_state()

    state
  end

-  def handle_event({:map_acl_updated, added_acls, removed_acls}, %{map: old_map} = state) do
-    {:ok, map} = WandererApp.MapRepo.get(old_map.map_id, [:acls])
+  def handle_event(
+        {:map_acl_updated, added_acls, removed_acls},
+        %{map_id: map_id, map: old_map} = state
+      ) do
+    {:ok, map} =
+      WandererApp.MapRepo.get(map_id,
+        acls: [
+          :owner_id,
+          members: [:role, :eve_character_id, :eve_corporation_id, :eve_alliance_id]
+        ]
+      )

-    _track_acls(added_acls)
+    track_acls(added_acls)

    result =
-      [added_acls | removed_acls]
-      |> List.flatten()
+      (added_acls ++ removed_acls)
      |> Task.async_stream(
        fn acl_id ->
-          _update_acl(acl_id)
+          update_acl(acl_id)
        end,
        max_concurrency: 10,
        timeout: :timer.seconds(15)
@@ -641,29 +701,45 @@ defmodule WandererApp.Map.Server.Impl do
              }

            error ->
-              @logger.error(
-                "Failed to update map #{old_map.map_id} acl: #{inspect(error, pretty: true)}"
-              )
+              @logger.error("Failed to update map #{map_id} acl: #{inspect(error, pretty: true)}")

              acc
          end
        end
      )

-    _broadcast_acl_updates({:ok, result})
+    map_update = %{acls: map.acls, scope: map.scope}

-    %{state | map: %{old_map | acls: map.acls, scope: map.scope}}
+    WandererApp.Map.update_map(map_id, map_update)
+
+    broadcast_acl_updates({:ok, result}, map_id)
+
+    %{state | map: Map.merge(old_map, map_update)}
  end

-  def handle_event({:acl_updated, %{acl_id: acl_id}}, %{map: map} = state) do
+  def handle_event({:acl_updated, %{acl_id: acl_id}}, %{map_id: map_id, map: old_map} = state) do
+    {:ok, map} =
+      WandererApp.MapRepo.get(map_id,
+        acls: [
+          :owner_id,
+          members: [:role, :eve_character_id, :eve_corporation_id, :eve_alliance_id]
+        ]
+      )
+
    if map.acls |> Enum.map(& &1.id) |> Enum.member?(acl_id) do
+      map_update = %{acls: map.acls}
+
+      WandererApp.Map.update_map(map_id, map_update)
+
      :ok =
        acl_id
-        |> _update_acl()
-        |> _broadcast_acl_updates()
-    end
+        |> update_acl()
+        |> broadcast_acl_updates(map_id)

-    state
+      state
+    else
+      state
+    end
  end

  def handle_event(:cleanup_connections, %{map_id: map_id} = state) do
@@ -679,7 +755,7 @@ defmodule WandererApp.Map.Server.Impl do
                        } ->
        DateTime.diff(DateTime.utc_now(), inserted_at, :hour) >=
          @connection_auto_eol_hours and
-          _is_connection_valid(
+          is_connection_valid(
            :wormholes,
            solar_system_source_id,
            solar_system_target_id
@@ -707,7 +783,7 @@ defmodule WandererApp.Map.Server.Impl do
                          solar_system_source: solar_system_source_id,
                          solar_system_target: solar_system_target_id
                        } ->
-        connection_mark_eol_time = _get_connection_mark_eol_time(map_id, connection_id)
+        connection_mark_eol_time = get_connection_mark_eol_time(map_id, connection_id)

        reverse_connection =
          WandererApp.Map.get_connection(
@@ -717,24 +793,23 @@ defmodule WandererApp.Map.Server.Impl do
          )

        is_connection_exist =
-          _is_connection_exist(
+          is_connection_exist(
            map_id,
            solar_system_source_id,
            solar_system_target_id
-          )
+          ) || not is_nil(reverse_connection)

        is_connection_valid =
-          _is_connection_valid(
+          is_connection_valid(
            :wormholes,
            solar_system_source_id,
            solar_system_target_id
          )

-        not is_connection_exist or
-          not is_nil(reverse_connection) or
-          (is_connection_valid and
+        not is_connection_exist ||
+          (is_connection_valid &&
             (DateTime.diff(DateTime.utc_now(), inserted_at, :hour) >=
-                @connection_auto_expire_hours or
+                @connection_auto_expire_hours ||
                DateTime.diff(DateTime.utc_now(), connection_mark_eol_time, :hour) >=
                  @connection_auto_expire_hours - @connection_auto_eol_hours))
      end)
@@ -753,6 +828,76 @@ defmodule WandererApp.Map.Server.Impl do
    state
  end

+  def handle_event(:cleanup_characters, %{map_id: map_id, map: %{owner_id: owner_id}} = state) do
+    Process.send_after(self(), :cleanup_characters, @characters_cleanup_timeout)
+
+    {:ok, invalidate_character_ids} =
+      WandererApp.Cache.lookup(
+        "map_#{map_id}:invalidate_character_ids",
+        []
+      )
+
+    invalidate_character_ids
+    |> Task.async_stream(
+      fn character_id ->
+        character_id
+        |> WandererApp.Character.get_character()
+        |> case do
+          {:ok, character} ->
+            acls =
+              map_id
+              |> WandererApp.Map.get_map!()
+              |> Map.get(:acls, [])
+
+            [character_permissions] =
+              WandererApp.Permissions.check_characters_access([character], acls)
+
+            map_permissions =
+              WandererApp.Permissions.get_map_permissions(
+                character_permissions,
+                owner_id,
+                [character_id]
+              )
+
+            case map_permissions do
+              %{view_system: false} ->
+                {:remove_character, character_id}
+
+              %{track_character: false} ->
+                {:remove_character, character_id}
+
+              _ ->
+                :ok
+            end
+
+          _ ->
+            :ok
+        end
+      end,
+      timeout: :timer.seconds(60),
+      max_concurrency: System.schedulers_online(),
+      on_timeout: :kill_task
+    )
+    |> Enum.each(fn
+      {:ok, {:remove_character, character_id}} ->
+        state |> remove_and_untrack_characters([character_id])
+        :ok
+
+      {:ok, _result} ->
+        :ok
+
+      {:error, reason} ->
+        @logger.error("Error in cleanup_characters: #{inspect(reason)}")
+    end)
+
+    WandererApp.Cache.insert(
+      "map_#{map_id}:invalidate_character_ids",
+      []
+    )
+
+    state
+  end
+
  def handle_event(:cleanup_systems, %{map_id: map_id} = state) do
    Process.send_after(self(), :cleanup_systems, @systems_cleanup_timeout)

@@ -812,8 +957,9 @@ defmodule WandererApp.Map.Server.Impl do
    do: %{
      state
      | map_opts: [
-          layout: options |> Map.get("layout"),
-          store_custom_labels: options |> Map.get("store_custom_labels")
+          layout: options |> Map.get("layout", "left_to_right"),
+          store_custom_labels:
+            options |> Map.get("store_custom_labels", "false") |> String.to_existing_atom()
        ]
    }

@@ -824,47 +970,71 @@ defmodule WandererApp.Map.Server.Impl do
  end

  def handle_event(msg, state) do
-    @logger.warning("Unhandled event: #{inspect(msg)}")
+    Logger.warning("Unhandled event: #{inspect(msg)}")

    state
  end

  def broadcast!(map_id, event, payload \\ nil) do
-    if _can_broadcast?(map_id) do
+    if can_broadcast?(map_id) do
      @pubsub_client.broadcast!(WandererApp.PubSub, map_id, %{event: event, payload: payload})
    end

    :ok
  end

-  defp _get_connection_mark_eol_time(map_id, connection_id) do
-    case WandererApp.Cache.get("map_#{map_id}:conn_#{connection_id}:mark_eol_time") do
+  defp remove_and_untrack_characters(%{map_id: map_id} = state, character_ids) do
+    Logger.warning(fn ->
+      "Map #{map_id} - remove and untrack characters #{inspect(character_ids)}"
+    end)
+
+    map_id
+    |> _untrack_characters(character_ids)
+
+    map_id
+    |> WandererApp.MapCharacterSettingsRepo.get_tracked_by_map_filtered(character_ids)
+    |> case do
+      {:ok, settings} ->
+        settings
+        |> Enum.each(fn s ->
+          s |> WandererApp.MapCharacterSettingsRepo.untrack()
+          state |> remove_character(s.character_id)
+        end)
+
+      _ ->
+        :ok
+    end
+  end
+
+  defp get_connection_mark_eol_time(map_id, connection_id, default \\ DateTime.utc_now()) do
+    WandererApp.Cache.get("map_#{map_id}:conn_#{connection_id}:mark_eol_time")
+    |> case do
      nil ->
-        DateTime.utc_now()
+        default

      value ->
        value
    end
  end

-  defp _can_broadcast?(map_id),
+  defp can_broadcast?(map_id),
    do:
      not WandererApp.Cache.lookup!("map_#{map_id}:importing", false) and
        WandererApp.Cache.lookup!("map_#{map_id}:started", false)

-  defp _update_location(
+  defp update_location(
         character_id,
         location,
         old_location,
         %{map: map, map_id: map_id, rtree_name: rtree_name, map_opts: map_opts} = _state
       ) do
    case is_nil(old_location.solar_system_id) and
-           _can_add_location(map.scope, location.solar_system_id) do
+           can_add_location(map.scope, location.solar_system_id) do
      true ->
        :ok = maybe_add_system(map_id, location, nil, rtree_name, map_opts)

      _ ->
-        case _is_connection_valid(
+        case is_connection_valid(
               map.scope,
               old_location.solar_system_id,
               location.solar_system_id
@@ -880,7 +1050,7 @@ defmodule WandererApp.Map.Server.Impl do
    end
  end

-  defp _maybe_update_location(map_id, character_id) do
+  defp maybe_update_location(map_id, character_id) do
    WandererApp.Cache.lookup!(
      "character:#{character_id}:location_started",
      false
@@ -931,7 +1101,7 @@ defmodule WandererApp.Map.Server.Impl do
    end
  end

-  defp _maybe_update_alliance(map_id, character_id) do
+  defp maybe_update_alliance(map_id, character_id) do
    with {:ok, old_alliance_id} <-
           WandererApp.Cache.lookup("map:#{map_id}:character:#{character_id}:alliance_id"),
         {:ok, %{alliance_id: alliance_id}} <-
@@ -955,7 +1125,7 @@ defmodule WandererApp.Map.Server.Impl do
    end
  end

-  defp _maybe_update_corporation(map_id, character_id) do
+  defp maybe_update_corporation(map_id, character_id) do
    with {:ok, old_corporation_id} <-
           WandererApp.Cache.lookup("map:#{map_id}:character:#{character_id}:corporation_id"),
         {:ok, %{corporation_id: corporation_id}} <-
@@ -979,7 +1149,7 @@ defmodule WandererApp.Map.Server.Impl do
    end
  end

-  defp _maybe_update_online(map_id, character_id) do
+  defp maybe_update_online(map_id, character_id) do
    with {:ok, old_online} <-
           WandererApp.Cache.lookup("map:#{map_id}:character:#{character_id}:online"),
         {:ok, %{online: online}} <-
@@ -1003,7 +1173,7 @@ defmodule WandererApp.Map.Server.Impl do
    end
  end

-  defp _maybe_update_ship(map_id, character_id) do
+  defp maybe_update_ship(map_id, character_id) do
    with {:ok, old_ship_type_id} <-
           WandererApp.Cache.lookup("map:#{map_id}:character:#{character_id}:ship_type_id"),
         {:ok, old_ship_name} <-
@@ -1035,7 +1205,7 @@ defmodule WandererApp.Map.Server.Impl do
    end
  end

-  defp _update_connection(
+  defp update_connection(
         %{map_id: map_id} = state,
         update_method,
         attributes,
@@ -1051,7 +1221,7 @@ defmodule WandererApp.Map.Server.Impl do
             solar_system_source_id,
             solar_system_target_id
           ),
-         {:ok, update_map} <- _get_update_map(update, attributes),
+         {:ok, update_map} <- get_update_map(update, attributes),
         :ok <-
           WandererApp.Map.update_connection(
             map_id,
@@ -1077,7 +1247,7 @@ defmodule WandererApp.Map.Server.Impl do
    end
  end

-  defp _update_system(
+  defp update_system(
         %{map_id: map_id} = state,
         update_method,
         attributes,
@@ -1090,7 +1260,7 @@ defmodule WandererApp.Map.Server.Impl do
             map_id,
             update.solar_system_id
           ),
-         {:ok, update_map} <- _get_update_map(update, attributes) do
+         {:ok, update_map} <- get_update_map(update, attributes) do
      {:ok, updated_system} =
        apply(WandererApp.MapSystemRepo, update_method, [
          system,
@@ -1101,7 +1271,7 @@ defmodule WandererApp.Map.Server.Impl do
        callback_fn.(updated_system)
      end

-      _update_map_system_last_activity(map_id, updated_system)
+      update_map_system_last_activity(map_id, updated_system)

      state
    else
@@ -1111,7 +1281,7 @@ defmodule WandererApp.Map.Server.Impl do
    end
  end

-  defp _get_update_map(update, attributes),
+  defp get_update_map(update, attributes),
    do:
      {:ok,
       Enum.reduce(attributes, Map.new(), fn attribute, map ->
@@ -1155,7 +1325,8 @@ defmodule WandererApp.Map.Server.Impl do
              rtree_name
            )

-            {:ok, existing_system}
+            existing_system
+            |> WandererApp.MapSystemRepo.update_visible(%{visible: true})
          else
            @ddrt.insert(
              {solar_system_id,
@@ -1169,7 +1340,8 @@ defmodule WandererApp.Map.Server.Impl do
            existing_system
            |> WandererApp.MapSystemRepo.update_position!(%{position_x: x, position_y: y})
            |> WandererApp.MapSystemRepo.cleanup_labels!(map_opts)
-            |> WandererApp.MapSystemRepo.cleanup_tags()
+            |> WandererApp.MapSystemRepo.cleanup_tags!()
+            |> WandererApp.MapSystemRepo.update_visible(%{visible: true})
          end

        _ ->
@@ -1215,7 +1387,7 @@ defmodule WandererApp.Map.Server.Impl do
    state
  end

-  defp _save_map_state(%{map_id: map_id} = _state) do
+  defp save_map_state(%{map_id: map_id} = _state) do
    systems_last_activity =
      map_id
      |> WandererApp.Map.list_systems!()
@@ -1249,7 +1421,7 @@ defmodule WandererApp.Map.Server.Impl do
    })
  end

-  defp _maybe_stop_rtree(%{rtree_name: rtree_name} = state) do
+  defp maybe_stop_rtree(%{rtree_name: rtree_name} = state) do
    case Process.whereis(rtree_name) do
      nil ->
        :ok
@@ -1261,7 +1433,7 @@ defmodule WandererApp.Map.Server.Impl do
    state
  end

-  defp _init_map_cache(%__MODULE__{map_id: map_id} = state) do
+  defp init_map_cache(%__MODULE__{map_id: map_id} = state) do
    case WandererApp.Api.MapState.by_map_id(map_id) do
      {:ok,
       %{
@@ -1293,9 +1465,9 @@ defmodule WandererApp.Map.Server.Impl do
    end
  end

-  defp _init_map(
+  defp init_map(
         state,
-         %{characters: characters} = initial_map,
+         %{id: map_id, characters: characters} = initial_map,
         subscription_settings,
         systems,
         connections
@@ -1311,16 +1483,24 @@ defmodule WandererApp.Map.Server.Impl do
    {:ok, map_options} = WandererApp.MapRepo.options_to_form_data(initial_map)

    map_opts = [
-      layout: map_options |> Map.get("layout"),
-      store_custom_labels: map_options |> Map.get("store_custom_labels")
+      layout: map_options |> Map.get("layout", "left_to_right"),
+      store_custom_labels:
+        map_options |> Map.get("store_custom_labels", "false") |> String.to_existing_atom()
    ]

+    character_ids =
+      map_id
+      |> WandererApp.Map.get_map!()
+      |> Map.get(:characters, [])
+
+    WandererApp.Cache.insert("map_#{map_id}:invalidate_character_ids", character_ids)
+
    %{state | map: map, map_opts: map_opts}
  end

-  defp _init_map_systems(state, [] = _systems), do: state
+  defp init_map_systems(state, [] = _systems), do: state

-  defp _init_map_systems(%__MODULE__{map_id: map_id, rtree_name: rtree_name} = state, systems) do
+  defp init_map_systems(%__MODULE__{map_id: map_id, rtree_name: rtree_name} = state, systems) do
    systems
    |> Enum.each(fn %{id: system_id, solar_system_id: solar_system_id} = system ->
      @ddrt.insert(
@@ -1338,7 +1518,7 @@ defmodule WandererApp.Map.Server.Impl do
    state
  end

-  def _maybe_import_systems(state, %{"systems" => systems} = _settings, user_id, character_id) do
+  def maybe_import_systems(state, %{"systems" => systems} = _settings, user_id, character_id) do
    state =
      systems
      |> Enum.reduce(state, fn %{
@@ -1382,7 +1562,7 @@ defmodule WandererApp.Map.Server.Impl do
    |> delete_systems(removed_system_ids, user_id, character_id)
  end

-  def _maybe_import_connections(state, %{"connections" => connections} = _settings, _user_id) do
+  def maybe_import_connections(state, %{"connections" => connections} = _settings, _user_id) do
    connections
    |> Enum.reduce(state, fn %{
                               "source" => source,
@@ -1418,7 +1598,7 @@ defmodule WandererApp.Map.Server.Impl do
    end)
  end

-  def _maybe_import_hubs(state, %{"hubs" => hubs} = _settings, _user_id) do
+  def maybe_import_hubs(state, %{"hubs" => hubs} = _settings, _user_id) do
    hubs
    |> Enum.reduce(state, fn hub, acc ->
      solar_system_id = hub |> String.to_integer()
@@ -1428,7 +1608,7 @@ defmodule WandererApp.Map.Server.Impl do
    end)
  end

-  defp _update_map_system_last_activity(
+  defp update_map_system_last_activity(
         map_id,
         updated_system
       ) do
@@ -1441,13 +1621,13 @@ defmodule WandererApp.Map.Server.Impl do
    broadcast!(map_id, :update_system, updated_system)
  end

-  defp _can_add_location(_scope, nil), do: false
+  defp can_add_location(_scope, nil), do: false

-  defp _can_add_location(:all, _solar_system_id), do: true
+  defp can_add_location(:all, _solar_system_id), do: true

-  defp _can_add_location(:none, _solar_system_id), do: false
+  defp can_add_location(:none, _solar_system_id), do: false

-  defp _can_add_location(scope, solar_system_id) do
+  defp can_add_location(scope, solar_system_id) do
    system_static_info =
      case WandererApp.CachedInfo.get_system_static_info(solar_system_id) do
        {:ok, system_static_info} when not is_nil(system_static_info) ->
@@ -1472,14 +1652,14 @@ defmodule WandererApp.Map.Server.Impl do
    end
  end

-  defp _is_connection_exist(map_id, from_solar_system_id, to_solar_system_id),
+  defp is_connection_exist(map_id, from_solar_system_id, to_solar_system_id),
    do:
      not is_nil(
        WandererApp.Map.find_system_by_location(
          map_id,
          %{solar_system_id: from_solar_system_id}
        )
-      ) and
+      ) &&
        not is_nil(
          WandererApp.Map.find_system_by_location(
            map_id,
@@ -1487,13 +1667,13 @@ defmodule WandererApp.Map.Server.Impl do
          )
        )

-  defp _is_connection_valid(_scope, nil, _to_solar_system_id), do: false
+  defp is_connection_valid(_scope, nil, _to_solar_system_id), do: false

-  defp _is_connection_valid(:all, _from_solar_system_id, _to_solar_system_id), do: true
+  defp is_connection_valid(:all, _from_solar_system_id, _to_solar_system_id), do: true

-  defp _is_connection_valid(:none, _from_solar_system_id, _to_solar_system_id), do: false
+  defp is_connection_valid(:none, _from_solar_system_id, _to_solar_system_id), do: false

-  defp _is_connection_valid(scope, from_solar_system_id, to_solar_system_id) do
+  defp is_connection_valid(scope, from_solar_system_id, to_solar_system_id) do
    {:ok, known_jumps} =
      WandererApp.Api.MapSolarSystemJumps.find(%{
        before_system_id: from_solar_system_id,
@@ -1522,7 +1702,7 @@ defmodule WandererApp.Map.Server.Impl do
    end
  end

-  defp _update_presence(map_id) do
+  defp update_presence(map_id) do
    case WandererApp.Cache.lookup!("map_#{map_id}:started", false) and
           WandererApp.Cache.get_and_remove!("map_#{map_id}:presence_updated", false) do
      true ->
@@ -1540,7 +1720,7 @@ defmodule WandererApp.Map.Server.Impl do
            not Enum.member?(presence_character_ids, character_id)
          end)

-        _track_characters(presence_character_ids, map_id)
+        track_characters(presence_character_ids, map_id)

        map_id
        |> _untrack_characters(not_present_character_ids)
@@ -1559,34 +1739,32 @@ defmodule WandererApp.Map.Server.Impl do
    end
  end

-  defp _track_acls([]), do: :ok
+  defp track_acls([]), do: :ok

-  defp _track_acls([acl_id | rest]) do
-    _track_acl(acl_id)
-    _track_acls(rest)
+  defp track_acls([acl_id | rest]) do
+    track_acl(acl_id)
+    track_acls(rest)
  end

-  defp _track_acl(acl_id),
+  defp track_acl(acl_id),
+    do: @pubsub_client.subscribe(WandererApp.PubSub, "acls:#{acl_id}")
+
+  defp track_characters([], _map_id), do: :ok
+
+  defp track_characters([character_id | rest], map_id) do
+    track_character(character_id, map_id)
+    track_characters(rest, map_id)
+  end
+
+  defp track_character(character_id, map_id),
    do:
-      WandererApp.PubSub
-      |> @pubsub_client.subscribe("acls:#{acl_id}")
-
-  defp _track_characters([], _map_id), do: :ok
-
-  defp _track_characters([character_id | rest], map_id) do
-    _track_character(character_id, map_id)
-    _track_characters(rest, map_id)
-  end
-
-  defp _track_character(character_id, map_id) do
-    WandererApp.Character.TrackerManager.update_track_settings(character_id, %{
-      map_id: map_id,
-      track: true,
-      track_online: true,
-      track_location: true,
-      track_ship: true
-    })
-  end
+      WandererApp.Character.TrackerManager.update_track_settings(character_id, %{
+        map_id: map_id,
+        track: true,
+        track_online: true,
+        track_location: true,
+        track_ship: true
+      })

  defp _update_character(map_id, character_id) do
    {:ok, character} = WandererApp.Character.get_character(character_id)
@@ -1748,12 +1926,14 @@ defmodule WandererApp.Map.Server.Impl do
                broadcast!(map_id, :add_system, new_system)
                WandererApp.Map.add_system(map_id, new_system)

-              _ ->
+              error ->
+                @logger.debug("Failed to create system: #{inspect(error, pretty: true)}")
                :ok
            end
        end

-      {:error, _} ->
+      error ->
+        @logger.debug("Skip adding system: #{inspect(error, pretty: true)}")
        :ok
    end
  end
@@ -1767,13 +1947,14 @@ defmodule WandererApp.Map.Server.Impl do
       |> WandererApp.Map.find_system_by_location(old_location)
       |> WandererApp.Map.PositionCalculator.get_new_system_position(rtree_name, opts)}

-  defp _broadcast_acl_updates(
+  defp broadcast_acl_updates(
         {:ok,
          %{
            eve_character_ids: eve_character_ids,
            eve_corporation_ids: eve_corporation_ids,
            eve_alliance_ids: eve_alliance_ids
-          }}
+          }},
+         map_id
       ) do
    eve_character_ids
    |> Enum.uniq()
@@ -1805,12 +1986,19 @@ defmodule WandererApp.Map.Server.Impl do
      )
    end)

+    character_ids =
+      map_id
+      |> WandererApp.Map.get_map!()
+      |> Map.get(:characters, [])
+
+    WandererApp.Cache.insert("map_#{map_id}:invalidate_character_ids", character_ids)
+
    :ok
  end

-  defp _broadcast_acl_updates(_), do: :ok
+  defp broadcast_acl_updates(_, _map_id), do: :ok

-  defp _update_acl(acl_id) do
+  defp update_acl(acl_id) do
    {:ok, %{owner: owner, members: members}} =
      WandererApp.AccessListRepo.get(acl_id, [:owner, :members])

--- a/lib/wanderer_app/permissions.ex
+++ b/lib/wanderer_app/permissions.ex
@@ -87,4 +87,113 @@ defmodule WandererApp.Permissions do
      delete_map: check_permission(user_permissions, @delete_map)
    }
  end
+
+  def check_characters_access(characters, acls) do
+    character_ids = characters |> Enum.map(& &1.id)
+    character_eve_ids = characters |> Enum.map(& &1.eve_id)
+
+    character_corporation_ids =
+      characters |> Enum.map(& &1.corporation_id) |> Enum.map(&to_string/1)
+
+    character_alliance_ids = characters |> Enum.map(& &1.alliance_id) |> Enum.map(&to_string/1)
+
+    result =
+      acls
+      |> Enum.reduce([0, 0], fn acl, acc ->
+        is_owner? = acl.owner_id in character_ids
+
+        is_character_member? =
+          acl.members |> Enum.any?(fn member -> member.eve_character_id in character_eve_ids end)
+
+        is_corporation_member? =
+          acl.members
+          |> Enum.any?(fn member -> member.eve_corporation_id in character_corporation_ids end)
+
+        is_alliance_member? =
+          acl.members
+          |> Enum.any?(fn member -> member.eve_alliance_id in character_alliance_ids end)
+
+        if is_owner? || is_character_member? || is_corporation_member? || is_alliance_member? do
+          case acc do
+            [_, -1] ->
+              [-1, -1]
+
+            [-1, char_acc] ->
+              char_acl_mask =
+                acl.members
+                |> Enum.filter(fn member ->
+                  member.eve_character_id in character_eve_ids
+                end)
+                |> Enum.reduce(0, fn member, acc ->
+                  case acc do
+                    -1 -> -1
+                    _ -> calc_role_mask(member.role, acc)
+                  end
+                end)
+
+              char_acc =
+                case char_acl_mask do
+                  -1 -> -1
+                  _ -> char_acc ||| char_acl_mask
+                end
+
+              [-1, char_acc]
+
+            [any_acc, char_acc] ->
+              any_acl_mask =
+                acl.members
+                |> Enum.filter(fn member ->
+                  member.eve_character_id in character_eve_ids ||
+                    member.eve_corporation_id in character_corporation_ids ||
+                    member.eve_alliance_id in character_alliance_ids
+                end)
+                |> Enum.reduce(0, fn member, acc ->
+                  case acc do
+                    -1 -> -1
+                    _ -> calc_role_mask(member.role, acc)
+                  end
+                end)
+
+              char_acl_mask =
+                acl.members
+                |> Enum.filter(fn member ->
+                  member.eve_character_id in character_eve_ids
+                end)
+                |> Enum.reduce(0, fn member, acc ->
+                  case acc do
+                    -1 -> -1
+                    _ -> calc_role_mask(member.role, acc)
+                  end
+                end)
+
+              any_acc =
+                case any_acl_mask do
+                  -1 -> -1
+                  _ -> any_acc ||| any_acl_mask
+                end
+
+              char_acc =
+                case char_acl_mask do
+                  -1 -> -1
+                  _ -> char_acc ||| char_acl_mask
+                end
+
+              [any_acc, char_acc]
+          end
+        else
+          acc
+        end
+      end)
+
+    case result do
+      [_, -1] ->
+        [-1]
+
+      [-1, char_acc] ->
+        [char_acc]
+
+      [any_acc, _char_acc] ->
+        [any_acc]
+    end
+  end
 end
--- a/lib/wanderer_app/repositories/map_character_settings_repo.ex
+++ b/lib/wanderer_app/repositories/map_character_settings_repo.ex
@@ -3,4 +3,23 @@ defmodule WandererApp.MapCharacterSettingsRepo do

  def create(settings),
    do: WandererApp.Api.MapCharacterSettings.create(settings)
+
+  def get_tracked_by_map_filtered(map_id, character_ids),
+    do:
+      WandererApp.Api.MapCharacterSettings.tracked_by_map_filtered(%{
+        map_id: map_id,
+        character_ids: character_ids
+      })
+
+  def get_all_by_map(map_id),
+    do: WandererApp.Api.MapCharacterSettings.read_by_map(%{map_id: map_id})
+
+  def get_tracked_by_map_all(map_id),
+    do: WandererApp.Api.MapCharacterSettings.tracked_by_map_all(%{map_id: map_id})
+
+  def track(settings), do: settings |> WandererApp.Api.MapCharacterSettings.track()
+  def untrack(settings), do: settings |> WandererApp.Api.MapCharacterSettings.untrack()
+
+  def track!(settings), do: settings |> WandererApp.Api.MapCharacterSettings.track!()
+  def untrack!(settings), do: settings |> WandererApp.Api.MapCharacterSettings.untrack!()
 end
--- a/lib/wanderer_app/repositories/map_system_repo.ex
+++ b/lib/wanderer_app/repositories/map_system_repo.ex
@@ -35,12 +35,12 @@ defmodule WandererApp.MapSystemRepo do

  def cleanup_labels!(%{labels: labels} = system, opts) do
    store_custom_labels? =
-      Keyword.get(opts, :store_custom_labels, "false") |> String.to_existing_atom()
+      Keyword.get(opts, :store_custom_labels)

    labels = get_filtered_labels(labels, store_custom_labels?)

    system
-    |> WandererApp.Api.MapSystem.update_labels!(%{
+    |> update_labels!(%{
      labels: labels
    })
  end
@@ -52,6 +52,13 @@ defmodule WandererApp.MapSystemRepo do
    })
  end

+  def cleanup_tags!(system) do
+    system
+    |> WandererApp.Api.MapSystem.update_tag!(%{
+      tag: nil
+    })
+  end
+
  def get_filtered_labels(labels, true) when is_binary(labels) do
    labels
    |> Jason.decode!()
@@ -97,6 +104,11 @@ defmodule WandererApp.MapSystemRepo do
      system
      |> WandererApp.Api.MapSystem.update_labels(update)

+  def update_labels!(system, update),
+    do:
+      system
+      |> WandererApp.Api.MapSystem.update_labels!(update)
+
  def update_position(system, update),
    do:
      system
@@ -106,4 +118,14 @@ defmodule WandererApp.MapSystemRepo do
    do:
      system
      |> WandererApp.Api.MapSystem.update_position!(update)
+
+  def update_visible(system, update),
+    do:
+      system
+      |> WandererApp.Api.MapSystem.update_visible(update)
+
+  def update_visible!(system, update),
+    do:
+      system
+      |> WandererApp.Api.MapSystem.update_visible!(update)
 end
--- a/lib/wanderer_app_web/live/access_lists/access_lists_live.ex
+++ b/lib/wanderer_app_web/live/access_lists/access_lists_live.ex
@@ -1,4 +1,5 @@
 defmodule WandererAppWeb.AccessListsLive do
+  alias Pathex.Builder.Viewer
  use WandererAppWeb, :live_view

  require Logger
@@ -89,7 +90,10 @@ defmodule WandererAppWeb.AccessListsLive do
      |> assign(:page_title, "Access Lists - Members")
      |> assign(:selected_acl_id, acl_id)
      |> assign(:access_list, access_list)
-      |> assign(:members, members)
+      |> assign(
+        :members,
+        members
+      )
    else
      _ ->
        socket
@@ -145,7 +149,7 @@ defmodule WandererAppWeb.AccessListsLive do
          :send_after,
          [self(), {:search, text}, 100],
          "member_search_#{socket.assigns.selected_acl_id}",
-          500
+          250
        )

        [%{label: "Loading...", value: :loading, disabled: true}]
@@ -288,7 +292,11 @@ defmodule WandererAppWeb.AccessListsLive do
  end

  @impl true
-  def handle_event("dropped", %{"draggedId" => dragged_id, "dropzoneId" => dropzone_id}, socket) do
+  def handle_event(
+        "dropped",
+        %{"draggedId" => dragged_id, "dropzoneId" => dropzone_id},
+        %{assigns: %{access_list: access_list, members: members}} = socket
+      ) do
    role_atom =
      [:admin, :manager, :member, :viewer, :blocked]
      |> Enum.find(fn role_atom -> to_string(role_atom) == dropzone_id end)
@@ -299,13 +307,27 @@ defmodule WandererAppWeb.AccessListsLive do

      role_atom ->
        member =
-          socket.assigns.members
+          members
          |> Enum.find(&(&1.id == dragged_id))

-        {:noreply, socket |> maybe_update_role(member, role_atom, socket.assigns.access_list)}
+        {:noreply, socket |> maybe_update_role(member, role_atom, access_list)}
    end
  end

+  @impl true
+  def handle_info(
+        {"update_role", %{member_id: member_id, role: role}},
+        %{assigns: %{access_list: access_list, members: members}} = socket
+      ) do
+    role_atom = role |> String.to_existing_atom()
+
+    member =
+      members
+      |> Enum.find(&(&1.id == member_id))
+
+    {:noreply, socket |> maybe_update_role(member, role_atom, access_list)}
+  end
+
  @impl true
  def handle_event("noop", _, socket) do
    {:noreply, socket}
@@ -325,10 +347,33 @@ defmodule WandererAppWeb.AccessListsLive do
      |> Enum.map(& &1.id)
      |> Enum.at(0)

-    {:ok, options} = search(active_character_id, text)
+    uniq_search_req_id = UUID.uuid4(:default)

-    send_update(LiveSelect.Component, options: options, id: socket.assigns.member_search_id)
-    {:noreply, socket |> assign(member_search_options: options)}
+    Task.async(fn ->
+      {:ok, options} = search(active_character_id, text)
+
+      {:search_results, uniq_search_req_id, options}
+    end)
+
+    {:noreply, socket |> assign(uniq_search_req_id: uniq_search_req_id)}
+  end
+
+  def handle_info(
+        {ref, result},
+        %{assigns: %{member_search_id: member_search_id, uniq_search_req_id: uniq_search_req_id}} =
+          socket
+      )
+      when is_reference(ref) do
+    Process.demonitor(ref, [:flush])
+
+    case result do
+      {:search_results, ^uniq_search_req_id, options} ->
+        send_update(LiveSelect.Component, options: options, id: member_search_id)
+        {:noreply, socket |> assign(member_search_options: options)}
+
+      _ ->
+        {:noreply, socket}
+    end
  end

  @impl true
@@ -403,6 +448,7 @@ defmodule WandererAppWeb.AccessListsLive do
      _ ->
        socket
        |> put_flash(:error, "You're not allowed to assign this role")
+        |> push_navigate(to: ~p"/access-lists/#{socket.assigns.selected_acl_id}")
    end
  end

@@ -411,10 +457,11 @@ defmodule WandererAppWeb.AccessListsLive do
         _member,
         _role_atom,
         _access_list
-       ) do
-    socket
-    |> put_flash(:info, "Only Characters can have Admin or Manager roles")
-  end
+       ),
+       do:
+         socket
+         |> put_flash(:info, "Only Characters can have Admin or Manager roles")
+         |> push_navigate(to: ~p"/access-lists/#{socket.assigns.selected_acl_id}")

  defp characters_has_role?(character_eve_ids, access_list, role_atom) do
    access_list.members
@@ -614,27 +661,6 @@ defmodule WandererAppWeb.AccessListsLive do
    """
  end

-  def member_item(assigns) do
-    ~H"""
-    <div class="flex items-center gap-2">
-      <.icon :if={not is_nil(@member.role)} name={member_role_icon(@member.role)} class="w-6 h-6" />
-      <div class="avatar">
-        <div class="rounded-md w-8 h-8">
-          <img src={member_icon_url(@member)} alt={@member.name} />
-        </div>
-      </div>
-      <%= @member.name %>
-    </div>
-    """
-  end
-
-  def member_role_icon(:admin), do: "hero-user-group-solid"
-  def member_role_icon(:manager), do: "hero-academic-cap-solid"
-  def member_role_icon(:member), do: "hero-user-solid"
-  def member_role_icon(:viewer), do: "hero-eye-solid"
-  def member_role_icon(:blocked), do: "hero-no-symbol-solid text-red-500"
-  def member_role_icon(_), do: "hero-cake-solid"
-
  def search_member_icon_url(%{character: true} = option),
    do: member_icon_url(%{eve_character_id: option.value})

--- a/lib/wanderer_app_web/live/access_lists/access_lists_live.html.heex
+++ b/lib/wanderer_app_web/live/access_lists/access_lists_live.html.heex
@@ -82,14 +82,20 @@
          id="acl_members"
        >
          <div
-            :for={member <- @members |> Enum.sort(&(&1.name < &2.name))}
+            :for={member <- @members |> Enum.sort_by(&{&1.role, &1.name}, &<=/2)}
            draggable="true"
            id={member.id}
            class="draggable !p-1 h-10 cursor-move bg-black bg-opacity-25 hover:text-white"
            data-dropzone="pool"
          >
            <div class="flex justify-between relative">
-              <.member_item member={member} />
+              <.live_component
+                module={WandererAppWeb.AclMember}
+                id={"select_role_" <> member.id}
+                notify_to={self()}
+                member={member}
+                event_name="update_role"
+              />
              <button
                :if={can_delete_member?(member, @access_list, @current_user)}
                class="z-10 absolute top-0 right-2"
@@ -150,6 +156,71 @@
  show
  on_cancel={JS.patch(~p"/access-lists/#{@selected_acl_id}")}
 >
+  <%!-- <div class="mt-4 mb-2 p-tabmenu p-component " data-pc-section="tabmenu">
+    <ul
+      class="p-tabmenu-nav border-none h-[25px] w-full flex"
+      role="menubar"
+      data-pc-section="menu"
+    >
+      <li
+        id="pr_id_17_0"
+        class="p-tabmenuitem p-highlight"
+        role="presentation"
+        data-p-highlight="true"
+        data-p-disabled="false"
+        data-pc-section="menuitem"
+      >
+        <a
+          href="#"
+          role="menuitem"
+          aria-label="Router Link"
+          tabindex="0"
+          class="p-menuitem-link"
+          data-pc-section="action"
+        >
+          <span class="p-menuitem-text" data-pc-section="label">Character</span>
+        </a>
+      </li>
+      <li
+        id="pr_id_17_1"
+        class="p-tabmenuitem"
+        role="presentation"
+        data-p-highlight="false"
+        data-p-disabled="false"
+        data-pc-section="menuitem"
+      >
+        <a
+          href="#"
+          role="menuitem"
+          aria-label="Programmatic"
+          tabindex="-1"
+          class="p-menuitem-link"
+          data-pc-section="action"
+        >
+          <span class="p-menuitem-text" data-pc-section="label">Corporation</span>
+        </a>
+      </li>
+      <li
+        id="pr_id_17_2"
+        class="p-tabmenuitem"
+        role="presentation"
+        data-p-highlight="false"
+        data-p-disabled="false"
+        data-pc-section="menuitem"
+      >
+        <a
+          href="#"
+          role="menuitem"
+          aria-label="External"
+          tabindex="-1"
+          class="p-menuitem-link"
+          data-pc-section="action"
+        >
+          <span class="p-menuitem-text" data-pc-section="label">Alliance</span>
+        </a>
+      </li>
+    </ul>
+  </div> --%>
  <.form :let={f} for={@member_form} phx-submit={@live_action}>
    <.live_select
      field={f[:member_id]}
--- a/lib/wanderer_app_web/live/access_lists/components/acl_member.ex
+++ b/lib/wanderer_app_web/live/access_lists/components/acl_member.ex
@@ -0,0 +1,86 @@
+defmodule WandererAppWeb.AclMember do
+  use WandererAppWeb, :live_component
+
+  use LiveViewEvents
+
+  @roles [
+    :admin,
+    :manager,
+    :member,
+    :viewer,
+    :blocked
+  ]
+
+  @impl true
+  def mount(socket) do
+    {:ok, socket |> assign(roles: get_roles())}
+  end
+
+  @impl true
+  def update(
+        %{
+          member: member
+        } = assigns,
+        socket
+      ) do
+    socket = handle_info_or_assign(socket, assigns)
+
+    {:ok,
+     socket
+     |> assign(member: member, form: to_form(%{"role" => member.role}))}
+  end
+
+  @impl true
+  def render(assigns) do
+    ~H"""
+    <div id={@id} class="flex items-center gap-2">
+      <.icon :if={not is_nil(@member.role)} name={member_role_icon(@member.role)} class="w-6 h-6" />
+      <.form :let={f} id={"role_form_" <> @id} for={@form} phx-change="select" phx-target={@myself}>
+        <.input
+          type="select"
+          field={f[:role]}
+          class="select h-8 min-h-[0px] !pt-1 !pb-1 text-sm bg-neutral-900 w-[70px]"
+          placeholder="Select a role..."
+          options={Enum.map(@roles, fn role -> {role.label, role.value} end)}
+        />
+      </.form>
+      <div class="avatar">
+        <div class="rounded-md w-8 h-8">
+          <img src={member_icon_url(@member)} alt={@member.name} />
+        </div>
+      </div>
+      <%= @member.name %>
+    </div>
+    """
+  end
+
+  @impl true
+  def handle_event(
+        "select",
+        %{"role" => role} = _params,
+        %{assigns: %{event_name: event_name, member: member, notify_to: notify_to}} = socket
+      ) do
+    notify_to(notify_to, event_name, %{
+      member_id: member.id,
+      role: role
+    })
+
+    {:noreply, socket}
+  end
+
+  def member_role_icon(:admin), do: "hero-user-group-solid"
+  def member_role_icon(:manager), do: "hero-academic-cap-solid"
+  def member_role_icon(:member), do: "hero-user-solid"
+  def member_role_icon(:viewer), do: "hero-eye-solid"
+  def member_role_icon(:blocked), do: "hero-no-symbol-solid text-red-500"
+  def member_role_icon(_), do: "hero-cake-solid"
+
+  def member_role_title(:admin), do: "Admin"
+  def member_role_title(:manager), do: "Manager"
+  def member_role_title(:member), do: "Member"
+  def member_role_title(:viewer), do: "Viewer"
+  def member_role_title(:blocked), do: "-blocked-"
+  def member_role_title(_), do: "-"
+
+  defp get_roles(), do: @roles |> Enum.map(&%{label: member_role_title(&1), value: &1})
+end
--- a/lib/wanderer_app_web/live/characters/characters_tracking_live.ex
+++ b/lib/wanderer_app_web/live/characters/characters_tracking_live.ex
@@ -41,7 +41,7 @@ defmodule WandererAppWeb.CharactersTrackingLive do
    selected_map = socket.assigns.maps |> Enum.find(&(&1.slug == map_slug))

    {:ok, character_settings} =
-      case WandererApp.Api.MapCharacterSettings.read_by_map(%{map_id: selected_map.id}) do
+      case WandererApp.MapCharacterSettingsRepo.get_all_by_map(selected_map.id) do
        {:ok, settings} ->
          {:ok, settings}

@@ -83,7 +83,7 @@ defmodule WandererAppWeb.CharactersTrackingLive do

    case character_settings |> Enum.find(&(&1.character_id == character_id)) do
      nil ->
-        WandererApp.Api.MapCharacterSettings.create(%{
+        WandererApp.MapCharacterSettingsRepo.create(%{
          character_id: character_id,
          map_id: selected_map.id,
          tracked: true
@@ -95,18 +95,18 @@ defmodule WandererAppWeb.CharactersTrackingLive do
        case character_setting.tracked do
          true ->
            character_setting
-            |> WandererApp.Api.MapCharacterSettings.untrack!()
+            |> WandererApp.MapCharacterSettingsRepo.untrack!()

          _ ->
            character_setting
-            |> WandererApp.Api.MapCharacterSettings.track!()
+            |> WandererApp.MapCharacterSettingsRepo.track!()
        end
    end

    %{result: characters} = socket.assigns.characters

    {:ok, character_settings} =
-      case WandererApp.Api.MapCharacterSettings.read_by_map(%{map_id: selected_map.id}) do
+      case WandererApp.MapCharacterSettingsRepo.get_all_by_map(selected_map.id) do
        {:ok, settings} -> {:ok, settings}
        _ -> {:ok, []}
      end
--- a/lib/wanderer_app_web/live/maps/event_handlers/map_characters_event_handler.ex
+++ b/lib/wanderer_app_web/live/maps/event_handlers/map_characters_event_handler.ex
@@ -75,7 +75,7 @@ defmodule WandererAppWeb.MapCharactersEventHandler do
        } = socket
      ) do
    {:ok, character_settings} =
-      case WandererApp.Api.MapCharacterSettings.read_by_map(%{map_id: map_id}) do
+      case WandererApp.MapCharacterSettingsRepo.get_all_by_map(map_id) do
        {:ok, settings} -> {:ok, settings}
        _ -> {:ok, []}
      end
@@ -132,7 +132,7 @@ defmodule WandererAppWeb.MapCharactersEventHandler do
      case character_settings |> Enum.find(&(&1.character_id == character_id)) do
        nil ->
          {:ok, map_character_settings} =
-            WandererApp.Api.MapCharacterSettings.create(%{
+            WandererApp.MapCharacterSettingsRepo.create(%{
              character_id: character_id,
              map_id: map_id,
              tracked: true
@@ -150,7 +150,7 @@ defmodule WandererAppWeb.MapCharactersEventHandler do
            true ->
              {:ok, map_character_settings} =
                character_setting
-                |> WandererApp.Api.MapCharacterSettings.untrack()
+                |> WandererApp.MapCharacterSettingsRepo.untrack()

              character = map_character_settings |> Ash.load!(:character) |> Map.get(:character)

@@ -166,7 +166,7 @@ defmodule WandererAppWeb.MapCharactersEventHandler do
            _ ->
              {:ok, map_character_settings} =
                character_setting
-                |> WandererApp.Api.MapCharacterSettings.track()
+                |> WandererApp.MapCharacterSettingsRepo.track()

              character = map_character_settings |> Ash.load!(:character) |> Map.get(:character)

@@ -184,7 +184,7 @@ defmodule WandererAppWeb.MapCharactersEventHandler do
    user_character_eve_ids = map_characters |> Enum.map(& &1.eve_id)

    {:ok, character_settings} =
-      case WandererApp.Api.MapCharacterSettings.read_by_map(%{map_id: map_id}) do
+      case WandererApp.MapCharacterSettingsRepo.get_all_by_map(map_id) do
        {:ok, settings} -> {:ok, settings}
        _ -> {:ok, []}
      end
@@ -225,10 +225,10 @@ defmodule WandererAppWeb.MapCharactersEventHandler do
  def has_tracked_characters?(_user_characters), do: true

  def get_tracked_map_characters(map_id, current_user) do
-    case WandererApp.Api.MapCharacterSettings.tracked_by_map(%{
-           map_id: map_id,
-           character_ids: current_user.characters |> Enum.map(& &1.id)
-         }) do
+    case WandererApp.MapCharacterSettingsRepo.get_tracked_by_map_filtered(
+           map_id,
+           current_user.characters |> Enum.map(& &1.id)
+         ) do
      {:ok, settings} ->
        {:ok,
         settings
--- a/lib/wanderer_app_web/live/maps/event_handlers/map_connections_event_handler.ex
+++ b/lib/wanderer_app_web/live/maps/event_handlers/map_connections_event_handler.ex
@@ -162,6 +162,16 @@ defmodule WandererAppWeb.MapConnectionsEventHandler do
    {:noreply, socket}
  end

+  def handle_ui_event(
+        "get_connection_info",
+        %{"from" => from, "to" => to} = _event,
+        %{assigns: %{map_id: map_id}} = socket
+      ) do
+    {:ok, info} = map_id |> get_connection_info(from, to)
+
+    {:reply, info, socket}
+  end
+
  def handle_ui_event(
        "get_passages",
        %{"from" => from, "to" => to} = _event,
@@ -194,4 +204,19 @@ defmodule WandererAppWeb.MapConnectionsEventHandler do

    {:ok, %{passages: passages}}
  end
+
+  defp get_connection_info(map_id, from, to) do
+    map_id
+    |> WandererApp.Map.Server.get_connection_info(%{
+      solar_system_source_id: "#{from}" |> String.to_integer(),
+      solar_system_target_id: "#{to}" |> String.to_integer()
+    })
+    |> case do
+      {:ok, info} ->
+        {:ok, info}
+
+      _ ->
+        {:ok, %{}}
+    end
+  end
 end
--- a/lib/wanderer_app_web/live/maps/event_handlers/map_core_event_handler.ex
+++ b/lib/wanderer_app_web/live/maps/event_handlers/map_core_event_handler.ex
@@ -41,10 +41,10 @@ defmodule WandererAppWeb.MapCoreEventHandler do

      %{track_character: track_character} ->
        {:ok, map_characters} =
-          case WandererApp.Api.MapCharacterSettings.tracked_by_map(%{
-                 map_id: map_id,
-                 character_ids: current_user.characters |> Enum.map(& &1.id)
-               }) do
+          case WandererApp.MapCharacterSettingsRepo.get_tracked_by_map_filtered(
+                 map_id,
+                 current_user.characters |> Enum.map(& &1.id)
+               ) do
            {:ok, settings} ->
              {:ok,
               settings
@@ -258,7 +258,7 @@ defmodule WandererAppWeb.MapCoreEventHandler do
      )

    {:ok, character_settings} =
-      case WandererApp.Api.MapCharacterSettings.read_by_map(%{map_id: map_id}) do
+      case WandererApp.MapCharacterSettingsRepo.get_all_by_map(map_id) do
        {:ok, settings} -> {:ok, settings}
        _ -> {:ok, []}
      end
@@ -511,10 +511,10 @@ defmodule WandererAppWeb.MapCoreEventHandler do
  end

  defp get_tracked_map_characters(map_id, current_user) do
-    case WandererApp.Api.MapCharacterSettings.tracked_by_map(%{
-           map_id: map_id,
-           character_ids: current_user.characters |> Enum.map(& &1.id)
-         }) do
+    case WandererApp.MapCharacterSettingsRepo.get_tracked_by_map_filtered(
+           map_id,
+           current_user.characters |> Enum.map(& &1.id)
+         ) do
      {:ok, settings} ->
        {:ok,
         settings
--- a/lib/wanderer_app_web/live/maps/event_handlers/map_signatures_event_handler.ex
+++ b/lib/wanderer_app_web/live/maps/event_handlers/map_signatures_event_handler.ex
@@ -225,6 +225,7 @@ defmodule WandererAppWeb.MapSignaturesEventHandler do
            |> Enum.filter(fn s -> s.eve_id == signature_eve_id end)
            |> Enum.each(fn s ->
              s
+              |> WandererApp.Api.MapSystemSignature.update_group!(%{group: "Wormhole"})
              |> WandererApp.Api.MapSystemSignature.update_linked_system(%{
                linked_system_id: solar_system_target
              })
--- a/lib/wanderer_app_web/live/maps/map_event_handler.ex
+++ b/lib/wanderer_app_web/live/maps/map_event_handler.ex
@@ -61,6 +61,7 @@ defmodule WandererAppWeb.MapEventHandler do
  @map_connection_ui_events [
    "manual_add_connection",
    "manual_delete_connection",
+    "get_connection_info",
    "get_passages",
    "update_connection_time_status",
    "update_connection_mass_status",
@@ -153,7 +154,7 @@ defmodule WandererAppWeb.MapEventHandler do

  def handle_ui_event(event, body, socket)
      when event in @map_characters_ui_events,
-      do: MapSystemsEventHandler.handle_ui_event(event, body, socket)
+      do: MapCharactersEventHandler.handle_ui_event(event, body, socket)

  def handle_ui_event(event, body, socket)
      when event in @map_system_ui_events,
--- a/lib/wanderer_app_web/live/maps/maps_live.ex
+++ b/lib/wanderer_app_web/live/maps/maps_live.ex
@@ -848,9 +848,9 @@ defmodule WandererAppWeb.MapsLive do
          |> Enum.map(fn acl -> acl |> Ash.load!(:members) end)

        {:ok, characters_count} =
-          case WandererApp.Api.MapCharacterSettings.tracked_by_map_all(%{
-                 map_id: map.id
-               }) do
+          map.id
+          |> WandererApp.MapCharacterSettingsRepo.get_tracked_by_map_all()
+          |> case do
            {:ok, settings} ->
              {:ok,
               settings
--- a/mix.exs
+++ b/mix.exs
@@ -2,7 +2,7 @@ defmodule WandererApp.MixProject do
  use Mix.Project

  @source_url "https://github.com/wanderer-industries/wanderer"
-  @version "1.13.7"
+  @version "1.16.0"

  def project do
    [
--- a/priv/repo/migrations/20240922090429_install_ash-functions_extension_4.exs
+++ b/priv/repo/migrations/20240922090429_install_ash-functions_extension_4.exs
@@ -1,54 +0,0 @@
-defmodule WandererApp.Repo.Migrations.InstallAshFunctionsExtension420240922090427 do
-  @moduledoc """
-  Installs any extensions that are mentioned in the repo's `installed_extensions/0` callback
-
-  This file was autogenerated with `mix ash_postgres.generate_migrations`
-  """
-
-  use Ecto.Migration
-
-  def up do
-    execute("""
-    CREATE OR REPLACE FUNCTION uuid_generate_v7()
-    RETURNS UUID
-    AS $$
-    DECLARE
-      timestamp    TIMESTAMPTZ;
-      microseconds INT;
-    BEGIN
-      timestamp    = clock_timestamp();
-      microseconds = (cast(extract(microseconds FROM timestamp)::INT - (floor(extract(milliseconds FROM timestamp))::INT * 1000) AS DOUBLE PRECISION) * 4.096)::INT;
-
-      RETURN encode(
-        set_byte(
-          set_byte(
-            overlay(uuid_send(gen_random_uuid()) placing substring(int8send(floor(extract(epoch FROM timestamp) * 1000)::BIGINT) FROM 3) FROM 1 FOR 6
-          ),
-          6, (b'0111' || (microseconds >> 8)::bit(4))::bit(8)::int
-        ),
-        7, microseconds::bit(8)::int
-      ),
-      'hex')::UUID;
-    END
-    $$
-    LANGUAGE PLPGSQL
-    VOLATILE;
-    """)
-
-    execute("""
-    CREATE OR REPLACE FUNCTION timestamp_from_uuid_v7(_uuid uuid)
-    RETURNS TIMESTAMP WITHOUT TIME ZONE
-    AS $$
-      SELECT to_timestamp(('x0000' || substr(_uuid::TEXT, 1, 8) || substr(_uuid::TEXT, 10, 4))::BIT(64)::BIGINT::NUMERIC / 1000);
-    $$
-    LANGUAGE SQL
-    IMMUTABLE PARALLEL SAFE STRICT;
-    """)
-  end
-
-  def down do
-    # Uncomment this if you actually want to uninstall the extensions
-    # when this migration is rolled back:
-    execute("DROP FUNCTION IF EXISTS uuid_generate_v7(), timestamp_from_uuid_v7(uuid)")
-  end
-end
Author	SHA1	Message	Date
CI	5b2de88c3d	chore: release version v1.16.0 Some checks are pending Build / 🚀 Deploy to test env (fly.io) (push) Waiting to run Details Build / 🛠 Build (1.17, 18.x, 27) (push) Waiting to run Details Build / 🛠 Build Docker Images (linux/amd64) (push) Blocked by required conditions Details Build / 🏷 Create Release (push) Blocked by required conditions Details	2024-11-15 07:59:04 +00:00
Dmitry Popov	82080b232f	feat(Signatures): Add additional filters support to signature list, show description icon	2024-11-15 08:58:25 +01:00
CI	666bc7af43	chore: release version v1.15.5 Some checks are pending Build / 🚀 Deploy to test env (fly.io) (push) Waiting to run Details Build / 🛠 Build (1.17, 18.x, 27) (push) Waiting to run Details Build / 🛠 Build Docker Images (linux/amd64) (push) Blocked by required conditions Details Build / 🏷 Create Release (push) Blocked by required conditions Details	2024-11-14 12:57:21 +00:00
Dmitry Popov	dc077d5a5b	chore: release version v1.15.4	2024-11-14 13:56:52 +01:00
CI	29c840c64a	chore: release version v1.15.4 Some checks are pending Build / 🚀 Deploy to test env (fly.io) (push) Waiting to run Details Build / 🛠 Build (1.17, 18.x, 27) (push) Waiting to run Details Build / 🛠 Build Docker Images (linux/amd64) (push) Blocked by required conditions Details Build / 🏷 Create Release (push) Blocked by required conditions Details	2024-11-14 08:28:05 +00:00
Dmitry Popov	65e0f89f33	fix(Core): Untracked characters still tracked on map (#63 ) fixes #60	2024-11-14 12:27:37 +04:00
CI	d3b9b36332	chore: release version v1.15.3 Some checks are pending Build / 🚀 Deploy to test env (fly.io) (push) Waiting to run Details Build / 🛠 Build (1.17, 18.x, 27) (push) Waiting to run Details Build / 🛠 Build Docker Images (linux/amd64) (push) Blocked by required conditions Details Build / 🏷 Create Release (push) Blocked by required conditions Details	2024-11-13 07:47:06 +00:00
Dmitry Popov	90bbf29ea1	Db unix socket (#62 ) * feat(Core): Add support for Unix sockets for DB connection * chore: release version v1.15.2 * chore: release version v1.15.2	2024-11-13 11:46:39 +04:00
CI	57f73684e8	chore: release version v1.15.2 Some checks failed Build / 🚀 Deploy to test env (fly.io) (push) Has been cancelled Details Build / 🛠 Build (1.17, 18.x, 27) (push) Has been cancelled Details Build / 🛠 Build Docker Images (linux/amd64) (push) Has been cancelled Details Build / 🏷 Create Release (push) Has been cancelled Details	2024-11-07 21:45:12 +00:00
Dmitry Popov	7833cdebb2	Merge branch 'main' of github.com:wanderer-industries/wanderer	2024-11-07 22:44:22 +01:00
Dmitry Popov	67a5ae2985	chore: release version v1.15.0	2024-11-07 22:44:19 +01:00
CI	f58c52d26b	chore: release version v1.15.1	2024-11-07 21:42:31 +00:00
Dmitry Popov	41e7739461	Merge branch 'main' of github.com:wanderer-industries/wanderer	2024-11-07 22:41:52 +01:00
Dmitry Popov	332152b677	fix(Dev): Update .devcontainer instructions	2024-11-07 22:41:43 +01:00
CI	85b49fe1f0	chore: release version v1.15.0	2024-11-07 21:40:09 +00:00
Dmitry Popov	e7924532be	feat(Connections): Add connection mark EOL time (#56 )	2024-11-08 01:39:44 +04:00
CI	475d950ad6	chore: release version v1.14.1 Some checks failed Build / 🚀 Deploy to test env (fly.io) (push) Has been cancelled Details Build / 🛠 Build (1.17, 18.x, 27) (push) Has been cancelled Details Build / 🛠 Build Docker Images (linux/amd64) (push) Has been cancelled Details Build / 🏷 Create Release (push) Has been cancelled Details	2024-11-06 14:13:14 +00:00
Dmitry Popov	e6cfb29c6f	fix(Core): Fix character tracking permissions	2024-11-06 15:12:44 +01:00
CI	dee6e86db1	chore: release version v1.14.0 Some checks failed Build / 🚀 Deploy to test env (fly.io) (push) Has been cancelled Details Build / 🛠 Build (1.17, 18.x, 27) (push) Has been cancelled Details Build / 🛠 Build Docker Images (linux/amd64) (push) Has been cancelled Details Build / 🏷 Create Release (push) Has been cancelled Details	2024-11-05 07:23:19 +00:00
Dmitry Popov	72f088331f	Merge branch 'main' of github.com:wanderer-industries/wanderer	2024-11-05 08:22:50 +01:00
Dmitry Popov	bbf536d10e	feat(ACL): Add an ability to assign member role without DnD	2024-11-05 08:22:46 +01:00
CI	149ac98297	chore: release version v1.13.12 Some checks are pending Build / 🚀 Deploy to test env (fly.io) (push) Waiting to run Details Build / 🛠 Build (1.17, 18.x, 27) (push) Waiting to run Details Build / 🛠 Build Docker Images (linux/amd64) (push) Blocked by required conditions Details Build / 🏷 Create Release (push) Blocked by required conditions Details	2024-11-04 07:24:03 +00:00
Dmitry Popov	b90a2910c9	fix(Map): Fix system revert issues	2024-11-04 08:23:26 +01:00
CI	c4da8a3a8d	chore: release version v1.13.11	2024-11-02 21:31:48 +00:00
Dmitry Popov	3ca75583d2	fix(Map): Fix system revert issues	2024-11-02 22:31:20 +01:00
CI	5f4607ae6f	chore: release version v1.13.10	2024-11-01 14:54:49 +00:00
Dmitry Popov	d880c6873f	Merge remote-tracking branch 'origin/main' # Conflicts: # lib/wanderer_app/map/map_server_impl.ex	2024-11-01 15:53:05 +01:00
Dmitry Popov	937649b2ed	fix(Map): Fix system revert issues	2024-11-01 15:51:15 +01:00
CI	78e912c886	chore: release version v1.13.9	2024-11-01 10:55:05 +00:00
Dmitry Popov	696c7d2cd1	Map events refactoring (#41 ) * refactor(Map): Map event handling refactoring	2024-11-01 14:54:34 +04:00
CI	49c0cb026b	chore: release version v1.13.8	2024-10-28 16:21:55 +00:00