aa-fleetfinder 2.6.0__py3-none-any.whl → 2.7.0__py3-none-any.whl

fleetfinder/locale/zh_Hans/LC_MESSAGES/django.po

@@ -4,21 +4,21 @@
 # Dehao Wu <wudehao2000@163.com>, 2024.
 # Faer Yili <yilifaer@gmail.com>, 2024.
 # SAM_FPS <sam_fps@163.com>, 2024.
-# Peter Pfeufer <info@ppfeufer.de>, 2024.
+# Peter Pfeufer <info@ppfeufer.de>, 2024, 2025.
 msgid ""
 msgstr ""
 "Project-Id-Version: AA Fleet Finder 2.2.1\n"
 "Report-Msgid-Bugs-To: https://github.com/ppfeufer/aa-fleetfinder/issues\n"
-"POT-Creation-Date: 2025-08-04 22:06+0200\n"
-"PO-Revision-Date: 2024-06-06 14:27+0000\n"
+"POT-Creation-Date: 2025-08-21 15:11+0200\n"
+"PO-Revision-Date: 2025-08-21 13:16+0000\n"
 "Last-Translator: Peter Pfeufer <info@ppfeufer.de>\n"
-"Language-Team: Chinese (Simplified) <https://weblate.ppfeufer.de/projects/alliance-auth-apps/aa-fleetfinder/zh_Hans/>\n"
+"Language-Team: Chinese (Simplified Han script) <https://weblate.ppfeufer.de/projects/alliance-auth-apps/aa-fleetfinder/zh_Hans/>\n"
 "Language: zh_Hans\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Weblate 5.5.5\n"
+"X-Generator: Weblate 5.13\n"
 
 #: fleetfinder/__init__.py:9 fleetfinder/models.py:24
 #: fleetfinder/templates/fleetfinder/base.html:6
@@ -70,7 +70,6 @@ msgid "Creation date and time"
 msgstr "创建日期和时间"
 
 #: fleetfinder/models.py:62
-#: fleetfinder/templates/fleetfinder/partials/body/form-fleet-details.html:37
 msgid "Fleet MOTD"
 msgstr "舰队置顶信息"
 
@@ -117,14 +116,6 @@ msgstr "创建于"
 msgid "Join"
 msgstr "加入"
 
-#: fleetfinder/templates/fleetfinder/dashboard.html:25
-msgid "Details"
-msgstr "细节"
-
-#: fleetfinder/templates/fleetfinder/dashboard.html:26
-msgid "Edit"
-msgstr "编辑"
-
 #: fleetfinder/templates/fleetfinder/edit-fleet.html:6
 #: fleetfinder/templates/fleetfinder/edit-fleet.html:14
 msgid "Edit fleet"
@@ -159,7 +150,26 @@ msgstr "名字"
 msgid "System"
 msgstr "星系"
 
-#: fleetfinder/templates/fleetfinder/join-fleet.html:6 fleetfinder/views.py:90
+#: fleetfinder/templates/fleetfinder/fleet-details.html:53
+msgid "Action"
+msgstr "行动"
+
+#: fleetfinder/templates/fleetfinder/fleet-details.html:79
+#, fuzzy
+#| msgid "Fleet members"
+msgid "Fleet boss"
+msgstr "舰队成员"
+
+#: fleetfinder/templates/fleetfinder/fleet-details.html:80
+#: fleetfinder/templates/fleetfinder/modals/kick-fleet-member.html:10
+msgid "Kick member from fleet"
+msgstr ""
+
+#: fleetfinder/templates/fleetfinder/fleet-details.html:81
+msgid "An unknown error occurred."
+msgstr ""
+
+#: fleetfinder/templates/fleetfinder/join-fleet.html:6 fleetfinder/views.py:182
 msgid "Join fleet"
 msgstr "加入舰队"
 
@@ -167,14 +177,50 @@ msgstr "加入舰队"
 msgid "Fleet invitation"
 msgstr "舰队邀请"
 
