chore: release version v1.94.0

K162 selector

CHANGELOG.md

@@ -2,6 +2,64 @@
 
 <!-- changelog -->
 
+## [v1.94.0](https://github.com/wanderer-industries/wanderer/compare/v1.93.0...v1.94.0) (2026-02-08)
+
+
+
+
+### Features:
+
+* administration: Added registered characters admin view with cort/ally info, sort and filter options
+
+## [v1.93.0](https://github.com/wanderer-industries/wanderer/compare/v1.92.0...v1.93.0) (2026-02-08)
+
+
+
+
+### Features:
+
+* subscriptions: Added an ability to withdraw from map to user balance
+
+## [v1.92.0](https://github.com/wanderer-industries/wanderer/compare/v1.91.11...v1.92.0) (2026-01-14)
+
+
+
+
+### Features:
+
+* Added ability to select a range of wh classes for k162.
+
+### Bug Fixes:
+
+* core: Show c1/c2/c3 or c4/c5 or link signature modal
+
+## [v1.91.11](https://github.com/wanderer-industries/wanderer/compare/v1.91.10...v1.91.11) (2026-01-13)
+
+
+
+
+### Bug Fixes:
+
+* allow sig api when map relay is off
+
+## [v1.91.10](https://github.com/wanderer-industries/wanderer/compare/v1.91.9...v1.91.10) (2026-01-07)
+
+
+
+
+### Bug Fixes:
+
+* remove actor context requirement from sig api
+
+## [v1.91.9](https://github.com/wanderer-industries/wanderer/compare/v1.91.8...v1.91.9) (2026-01-06)
+
+
+
+
+### Bug Fixes:
+
+* core: fixed rally point cancel logic
+
 ## [v1.91.8](https://github.com/wanderer-industries/wanderer/compare/v1.91.7...v1.91.8) (2026-01-06)
 
 

assets/js/hooks/Mapper/components/mapInterface/components/PingsInterface/PingsInterface.tsx