-#: fleetfinder/templates/fleetfinder/join-fleet.html:25
-msgid "Select the characters to invite"
+#: fleetfinder/templates/fleetfinder/join-fleet.html:22
+msgid "Please ensure you don't have any CSPA charges set on your characters, as this will prevent fleet invites from being sent."
+msgstr ""
+
+#: fleetfinder/templates/fleetfinder/join-fleet.html:24
+#, fuzzy
+#| msgid "Select the characters to invite"
+msgid "You can select multiple characters to invite them all at once."
 msgstr "选择要邀请的角色"
 
+#: fleetfinder/templates/fleetfinder/join-fleet.html:28
+msgid "The selected characters will receive a fleet invite in-game, which they can accept to join the fleet."
+msgstr ""
+
 #: fleetfinder/templates/fleetfinder/join-fleet.html:35
+#, fuzzy
+#| msgid "Select the characters to invite"
+msgid "Please select the characters you want to invite:"
+msgstr "选择要邀请的角色"
+
+#: fleetfinder/templates/fleetfinder/join-fleet.html:45
 msgid "Send fleet invites"
 msgstr "发送舰队邀请"
 
+#: fleetfinder/templates/fleetfinder/modals/kick-fleet-member.html:13
+msgid "Close"
+msgstr ""
+
+#: fleetfinder/templates/fleetfinder/modals/kick-fleet-member.html:18
+msgid "Are you sure you want to kick this member from the fleet?"
+msgstr ""
+
+#: fleetfinder/templates/fleetfinder/modals/kick-fleet-member.html:27
+msgid "Error"
+msgstr ""
+
+#: fleetfinder/templates/fleetfinder/modals/kick-fleet-member.html:36
+msgid "Cancel"
+msgstr "取消"
+
+#: fleetfinder/templates/fleetfinder/modals/kick-fleet-member.html:41
+msgid "Confirm"
+msgstr "确认"
+
 #: fleetfinder/templates/fleetfinder/partials/body/form-fleet-details.html:15
 msgid "Select groups"
 msgstr "选择群组"
@@ -199,18 +245,62 @@ msgstr "加入我们的翻译团队吧！"
 msgid "Available fleets"
 msgstr "可用的舰队"
 
-#: fleetfinder/views.py:103
+#: fleetfinder/views.py:193
 msgid "View fleet details"
 msgstr "查看船队详情"
 
-#: fleetfinder/views.py:112
+#: fleetfinder/views.py:199
 msgid "Edit fleet advert"
 msgstr "编辑舰队宣传信息"
 
-#: fleetfinder/views.py:276
-#, python-brace-format
-msgid "<h4>Error!</h4><p>ESI returned the following error: {esi_error_message}</p>"
+#: fleetfinder/views.py:244
+#, fuzzy, python-brace-format
+#| msgid "<h4>Error!</h4><p>ESI returned the following error: {esi_error_message}</p>"
+msgid "<h4>Error!</h4><p>There was an error creating the fleet: {error_detail}</p>"
+msgstr "<h4>错误!</h4><p>ESI返回如下错误:{esi_error_message}</p>"
+
+#: fleetfinder/views.py:284
+msgid "<h4>Error!</h4><p>Fleet does not exist or is no longer available.</p>"
+msgstr ""
+
+#: fleetfinder/views.py:438
+#, fuzzy, python-brace-format
+#| msgid "<h4>Error!</h4><p>ESI returned the following error: {esi_error_message}</p>"
+msgid "<h4>Error!</h4><p>ESI returned the following error: {esi_error}</p>"
 msgstr "<h4>错误!</h4><p>ESI返回如下错误:{esi_error_message}</p>"
 
+#: fleetfinder/views.py:446
+#, python-brace-format
+msgid "<h4>Error!</h4><p>There was an error creating the fleet: {ex}</p>"
+msgstr ""
+
+#: fleetfinder/views.py:517
+msgid "Method not allowed"
+msgstr ""
+
+#: fleetfinder/views.py:527
+msgid "Member ID required"
+msgstr ""
+
+#: fleetfinder/views.py:546
+#, fuzzy
+#| msgid "Fleet invitation"
+msgid "Fleet not found"
+msgstr "舰队邀请"
+
+#: fleetfinder/views.py:550
+msgid "Invalid request data"
+msgstr ""
+
+#: fleetfinder/views.py:554
+msgid "Member not found in fleet"
+msgstr ""
+
+#~ msgid "Details"
+#~ msgstr "细节"
+
+#~ msgid "Edit"
+#~ msgstr "编辑"
+
 #~ msgid "Toggle navigation"
 #~ msgstr "切换导航"

fleetfinder/static/fleetfinder/css/fleetfinder.css

@@ -7,4 +7,25 @@
     .aa-fleetfinder .table-vertical-middle td {
         vertical-align: middle;
     }
+
+    /* Slim Select
+    --------------------------------------------------------------------------------- */
+
+    .aa-fleetfinder .ss-main {
+        appearance: none;
+        background-clip: padding-box;
+        border: var(--bs-border-width) solid var(--bs-border-color);
+        border-radius: var(--bs-border-radius);
+        color: var(--bs-body-color);
+        font-size: 1rem;
+        font-weight: 400;
+        line-height: 1.5;
+        min-height: calc(1.5em + .75rem + 2px);
+        padding: .375rem .75rem;
+        transition: border-color .15s ease-in-out, box-shadow .15s ease-in-out;
+        width: 100%;
+    }
+
+    /* END Slim Select
+    --------------------------------------------------------------------------------- */
 }

fleetfinder/static/fleetfinder/css/fleetfinder.min.css

@@ -1,2 +1,2 @@
-@media all{.aa-fleetfinder .eve-character-portrait,.aa-fleetfinder .eve-type-icon{margin-right:.5rem}.aa-fleetfinder .table-vertical-middle td{vertical-align:middle}}
+@media all{.aa-fleetfinder .eve-character-portrait,.aa-fleetfinder .eve-type-icon{margin-right:.5rem}.aa-fleetfinder .table-vertical-middle td{vertical-align:middle}.aa-fleetfinder .ss-main{appearance:none;background-clip:padding-box;border:var(--bs-border-width) solid var(--bs-border-color);border-radius:var(--bs-border-radius);color:var(--bs-body-color);font-size:1rem;font-weight:400;line-height:1.5;min-height:calc(1.5em + .75rem + 2px);padding:.375rem .75rem;transition:border-color .15s ease-in-out,box-shadow .15s ease-in-out;width:100%}}
 /*# sourceMappingURL=fleetfinder.min.css.map */

fleetfinder/static/fleetfinder/css/fleetfinder.min.css.map

@@ -1 +1 @@
-{"version":3,"sources":["fleetfinder.css"],"names":[],"mappings":"AAAA,A,WACI,uC,CACA,8B,CACI,kB,CAGJ,yC,CACI,uB","file":"fleetfinder.css","sourcesContent":["@media all {\n    .aa-fleetfinder .eve-character-portrait,\n    .aa-fleetfinder .eve-type-icon {\n        margin-right: 0.5rem;\n    }\n\n    .aa-fleetfinder .table-vertical-middle td {\n        vertical-align: middle;\n    }\n}\n"]}
+{"version":3,"sources":["fleetfinder.css"],"names":[],"mappings":"AAAA,A,WACI,uC,CACA,8B,CACI,kB,CAGJ,yC,CACI,qB,CAMJ,wB,CACI,e,CACA,2B,CACA,0D,CACA,qC,CACA,0B,CACA,c,CACA,e,CACA,e,CACA,qC,CACA,sB,CACA,oE,CACA,Y","file":"fleetfinder.css","sourcesContent":["@media all {\n    .aa-fleetfinder .eve-character-portrait,\n    .aa-fleetfinder .eve-type-icon {\n        margin-right: 0.5rem;\n    }\n\n    .aa-fleetfinder .table-vertical-middle td {\n        vertical-align: middle;\n    }\n\n    /* Slim Select\n    --------------------------------------------------------------------------------- */\n\n    .aa-fleetfinder .ss-main {\n        appearance: none;\n        background-clip: padding-box;\n        border: var(--bs-border-width) solid var(--bs-border-color);\n        border-radius: var(--bs-border-radius);\n        color: var(--bs-body-color);\n        font-size: 1rem;\n        font-weight: 400;\n        line-height: 1.5;\n        min-height: calc(1.5em + .75rem + 2px);\n        padding: .375rem .75rem;\n        transition: border-color .15s ease-in-out, box-shadow .15s ease-in-out;\n        width: 100%;\n    }\n\n    /* END Slim Select\n    --------------------------------------------------------------------------------- */\n}\n"]}