@@ -121,6 +121,7 @@ export const PingsInterface = ({ hasLeftOffset }: PingsInterfaceProps) => {
 
   useEffect(() => {
     if (!ping) {
+      setIsShow(false);
       return;
     }
 
@@ -161,27 +162,26 @@ export const PingsInterface = ({ hasLeftOffset }: PingsInterfaceProps) => {
     };
   }, [interfaceSettings]);
 
-  if (!ping) {
-    return null;
-  }
-
-  const isShowSelectedSystem = selectedSystem != null && selectedSystem !== ping.solar_system_id;
+  const isShowSelectedSystem = ping && selectedSystem != null && selectedSystem !== ping.solar_system_id;
 
+  // Only render Toast when there's a ping
   return (
     <>
-      <Toast
-        position={placement as never}
-        className={clsx('!max-w-[initial] w-[500px]', hasLeftOffset ? offsets.withLeftMenu : offsets.default)}
-        ref={toast}
-        content={({ message }) => (
-          <section
-            className={clsx(
-              'flex flex-col p-3 w-full border border-stone-800 shadow-md animate-fadeInDown rounded-[5px]',
-              'bg-gradient-to-tr from-transparent to-sky-700/60 bg-stone-900/70',
-            )}
-          >
-            <div className="flex gap-3">
-              <i className={clsx('pi text-yellow-500 text-2xl', 'relative top-[2px]', ICONS[ping.type])}></i>
+      {ping && (
+        <Toast
+          key={ping.id}
+          position={placement as never}
+          className={clsx('!max-w-[initial] w-[500px]', hasLeftOffset ? offsets.withLeftMenu : offsets.default)}
+          ref={toast}
+          content={({ message }) => (
+            <section
+              className={clsx(
+                'flex flex-col p-3 w-full border border-stone-800 shadow-md animate-fadeInDown rounded-[5px]',
+                'bg-gradient-to-tr from-transparent to-sky-700/60 bg-stone-900/70',
+              )}
+            >
+              <div className="flex gap-3">
+                <i className={clsx('pi text-yellow-500 text-2xl', 'relative top-[2px]', ICONS[ping.type])}></i>
               <div className="flex flex-col gap-1 w-full">
                 <div className="flex justify-between">
                   <div>
@@ -253,28 +253,33 @@ export const PingsInterface = ({ hasLeftOffset }: PingsInterfaceProps) => {
               {/*/>*/}
             </div>
           </section>
-        )}
-      ></Toast>
+          )}
+        ></Toast>
+      )}
 
-      <WdButton
-        icon="pi pi-bell"
-        severity="warning"
-        aria-label="Notification"
-        size="small"
-        className="w-[33px] h-[33px]"
-        outlined
-        onClick={handleClickShow}
-        disabled={isShow}
-      />
+      {ping && (
+        <>
+          <WdButton
+            icon="pi pi-bell"
+            severity="warning"
+            aria-label="Notification"
+            size="small"
+            className="w-[33px] h-[33px]"
+            outlined
+            onClick={handleClickShow}
+            disabled={isShow}
+          />
 
-      <ConfirmPopup
-        target={cfRef.current}
-        visible={cfVisible}
-        onHide={cfHide}
-        message="Are you sure you want to delete ping?"
-        icon="pi pi-exclamation-triangle text-orange-400"
-        accept={removePing}
-      />
+          <ConfirmPopup
+            target={cfRef.current}
+            visible={cfVisible}
+            onHide={cfHide}
+            message="Are you sure you want to delete ping?"
+            icon="pi pi-exclamation-triangle text-orange-400"
+            accept={removePing}
+          />
+        </>
+      )}
     </>
   );
 };

assets/js/hooks/Mapper/components/mapInterface/components/SystemLinkSignatureDialog/SystemLinkSignatureDialog.tsx

@@ -3,9 +3,9 @@ import { useCallback, useEffect, useMemo, useRef } from 'react';
 
 import { useSystemInfo } from '@/hooks/Mapper/components/hooks';
 import {
-  SOLAR_SYSTEM_CLASS_IDS,
-  SOLAR_SYSTEM_CLASSES_TO_CLASS_GROUPS,
-  WORMHOLES_ADDITIONAL_INFO_BY_SHORT_NAME,
+    SOLAR_SYSTEM_CLASS_IDS,
+    SOLAR_SYSTEM_CLASSES_TO_CLASS_GROUPS,
+    WORMHOLES_ADDITIONAL_INFO_BY_SHORT_NAME,
 } from '@/hooks/Mapper/components/map/constants.ts';
 import { SystemSignaturesContent } from '@/hooks/Mapper/components/mapInterface/widgets/SystemSignatures/SystemSignaturesContent';
 import { K162_TYPES_MAP } from '@/hooks/Mapper/constants.ts';
@@ -91,7 +91,7 @@ export const SystemLinkSignatureDialog = ({ data, setVisible }: SystemLinkSignat
 
           if (k162TypeInfo) {
             // Check if the k162Type matches our target system class
-            return customInfo.k162Type === targetSystemClassGroup;
+            return k162TypeInfo.value.includes(targetSystemClassGroup);
           }
         }
 

assets/js/hooks/Mapper/components/mapRootContent/components/SignatureSettings/components/SignatureK162TypeSelect/renderK162Type.tsx

@@ -13,6 +13,26 @@ export const renderK162Type = (option: K162Type) => {
     return renderNoValue();
   }
 
+  if (['c1_c2_c3', 'c4_c5'].includes(value)) {
+    const arr = whClassName.split('_');
+
+    return (
+      <div className="flex gap-1 items-center">
+        {arr.map(x => (
+          <WHClassView
+            key={x}
+            classNameWh="!text-[11px] !font-bold"
+            hideWhClassName
+            hideTooltip
+            whClassName={x}
+            noOffset
+            useShortTitle
+          />
+        ))}
+      </div>
+    );
+  }
+
   return (
     <WHClassView
       classNameWh="!text-[11px] !font-bold"

assets/js/hooks/Mapper/constants.ts

@@ -88,6 +88,16 @@ export const K162_TYPES: K162Type[] = [
     value: 'ns',
     whClassName: 'C248',
   },
+  {
+    label: 'C1/C2/C3',
+    value: 'c1_c2_c3',
+    whClassName: 'E004_D382_L477',
+  },
+  {
+    label: 'C4/C5',
+    value: 'c4_c5',
+    whClassName: 'M001_L614',
+  },
   {
     label: 'C1',
     value: 'c1',

assets/js/hooks/Mapper/mapRootProvider/hooks/useComments.ts

@@ -63,7 +63,6 @@ export const useComments = ({ outCommand }: UseCommentsProps): UseCommentsData =
 
   const removeComment = useCallback((systemId: number, commentId: string) => {
     const cSystem = commentBySystemsRef.current.get(systemId);
-    console.log('cSystem', cSystem);
     if (!cSystem) {
       return;
     }

lib/wanderer_app/api/character.ex

@@ -39,6 +39,8 @@ defmodule WandererApp.Api.Character do
     define(:active_by_user,
       action: :active_by_user
     )
+
+    define(:admin_all, action: :admin_all)
   end
 
   actions do
@@ -69,6 +71,10 @@ defmodule WandererApp.Api.Character do
       filter(expr(user_id == ^arg(:user_id) and deleted == false))
     end
 
+    read :admin_all do
+      prepare build(load: [:user])
+    end
+
     read :last_active do
       argument(:from, :utc_datetime, allow_nil?: false)
 

lib/wanderer_app/map/map_manager.ex

@@ -16,7 +16,7 @@ defmodule WandererApp.Map.Manager do
   @maps_queue :maps_queue
   @check_maps_queue_interval :timer.seconds(1)
 
-  @pings_cleanup_interval :timer.minutes(1)
+  @pings_cleanup_interval :timer.minutes(5)
   @pings_expire_minutes 60
 
   # Test-aware async task runner

lib/wanderer_app/map/operations/signatures.ex

@@ -78,7 +78,8 @@ defmodule WandererApp.Map.Operations.Signatures do
       )
       when is_integer(solar_system_id) do
     with {:ok, validated_char_uuid} <- validate_character_eve_id(params, char_id),
-         {:ok, system} <- MapSystem.by_map_id_and_solar_system_id(map_id, solar_system_id) do
+         {:ok, system} <-
+           MapSystem.read_by_map_and_solar_system(%{map_id: map_id, solar_system_id: solar_system_id}) do
       attrs =
         params
         |> Map.put("system_id", system.id)

lib/wanderer_app/map/server/map_server_pings_impl.ex

@@ -72,14 +72,15 @@ defmodule WandererApp.Map.Server.PingsImpl do
           type: type
         } = _ping_info
       ) do
-    Logger.debug("cancel_ping called: map_id=#{map_id}, ping_id=#{ping_id}, type=#{type}")
 
-    case WandererApp.MapPingsRepo.get_by_id(ping_id) do
+    result = WandererApp.MapPingsRepo.get_by_id(ping_id)
+
+    case result do
       {:ok,
        %{system: %{id: system_id, name: system_name, solar_system_id: solar_system_id}} = ping} ->
         with {:ok, character} <- WandererApp.Character.get_character(character_id),
              :ok <- WandererApp.MapPingsRepo.destroy(ping) do
-          Logger.debug("Ping #{ping_id} destroyed successfully")
+          Logger.debug("Ping #{ping_id} destroyed successfully, broadcasting :ping_cancelled")
 
           Impl.broadcast!(map_id, :ping_cancelled, %{
             id: ping_id,
@@ -87,6 +88,8 @@ defmodule WandererApp.Map.Server.PingsImpl do
             type: type
           })
 
+          Logger.debug("Broadcast :ping_cancelled sent for ping #{ping_id}")
+
           # Broadcast rally point removal events to external clients (webhooks/SSE)
           if type == 1 do
             WandererApp.ExternalEvents.broadcast(map_id, :rally_point_removed, %{
@@ -113,8 +116,6 @@ defmodule WandererApp.Map.Server.PingsImpl do
 
       # Handle case where ping exists but system was deleted (nil)
       {:ok, %{system: nil} = ping} ->
-        Logger.warning("Ping #{ping_id} has no associated system, destroying orphaned ping")
-
         case WandererApp.MapPingsRepo.destroy(ping) do
           :ok ->
             Impl.broadcast!(map_id, :ping_cancelled, %{
@@ -129,19 +130,22 @@ defmodule WandererApp.Map.Server.PingsImpl do
 
       {:error, %Ash.Error.Query.NotFound{}} ->
         # Ping already deleted (possibly by cascade deletion from map/system/character removal,
-        # auto-expiry, or concurrent cancellation). This is not an error - the desired state
-        # (ping is gone) is already achieved. Just broadcast the cancellation event.
-        Logger.debug(
-          "Ping #{ping_id} not found during cancellation - already deleted, skipping broadcast"
-        )
+        # auto-expiry, or concurrent cancellation). Broadcast cancellation so frontend updates.
+        Impl.broadcast!(map_id, :ping_cancelled, %{
+          id: ping_id,
+          solar_system_id: nil,
+          type: type
+        })
 
         :ok
 
       {:error, %Ash.Error.Invalid{errors: [%Ash.Error.Query.NotFound{} | _]}} ->
         # Same as above, but Ash wraps NotFound inside Invalid in some cases
-        Logger.debug(
-          "Ping #{ping_id} not found during cancellation - already deleted, skipping broadcast"
-        )
+        Impl.broadcast!(map_id, :ping_cancelled, %{
+          id: ping_id,
+          solar_system_id: nil,
+          type: type
+        })
 
         :ok
 

lib/wanderer_app/map/server/map_server_signatures_impl.ex

@@ -167,6 +167,9 @@ defmodule WandererApp.Map.Server.SignaturesImpl do
       updated_count: length(updated_ids),
       removed_count: length(removed_ids)
     })
+
+    # Always return :ok - external event failures should not affect the main operation
+    :ok
   end
 
   defp remove_signature(map_id, sig, system, delete_conn?) do

lib/wanderer_app_web/components/layouts.ex

@@ -256,6 +256,11 @@ defmodule WandererAppWeb.Layouts do
                 Admin
               </.link>
             </li>
+            <li :if={@show_admin}>
+              <.link navigate="/admin/characters">
+                Characters
+              </.link>
+            </li>
             <li :if={@show_admin}>
               <.link navigate="/admin/errors">
                 Errors

lib/wanderer_app_web/live/admin/admin_characters_live.ex

@@ -0,0 +1,157 @@
+defmodule WandererAppWeb.AdminCharactersLive do
+  @moduledoc """
+  Admin LiveView for viewing all registered characters on the server.
+  """
+  use WandererAppWeb, :live_view
+
+  alias Phoenix.LiveView.AsyncResult
+
+  @characters_per_page 50
+
+  @impl true
+  def mount(_params, %{"user_id" => user_id} = _session, socket)
+      when not is_nil(user_id) and is_connected?(socket) do
+    {:ok,
+     socket
+     |> assign(
+       characters: AsyncResult.loading(),
+       search_term: "",
+       show_deleted: true,
+       page: 1,
+       per_page: @characters_per_page,
+       sort_by: :name,
+       sort_dir: :asc
+     )
+     |> load_characters_async()}
+  end
+
+  @impl true
+  def mount(_params, _session, socket) do
+    {:ok,
+     socket
+     |> assign(
+       characters: AsyncResult.loading(),
+       search_term: "",
+       show_deleted: true,
+       page: 1,
+       per_page: @characters_per_page,
+       sort_by: :name,
+       sort_dir: :asc
+     )}
+  end
+
+  @impl true
+  def handle_params(params, _url, socket) when is_connected?(socket) do
+    {:noreply, apply_action(socket, socket.assigns.live_action, params)}
+  end
+
+  @impl true
+  def handle_params(_params, _url, socket) do
+    {:noreply, socket}
+  end
+
+  defp apply_action(socket, :index, _params) do
+    socket
+    |> assign(:active_page, :admin)
+    |> assign(:page_title, "Admin - Characters")
+  end
+
+  defp load_characters_async(socket) do
+    socket
+    |> assign_async(:characters, fn -> load_all_characters() end)
+  end
+
+  defp load_all_characters do
+    case WandererApp.Api.Character.admin_all() do
+      {:ok, characters} ->
+        {:ok, %{characters: characters}}
+
+      _ ->
+        {:ok, %{characters: []}}
+    end
+  end
+
+  @impl true
+  def handle_event("search", %{"value" => term}, socket) do
+    {:noreply, socket |> assign(:search_term, term) |> assign(:page, 1)}
+  end
+
+  @impl true
+  def handle_event("toggle_deleted", _params, socket) do
+    {:noreply,
+     socket |> assign(:show_deleted, not socket.assigns.show_deleted) |> assign(:page, 1)}
+  end
+
+  @impl true
+  def handle_event("sort", %{"field" => field}, socket) do
+    field = String.to_existing_atom(field)
+
+    {sort_by, sort_dir} =
+      if socket.assigns.sort_by == field do
+        {field, toggle_dir(socket.assigns.sort_dir)}
+      else
+        {field, :asc}
+      end
+
+    {:noreply, socket |> assign(sort_by: sort_by, sort_dir: sort_dir, page: 1)}
+  end
+
+  @impl true
+  def handle_event("page", %{"page" => page}, socket) do
+    {:noreply, socket |> assign(:page, String.to_integer(page))}
+  end
+
+  @impl true
+  def handle_event(_event, _params, socket) do
+    {:noreply, socket}
+  end
+
+  def filter_characters(characters, search_term, show_deleted) do
+    characters
+    |> Enum.filter(fn char ->
+      (show_deleted or not char.deleted) and
+        (search_term == "" or
+           String.contains?(String.downcase(char.name || ""), String.downcase(search_term)) or
+           String.contains?(
+             String.downcase(char.corporation_name || ""),
+             String.downcase(search_term)
+           ) or
+           String.contains?(
+             String.downcase(char.alliance_name || ""),
+             String.downcase(search_term)
+           ))
+    end)
+  end
+
+  def sort_characters(characters, sort_by, sort_dir) do
+    Enum.sort_by(characters, &sort_value(&1, sort_by), sort_dir)
+  end
+
+  defp sort_value(char, :name), do: String.downcase(char.name || "")
+  defp sort_value(char, :corporation), do: String.downcase(char.corporation_name || "")
+  defp sort_value(char, :alliance), do: String.downcase(char.alliance_name || "")
+  defp sort_value(char, :user), do: String.downcase(user_name(char.user))
+  defp sort_value(char, :registered), do: char.inserted_at || ~U[1970-01-01 00:00:00Z]
+
+  defp toggle_dir(:asc), do: :desc
+  defp toggle_dir(:desc), do: :asc
+
+  def paginate(items, page, per_page) do
+    items
+    |> Enum.drop((page - 1) * per_page)
+    |> Enum.take(per_page)
+  end
+
+  def total_pages(items, per_page) do
+    max(1, ceil(length(items) / per_page))
+  end
+
+  def format_date(nil), do: "-"
+
+  def format_date(datetime) do
+    Calendar.strftime(datetime, "%Y-%m-%d %H:%M")
+  end
+
+  def user_name(nil), do: "Unlinked"
+  def user_name(%{name: name}), do: name
+end

lib/wanderer_app_web/live/admin/admin_characters_live.html.heex

@@ -0,0 +1,166 @@
+<main class="w-full h-full col-span-2 lg:col-span-1 p-4 pl-20 overflow-auto">
+  <div class="page-content">
+    <div class="container-fluid px-[0.625rem]">
+      <!-- Header -->
+      <div class="grid grid-cols-1 pb-6">
+        <div class="md:flex items-center justify-between px-[2px]">
+          <h4 class="text-[18px] font-medium text-gray-800 mb-sm-0 grow dark:text-gray-100 mb-2 md:mb-0">
+            Admin - Characters
+          </h4>
+          <.link navigate={~p"/admin"} class="btn btn-ghost btn-sm">
+            <.icon name="hero-arrow-left-solid" class="w-4 h-4" /> Back to Admin
+          </.link>
+        </div>
+      </div>
+      
+<!-- Search and Filters -->
+      <div class="card dark:bg-zinc-800 dark:border-zinc-600 mb-4">
+        <div class="card-body flex flex-row gap-4 items-center">
+          <div class="flex-1">
+            <input
+              type="text"
+              placeholder="Search by name, corporation, or alliance..."
+              value={@search_term}
+              phx-keyup="search"
+              phx-debounce="300"
+              name="search"
+              class="input input-bordered w-full"
+            />
+          </div>
+          <label class="flex items-center gap-2 cursor-pointer">
+            <input
+              type="checkbox"
+              class="checkbox"
+              checked={@show_deleted}
+              phx-click="toggle_deleted"
+            />
+            <span class="text-sm">Show deleted</span>
+          </label>
+        </div>
+      </div>
+      
+<!-- Characters Table -->
+      <div class="card dark:bg-zinc-800 dark:border-zinc-600">
+        <div class="card-body">
+          <.async_result :let={characters} assign={@characters}>
+            <:loading>
+              <div class="flex justify-center p-8">
+                <span class="loading loading-spinner loading-lg"></span>
+              </div>
+            </:loading>
+            <:failed :let={reason}>
+              <div class="alert alert-error">{inspect(reason)}</div>
+            </:failed>
+
+            <% filtered = filter_characters(characters, @search_term, @show_deleted) %>
+            <% sorted = sort_characters(filtered, @sort_by, @sort_dir) %>
+            <% paginated = paginate(sorted, @page, @per_page) %>
+
+            <div class="overflow-x-auto !max-h-[60vh] !overflow-y-auto">
+              <table class="table table-xs">
+                <thead>
+                  <tr>
+                    <th
+                      :for={
+                        {label, field} <- [
+                          {"Character", :name},
+                          {"Corporation", :corporation},
+                          {"Alliance", :alliance},
+                          {"User Account", :user},
+                          {"Registered", :registered}
+                        ]
+                      }
+                      phx-click="sort"
+                      phx-value-field={field}
+                      class="cursor-pointer select-none hover:bg-base-200"
+                    >
+                      <div class="flex items-center gap-1">
+                        {label}
+                        <span :if={@sort_by == field}>
+                          <.icon :if={@sort_dir == :asc} name="hero-chevron-up" class="w-3 h-3" />
+                          <.icon
+                            :if={@sort_dir == :desc}
+                            name="hero-chevron-down"
+                            class="w-3 h-3"
+                          />
+                        </span>
+                      </div>
+                    </th>
+                  </tr>
+                </thead>
+                <tbody id="admin-characters" phx-update="replace">
+                  <tr :for={char <- paginated} id={"char-#{char.id}"}>
+                    <td>
+                      <div class="flex items-center gap-2">
+                        <.avatar url={member_icon_url(char.eve_id)} label={char.name} />
+                        <span class={if char.deleted, do: "line-through text-gray-500", else: ""}>
+                          {char.name}
+                        </span>
+                        <span :if={char.deleted} class="badge badge-error badge-sm">
+                          Deleted
+                        </span>
+                        <span :if={char.online} class="badge badge-success badge-sm">
+                          Online
+                        </span>
+                      </div>
+                    </td>
+                    <td>
+                      <span :if={char.corporation_name}>
+                        {char.corporation_name}
+                        <span :if={char.corporation_ticker} class="text-gray-400">
+                          [{char.corporation_ticker}]
+                        </span>
+                      </span>
+                    </td>
+                    <td>
+                      <span :if={char.alliance_name}>
+                        {char.alliance_name}
+                        <span :if={char.alliance_ticker} class="text-gray-400">
+                          [{char.alliance_ticker}]
+                        </span>
+                      </span>
+                    </td>
+                    <td>{user_name(char.user)}</td>
+                    <td>
+                      <span class="text-sm">{format_date(char.inserted_at)}</span>
+                    </td>
+                  </tr>
+                </tbody>
+              </table>
+            </div>
+            
+<!-- Pagination -->
+            <div :if={length(filtered) > @per_page} class="flex items-center justify-between mt-4">
+              <span class="text-sm text-gray-400">
+                Page {@page} of {total_pages(filtered, @per_page)} ({length(filtered)} characters)
+              </span>
+              <div class="flex gap-2">
+                <button
+                  phx-click="page"
+                  phx-value-page={max(1, @page - 1)}
+                  disabled={@page <= 1}
+                  class={"btn btn-sm btn-ghost " <> if(@page <= 1, do: "btn-disabled", else: "")}
+                >
+                  <.icon name="hero-chevron-left" class="w-4 h-4" />
+                </button>
+                <button
+                  phx-click="page"
+                  phx-value-page={min(total_pages(filtered, @per_page), @page + 1)}
+                  disabled={@page >= total_pages(filtered, @per_page)}
+                  class={"btn btn-sm btn-ghost " <> if(@page >= total_pages(filtered, @per_page), do: "btn-disabled", else: "")}
+                >
+                  <.icon name="hero-chevron-right" class="w-4 h-4" />
+                </button>
+              </div>
+            </div>
+            
+<!-- Empty state -->
+            <div :if={length(filtered) == 0} class="text-center py-8 text-gray-400">
+              No characters found
+            </div>
+          </.async_result>
+        </div>
+      </div>
+    </div>
+  </div>
+</main>

lib/wanderer_app_web/live/admin/admin_live.html.heex

@@ -24,6 +24,18 @@
             </.link>
           </div>
         </div>
+        <div class="card dark:bg-zinc-800 dark:border-zinc-600">
+          <div class="card-body">
+            <span class="text-gray-400 dark:text-gray-400">Characters</span>
+            <.link
+              class="btn mt-2 w-full btn-neutral rounded-none"
+              navigate={~p"/admin/characters"}
+            >
+              <.icon name="hero-users-solid" class="w-6 h-6" />
+              <h3 class="card-title text-center text-md">View All Characters</h3>
+            </.link>
+          </div>
+        </div>
         <div :if={@restrict_maps_creation?} class="card dark:bg-zinc-800 dark:border-zinc-600">
           <div class="card-body">
             <.button class="mt-2" type="button" phx-click="create-map">

lib/wanderer_app_web/live/map/event_handlers/map_pings_event_handler.ex

@@ -51,14 +51,18 @@ defmodule WandererAppWeb.MapPingsEventHandler do
         map_ui_ping(ping_info)
       ])
 
-  def handle_server_event(%{event: :ping_cancelled, payload: ping_info}, socket),
-    do:
-      socket
-      |> MapEventHandler.push_map_event("ping_cancelled", %{
-        id: ping_info.id,
-        solar_system_id: ping_info.solar_system_id,
-        type: ping_info.type
-      })
+  def handle_server_event(%{event: :ping_cancelled, payload: ping_info}, socket) do
+    Logger.debug(
+      "handle_server_event :ping_cancelled - id: #{ping_info.id}, is_version_valid?: #{inspect(socket.assigns[:is_version_valid?])}"
+    )
+
+    socket
+    |> MapEventHandler.push_map_event("ping_cancelled", %{
+      id: ping_info.id,
+      solar_system_id: ping_info.solar_system_id,
+      type: ping_info.type
+    })
+  end
 
   def handle_server_event(event, socket),
     do: MapCoreEventHandler.handle_server_event(event, socket)
@@ -153,8 +157,6 @@ defmodule WandererAppWeb.MapPingsEventHandler do
           socket
       )
       when not is_nil(main_character_id) do
-    Logger.debug("handle_ui_event cancel_ping: id=#{id}, type=#{type}, map_id=#{map_id}")
-
     map_id
     |> WandererApp.Map.Server.cancel_ping(%{
       id: id,
@@ -172,8 +174,6 @@ defmodule WandererAppWeb.MapPingsEventHandler do
         _event,
         %{assigns: %{main_character_id: nil}} = socket
       ) do
-    Logger.warning("add_ping blocked: main_character_id is nil")
-
     {:noreply,
      socket
      |> MapEventHandler.push_map_event("ping_blocked", %{
@@ -188,8 +188,6 @@ defmodule WandererAppWeb.MapPingsEventHandler do
         _event,
         %{assigns: %{has_tracked_characters?: false}} = socket
       ) do
-    Logger.warning("add_ping blocked: no tracked characters")
-
     {:noreply,
      socket
      |> MapEventHandler.push_map_event("ping_blocked", %{
@@ -204,8 +202,6 @@ defmodule WandererAppWeb.MapPingsEventHandler do
         _event,
         %{assigns: %{is_subscription_active?: false}} = socket
       ) do
-    Logger.warning("add_ping blocked: subscription not active")
-
     {:noreply,
      socket
      |> MapEventHandler.push_map_event("ping_blocked", %{
@@ -220,8 +216,6 @@ defmodule WandererAppWeb.MapPingsEventHandler do
         _event,
         %{assigns: %{user_permissions: %{update_system: false}}} = socket
       ) do
-    Logger.warning("add_ping blocked: no update_system permission")
-
     {:noreply,
      socket
      |> MapEventHandler.push_map_event("ping_blocked", %{
@@ -236,7 +230,15 @@ defmodule WandererAppWeb.MapPingsEventHandler do
         _event,
         %{assigns: %{main_character_id: nil}} = socket
       ) do
-    Logger.warning("cancel_ping blocked: main_character_id is nil")
+    {:noreply, socket}
+  end
+
+  # Catch-all for cancel_ping to debug why it doesn't match
+  def handle_ui_event(
+        "cancel_ping",
+        event,
+        %{assigns: assigns} = socket
+      ) do
     {:noreply, socket}
   end
 

lib/wanderer_app_web/live/maps/components/map_balance_component.ex

@@ -11,6 +11,7 @@ defmodule WandererAppWeb.Maps.MapBalanceComponent do
     {:ok,
      assign(socket,
        is_topping_up?: false,
+       is_withdrawing?: false,
        error: nil
      )}
   end
@@ -61,12 +62,102 @@ defmodule WandererAppWeb.Maps.MapBalanceComponent do
            {"ALL", nil}
          ]
        )
-       |> assign(is_topping_up?: true)}
+       |> assign(is_topping_up?: true, is_withdrawing?: false)}
 
   @impl true
   def handle_event("hide_topup", _, socket),
     do: {:noreply, socket |> assign(is_topping_up?: false)}
 
+  @impl true
+  def handle_event("show_withdraw", _, socket),
+    do:
+      {:noreply,
+       socket
+       |> assign(
+         :withdraw_amounts,
+         [
+           {"50M", 50_000_000},
+           {"100M", 100_000_000},
+           {"250M", 250_000_000},
+           {"500M", 500_000_000},
+           {"1B", 1_000_000_000},
+           {"2.5B", 2_500_000_000},
+           {"5B", 5_000_000_000},
+           {"10B", 10_000_000_000},
+           {"ALL", nil}
+         ]
+       )
+       |> assign(is_withdrawing?: true, is_topping_up?: false)}
+
+  @impl true
+  def handle_event("hide_withdraw", _, socket),
+    do: {:noreply, socket |> assign(is_withdrawing?: false)}
+
+  @impl true
+  def handle_event(
+        "withdraw",
+        %{"amount" => amount} = _event,
+        %{assigns: %{current_user: current_user, map: map, map_id: map_id}} = socket
+      ) do
+    user =
+      current_user.id
+      |> WandererApp.User.load()
+
+    {:ok, map_balance} = WandererApp.Map.SubscriptionManager.get_balance(map)
+
+    amount =
+      if amount == "" do
+        map_balance
+      else
+        amount |> Decimal.new() |> Decimal.to_float()
+      end
+
+    case amount <= map_balance do
+      true ->
+        {:ok, _t} =
+          WandererApp.Api.MapTransaction.create(%{
+            map_id: map_id,
+            user_id: current_user.id,
+            amount: amount,
+            type: :out
+          })
+
+        {:ok, user_balance} =
+          user
+          |> WandererApp.User.get_balance()
+
+        {:ok, _user} =
+          user
+          |> WandererApp.Api.User.update_balance(%{
+            balance: (user_balance || 0.0) + amount
+          })
+
+        {:ok, user_balance} =
+          current_user.id
+          |> WandererApp.User.load()
+          |> WandererApp.User.get_balance()
+
+        {:ok, map_balance} = WandererApp.Map.SubscriptionManager.get_balance(map)
+
+        {:noreply,
+         socket
+         |> assign(
+           is_withdrawing?: false,
+           map_balance: map_balance,
+           user_balance: user_balance
+         )}
+
+      _ ->
+        notify_to(
+          socket.assigns.notify_to,
+          socket.assigns.event_name,
+          {:flash, :error, "Not enough ISK in map balance!"}
+        )
+
+        {:noreply, socket}
+    end
+  end
+
   @impl true
   def handle_event(
         "topup",
@@ -142,7 +233,7 @@ defmodule WandererAppWeb.Maps.MapBalanceComponent do
         <div class="stat">
           <div class="stat-figure text-primary">
             <.button
-              :if={not @is_topping_up?}
+              :if={not @is_topping_up? and not @is_withdrawing?}
               class="mt-2"
               type="button"
               phx-click="show_topup"
@@ -150,6 +241,15 @@ defmodule WandererAppWeb.Maps.MapBalanceComponent do
             >
               Top Up
             </.button>
+            <.button
+              :if={not @is_topping_up? and not @is_withdrawing?}
+              class="mt-2"
+              type="button"
+              phx-click="show_withdraw"
+              phx-target={@myself}
+            >
+              Withdraw
+            </.button>
           </div>
           <div class="stat-title">Map balance</div>
           <div class="stat-value text-white">
@@ -210,6 +310,32 @@ defmodule WandererAppWeb.Maps.MapBalanceComponent do
           </.button>
         </div>
       </.form>
+
+      <.form
+        :let={f}
+        :if={@is_withdrawing?}
+        for={@topup_form}
+        class="mt-2"
+        phx-submit="withdraw"
+        phx-target={@myself}
+      >
+        <.input
+          type="select"
+          field={f[:amount]}
+          class="select h-8 min-h-[10px] !pt-1 !pb-1 text-sm bg-neutral-900"
+          label="Withdraw amount"
+          placeholder="Select withdraw amount"
+          options={@withdraw_amounts}
+        />
+        <div class="modal-action">
+          <.button class="mt-2" type="button" phx-click="hide_withdraw" phx-target={@myself}>
+            Cancel
+          </.button>
+          <.button class="mt-2" type="submit">
+            Withdraw
+          </.button>
+        </div>
+      </.form>
     </div>
     """
   end

lib/wanderer_app_web/router.ex

@@ -506,6 +506,7 @@ defmodule WandererAppWeb.Router do
       live("/maps", AdminMapsLive, :index)
       live("/maps/:id/edit", AdminMapsLive, :edit)
       live("/maps/:id/acls", AdminMapsLive, :view_acls)
+      live("/characters", AdminCharactersLive, :index)
     end
 
     error_tracker_dashboard("/errors",

mix.exs

@@ -3,7 +3,7 @@ defmodule WandererApp.MixProject do
 
   @source_url "https://github.com/wanderer-industries/wanderer"
 
-  @version "1.91.8"
+  @version "1.94.0"
 
   def project do
     [