fleetfinder/static/fleetfinder/js/fleetfinder.js

@@ -0,0 +1,23 @@
+/* global bootstrap */
+
+/* jshint -W097 */
+'use strict';
+
+/**
+ * Bootstrap tooltip
+ *
+ * @param {string} [selector=body] Selector for the tooltip elements, defaults to 'body'
+ *                                 to apply to all elements with the data-bs-tooltip attribute.
+ *                                 Example: 'body', '.my-tooltip-class', '#my-tooltip-id'
+ *                                 If you want to apply it to a specific element, use that element's selector.
+ *                                 If you want to apply it to all elements with the data-bs-tooltip attribute,
+ *                                 use 'body' or leave it empty.
+ * @param {string} [namespace=aa-fleetfinderl] Namespace for the tooltip
+ * @returns {void}
+ */
+const fleetfinderBootstrapTooltip = ({selector = 'body', namespace = 'aa-fleetfinder'}) => { // eslint-disable-line no-unused-vars
+    document.querySelectorAll(`${selector} [data-bs-tooltip="${namespace}"]`)
+        .forEach((tooltipTriggerEl) => {
+            return new bootstrap.Tooltip(tooltipTriggerEl);
+        });
+};

fleetfinder/static/fleetfinder/js/fleetfinder.min.js

@@ -0,0 +1,2 @@
+const fleetfinderBootstrapTooltip=({selector:o="body",namespace:e="aa-fleetfinder"})=>{document.querySelectorAll(`${o} [data-bs-tooltip="${e}"]`).forEach(o=>new bootstrap.Tooltip(o))};
+//# sourceMappingURL=fleetfinder.min.js.map

fleetfinder/static/fleetfinder/js/fleetfinder.min.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["fleetfinder.js"],"names":["fleetfinderBootstrapTooltip","selector","namespace","document","querySelectorAll","forEach","bootstrap","Tooltip","tooltipTriggerEl"],"mappings":"AAiBA,MAAMA,4BAA8B,CAAA,CAAEC,SAAAA,EAAW,OAAQC,UAAAA,EAAY,gBAAiB,KAClFC,SAASC,oBAAoBH,uBAA8BC,KAAa,EACnEG,QAAQ,GACE,IAAIC,UAAUC,QAAQC,CAAgB,CAChD,CACT"}

fleetfinder/tasks.py

@@ -14,7 +14,6 @@ from celery import shared_task
 from django.utils import timezone
 
 # Alliance Auth
-from allianceauth.eveonline.models import EveCharacter
 from allianceauth.services.hooks import get_extension_logger
 from allianceauth.services.tasks import QueueOnce
 from esi.models import Token
@@ -148,10 +147,13 @@ def _get_fleet_aggregate(fleet_infos):
     for member in fleet_infos:
         type_ = member.get("ship_type_name")
 
-        if type_ in counts:
-            counts[type_] += 1
-        else:
-            counts[type_] = 1
+        if type_ and isinstance(type_, str) and type_.strip():
+            type_ = type_.strip()  # Normalize ship type name
+
+            if type_ in counts:
+                counts[type_] += 1
+            else:
+                counts[type_] = 1
 
     return counts
 
@@ -187,110 +189,56 @@ def _check_for_esi_fleet(fleet: Fleet):
     return False
 
 
-def _process_fleet(fleet: Fleet):
+def _process_fleet(fleet: Fleet) -> None:
     """
     Processing a fleet
 
-    :param fleet:
-    :type fleet:
-    :return:
-    :rtype:
+    :param fleet: Fleet object to process
+    :type fleet: Fleet
+    :return: None
+    :rtype: None
     """
 
-    fleet_id = fleet.fleet_id
-    fleet_name = fleet.name
-    fleet_commander = fleet.fleet_commander
-
     logger.info(
-        f'Processing information for fleet "{fleet_name}" '
-        f"of {fleet_commander} (ESI ID: {fleet_id})"
+        f'Processing information for fleet "{fleet.name}" '
+        f"of {fleet.fleet_commander} (ESI ID: {fleet.fleet_id})"
     )
 
     # Check if there is a fleet
     esi_fleet = _check_for_esi_fleet(fleet=fleet)
-    if esi_fleet and fleet.fleet_id == esi_fleet["fleet"]["fleet_id"]:
-        try:
-            fleet_from_esi = esi.client.Fleets.get_characters_character_id_fleet(
-                character_id=fleet.fleet_commander.character_id,
-                token=esi_fleet["token"].valid_access_token(),
-            ).result()
-        except HTTPNotFound:
-            _esi_fleet_error_handling(
-                fleet=fleet, error_key=Fleet.EsiError.NOT_IN_FLEET
-            )
-        except Exception:  # pylint: disable=broad-exception-caught
-            _esi_fleet_error_handling(fleet=fleet, error_key=Fleet.EsiError.NO_FLEET)
-
-        # We have a valid fleet result from ESI
-        else:
-            if fleet_id == fleet_from_esi["fleet_id"]:
-                # Check if we deal with the fleet boss here
-                try:
-                    _ = esi.client.Fleets.get_fleets_fleet_id_members(
-                        fleet_id=fleet_from_esi["fleet_id"],
-                        token=esi_fleet["token"].valid_access_token(),
-                    ).result()
-                except Exception:  # pylint: disable=broad-exception-caught
-                    _esi_fleet_error_handling(
-                        fleet=fleet, error_key=Fleet.EsiError.NOT_FLEETBOSS
-                    )
-            else:
-                _esi_fleet_error_handling(
-                    fleet=fleet, error_key=Fleet.EsiError.FC_CHANGED_FLEET
-                )
-
-
-@shared_task
-def open_fleet(character_id, motd, free_move, name, groups):
-    """
-    Open a fleet
-
-    :param character_id:
-    :param motd:
-    :param free_move:
-    :param name:
-    :param groups:
-    :return:
-    """
-
-    required_scopes = ["esi-fleets.read_fleet.v1", "esi-fleets.write_fleet.v1"]
-    token = Token.get_token(character_id=character_id, scopes=required_scopes)
-
-    fleet_result = esi.client.Fleets.get_characters_character_id_fleet(
-        character_id=token.character_id, token=token.valid_access_token()
-    ).result()
-    fleet_id = fleet_result.pop("fleet_id")
-    fleet_role = fleet_result.pop("role")
 
-    if fleet_id is None or fleet_role is None or fleet_role != "fleet_commander":
+    if not esi_fleet:
         return
 
-    fleet_commander = EveCharacter.objects.get(character_id=token.character_id)
-
-    fleet = Fleet(
-        fleet_id=fleet_id,
-        created_at=timezone.now(),
-        motd=motd,
-        is_free_move=free_move,
-        fleet_commander=fleet_commander,
-        name=name,
-    )
-    fleet.save()
-    fleet.groups.set(groups)
+    # Fleet IDs don't match, FC changed fleets
+    if fleet.fleet_id != esi_fleet["fleet"]["fleet_id"]:
+        _esi_fleet_error_handling(
+            fleet=fleet, error_key=Fleet.EsiError.FC_CHANGED_FLEET
+        )
+        return
 
-    esi_fleet = {"is_free_move": free_move, "motd": motd}
-    esi.client.Fleets.put_fleets_fleet_id(
-        fleet_id=fleet_id, token=token.valid_access_token(), new_settings=esi_fleet
-    ).result()
+    # Check if we deal with the fleet boss here
+    try:
+        _ = esi.client.Fleets.get_fleets_fleet_id_members(
+            fleet_id=fleet.fleet_id,
+            token=esi_fleet["token"].valid_access_token(),
+        ).result()
+    except Exception:  # pylint: disable=broad-exception-caught
+        _esi_fleet_error_handling(fleet=fleet, error_key=Fleet.EsiError.NOT_FLEETBOSS)
 
 
 @shared_task
-def send_fleet_invitation(character_ids, fleet_id):
+def send_fleet_invitation(fleet_id: int, character_ids: list) -> None:
     """
-    Send a fleet invitation through the eve client
-
-    :param character_ids:
-    :param fleet_id:
+    Send fleet invitations to characters through ESI
+    This task sends fleet invitations to a list of character IDs using the ESI API.
+
+    :param fleet_id: The ID of the fleet to which invitations are sent
+    :type fleet_id: int
+    :param character_ids: List of character IDs to invite to the fleet
+    :type character_ids: list[int]
+    :return: None
+    :rtype: None
     """
 
     required_scopes = ["esi-fleets.write_fleet.v1"]
@@ -298,95 +246,134 @@ def send_fleet_invitation(character_ids, fleet_id):
     fleet_commander_token = Token.get_token(
         character_id=fleet.fleet_commander.character_id, scopes=required_scopes
     )
-    _processes = []
 
     with ThreadPoolExecutor(max_workers=50) as ex:
-        for _character_id in character_ids:
-            _processes.append(
-                ex.submit(
-                    _send_invitation,
-                    character_id=_character_id,
-                    fleet_commander_token=fleet_commander_token,
-                    fleet_id=fleet_id,
-                )
+        futures = [
+            ex.submit(
+                _send_invitation,
+                character_id=character_id,
+                fleet_commander_token=fleet_commander_token,
+                fleet_id=fleet_id,
             )
+            for character_id in character_ids
+        ]
 
-    for item in as_completed(_processes):
-        _ = item.result()
+        for future in as_completed(futures):
+            future.result()  # This will raise any exceptions that occurred
 
 
 @shared_task(**{**TASK_DEFAULT_KWARGS}, **{"base": QueueOnce})
-def check_fleet_adverts():
+def check_fleet_adverts() -> None:
     """
-    Scheduled task :: Check for fleets adverts
+    Check all registered fleets and process them
+
+    :return: None
+    :rtype: None
     """
 
     fleets = Fleet.objects.all()
-    fleet_count = fleets.count()
 
-    processing_text = "Processing..." if fleet_count > 0 else "Nothing to do..."
+    if not fleets.exists():
+        logger.info("No registered fleets found. Nothing to do...")
+
+        return
 
-    logger.info(msg=f"{fleet_count} registered fleets found. {processing_text}")
+    logger.info(f"Processing {fleets.count()} registered fleets...")
 
-    if fleet_count > 0:
-        # Abort if ESI seems to be offline or above the error limit
-        if not fetch_esi_status().is_ok:
-            logger.warning(
-                msg="ESI doesn't seem to be available at this time. Aborting."
-            )
+    # Abort if ESI seems to be offline or above the error limit
+    if not fetch_esi_status().is_ok:
+        logger.warning("ESI doesn't seem to be available at this time. Aborting.")
 
-            return
+        return
 
-        for fleet in fleets:
-            _process_fleet(fleet=fleet)
+    for fleet in fleets:
+        _process_fleet(fleet=fleet)
 
 
 @shared_task
-def get_fleet_composition(fleet_id):
+def get_fleet_composition(  # pylint: disable=too-many-locals
+    fleet_id: int,
+) -> FleetViewAggregate | None:
     """
-    Getting the fleet composition
+    Get the composition of a fleet by its ID
+    This task retrieves the composition of a fleet using its ESI ID.
 
-    :param fleet_id:
-    :return:
+    :param fleet_id: The ESI ID of the fleet to retrieve
+    :type fleet_id:  int
+    :return: FleetViewAggregate containing fleet members and aggregate data
+    :rtype: FleetViewAggregate | None
     """
 
-    required_scopes = ["esi-fleets.read_fleet.v1", "esi-fleets.write_fleet.v1"]
-    fleet = Fleet.objects.get(fleet_id=fleet_id)
-    token = Token.get_token(
-        character_id=fleet.fleet_commander.character_id, scopes=required_scopes
-    )
-    fleet_infos = esi.client.Fleets.get_fleets_fleet_id_members(
-        fleet_id=fleet_id, token=token.valid_access_token()
-    ).result()
+    try:
+        fleet = Fleet.objects.get(fleet_id=fleet_id)
+    except Fleet.DoesNotExist:
+        logger.error(f"Fleet with ID {fleet_id} not found")
 
-    characters = {}
-    systems = {}
-    ship_type = {}
+        return None
 
-    for member in fleet_infos:
-        characters[member["character_id"]] = ""
-        systems[member["solar_system_id"]] = ""
-        ship_type[member["ship_type_id"]] = ""
+    logger.info(
+        f'Getting fleet composition for fleet "{fleet.name}" '
+        f"of {fleet.fleet_commander.character_name} (ESI ID: {fleet_id})"
+    )
 
-    ids = []
-    ids.extend(list(characters.keys()))
-    ids.extend(list(systems.keys()))
-    ids.extend(list(ship_type.keys()))
+    required_scopes = ["esi-fleets.read_fleet.v1"]
 
-    ids_to_name = esi.client.Universe.post_universe_names(ids=ids).result()
+    try:
+        token = Token.get_token(
+            character_id=fleet.fleet_commander.character_id, scopes=required_scopes
+        )
 
-    for member in fleet_infos:
-        index_character = [x["id"] for x in ids_to_name].index(member["character_id"])
-        member["character_name"] = ids_to_name[index_character]["name"]
+        fleet_infos = esi.client.Fleets.get_fleets_fleet_id_members(
+            fleet_id=fleet_id, token=token.valid_access_token()
+        ).result()
 
-        index_solar_system = [x["id"] for x in ids_to_name].index(
-            member["solar_system_id"]
+        # Get all unique IDs and fetch names in one call
+        all_ids = {
+            item_id
+            for member in fleet_infos
+            for item_id in [
+                member["character_id"],
+                member["solar_system_id"],
+                member["ship_type_id"],
+            ]
+        }
+
+        logger.debug(
+            f"Found {len(all_ids)} unique IDs to fetch names for in fleet {fleet_id}"
         )
-        member["solar_system_name"] = ids_to_name[index_solar_system]["name"]
 
-        index_ship_type = [x["id"] for x in ids_to_name].index(member["ship_type_id"])
-        member["ship_type_name"] = ids_to_name[index_ship_type]["name"]
+        # Process IDs in chunks to avoid ESI limits
+        chunk_size = 500
+        ids_to_name = []
+        all_ids_list = list(all_ids)
+
+        for i in range(0, len(all_ids_list), chunk_size):
+            chunk = all_ids_list[i : i + chunk_size]
+            chunk_result = esi.client.Universe.post_universe_names(ids=chunk).result()
+
+            ids_to_name.extend(chunk_result)
+
+        # Create a lookup dictionary for names
+        name_lookup = {item["id"]: item["name"] for item in ids_to_name}
+
+        # Add additional information to each fleet member
+        for member in fleet_infos:
+            is_fleet_boss = member["character_id"] == fleet.fleet_commander.character_id
+
+            member.update(
+                {
+                    "character_name": name_lookup[member["character_id"]],
+                    "solar_system_name": name_lookup[member["solar_system_id"]],
+                    "ship_type_name": name_lookup[member["ship_type_id"]],
+                    "is_fleet_boss": is_fleet_boss,
+                }
+            )
+
+        aggregate = _get_fleet_aggregate(fleet_infos=fleet_infos)
+
+        return FleetViewAggregate(fleet=fleet_infos, aggregate=aggregate)
 
-    aggregate = _get_fleet_aggregate(fleet_infos=fleet_infos)
+    except Exception as e:  # pylint: disable=broad-exception-caught
+        logger.error(f"Failed to get fleet composition for fleet {fleet_id}: {e}")
 
-    return FleetViewAggregate(fleet=fleet_infos, aggregate=aggregate)
+        return None

fleetfinder/templates/fleetfinder/bundles/js/fleetfinder-js.html

@@ -0,0 +1,3 @@
+{% load sri %}
+
+{% sri_static "fleetfinder/js/fleetfinder.min.js" %}