aa-fleetfinder 2.6.1__py3-none-any.whl → 2.7.1__py3-none-any.whl

fleetfinder/views.py

@@ -2,17 +2,22 @@
 Views
 """
 
+# Standard Library
+import json
+
 # Third Party
 from bravado.exception import HTTPNotFound
 
 # Django
 from django.contrib import messages
 from django.contrib.auth.decorators import login_required, permission_required
+from django.core.handlers.wsgi import WSGIRequest
 from django.db.models import Q
 from django.http import JsonResponse
 from django.shortcuts import redirect, render
 from django.urls import reverse
 from django.utils import timezone
+from django.utils.functional import Promise
 from django.utils.safestring import mark_safe
 from django.utils.translation import gettext_lazy as _
 
@@ -101,6 +106,54 @@ def ajax_dashboard(request) -> JsonResponse:  # pylint: disable=too-many-locals
     :return:
     """
 
+    def _create_button_style_link(
+        url: str, fa_icon_class: str, btn_title: str | Promise, btn_modifier_class: str
+    ) -> str:
+        """
+        Helper function to create a button HTML string
+        This function generates an HTML anchor tag styled as a button with an icon.
+
+        :param url: The URL the button should link to
+        :type url: str
+        :param fa_icon_class: The Font Awesome class for the icon to be displayed
+        :type fa_icon_class: str
+        :param btn_title: The title attribute for the button, typically a translation string
+        :type btn_title: str | Promise
+        :param btn_modifier_class: The Bootstrap modifier class for the button styling
+        :type btn_modifier_class: str
+        :return: An HTML string representing the button
+        :rtype: str
+        """
+
+        return (
+            f'<a href="{url}" class="btn btn-sm {btn_modifier_class} ms-1" '
+            f'data-bs-tooltip="aa-fleetfinder" title="{btn_title}">'
+            f'<i class="{fa_icon_class}"></i></a>'
+        )
+
+    def _get_fleet_commander_information(fleet: Fleet) -> tuple[str, str]:
+        """
+        Helper function to get the fleet commander's HTML representation
+        This function retrieves the fleet commander's name and portrait URL,
+        and returns an HTML string with the portrait image and name.
+
+        :param fleet: The Fleet object containing the fleet commander's information
+        :type fleet: Fleet
+        :return: A tuple containing the HTML string for the fleet commander and the name for sorting
+        :rtype: tuple[str, str]
+        """
+
+        commander_name = fleet.fleet_commander.character_name
+        portrait_url = character_portrait_url(
+            character_id=fleet.fleet_commander.character_id, size=32
+        )
+        portrait_img = (
+            '<img class="rounded eve-character-portrait" '
+            f'src="{portrait_url}" alt="{commander_name}" loading="lazy">'
+        )
+
+        return portrait_img + commander_name, commander_name
+
     data = []
     groups = request.user.groups.all()
     user_characters = get_all_characters_from_user(user=request.user)
@@ -114,47 +167,39 @@ def ajax_dashboard(request) -> JsonResponse:  # pylint: disable=too-many-locals
         .order_by("name")
     )
 
-    for fleet in fleets:
-        fleet_commander_name = fleet.fleet_commander.character_name
-        fleet_commander_portrait_url = character_portrait_url(
-            character_id=fleet.fleet_commander.character_id, size=32
-        )
-        fleet_commander_portrait = (
-            '<img class="rounded eve-character-portrait" '
-            f'src="{fleet_commander_portrait_url}" '
-            f'alt="{fleet_commander_name}" loading="lazy">'
-        )
-        fleet_commander_html = fleet_commander_portrait + fleet_commander_name
+    can_manage_fleets = request.user.has_perm("fleetfinder.manage_fleets")
 
-        button_join_url = reverse(
-            viewname="fleetfinder:join_fleet", args=[fleet.fleet_id]
-        )
-        button_join_text = _("Join fleet")
-        button_join = (
-            f'<a href="{button_join_url}" '
-            f'class="btn btn-sm btn-primary">{button_join_text}</a>'
+    for fleet in fleets:
+        fleet_commander_html, fleet_commander_name = _get_fleet_commander_information(
+            fleet
         )
 
-        button_details = ""
-        button_edit = ""
-
-        if request.user.has_perm(perm="fleetfinder.manage_fleets"):
-            button_details_url = reverse(
-                viewname="fleetfinder:fleet_details", args=[fleet.fleet_id]
-            )
-            button_details_text = _("View fleet details")
-            button_details = (
-                f'<a href="{button_details_url}" '
-                f'class="btn btn-sm btn-primary">{button_details_text}</a>'
-            )
-
-            button_edit_url = reverse(
-                viewname="fleetfinder:edit_fleet", args=[fleet.fleet_id]
+        # Create buttons
+        buttons = [
+            _create_button_style_link(
+                reverse("fleetfinder:join_fleet", args=[fleet.fleet_id]),
+                "fa-solid fa-right-to-bracket",
+                _("Join fleet"),
+                "btn-success",
             )
-            button_edit_text = _("Edit fleet advert")
-            button_edit = (
-                f'<a href="{button_edit_url}" '
-                f'class="btn btn-sm btn-primary">{button_edit_text}</a>'
+        ]
+
+        if can_manage_fleets:
+            buttons.extend(
+                [
+                    _create_button_style_link(
+                        reverse("fleetfinder:fleet_details", args=[fleet.fleet_id]),
+                        "fa-solid fa-eye",
+                        _("View fleet details"),
+                        "btn-info",
+                    ),
+                    _create_button_style_link(
+                        reverse("fleetfinder:edit_fleet", args=[fleet.fleet_id]),
+                        "fa-solid fa-pen-to-square",
+                        _("Edit fleet advert"),
+                        "btn-warning",
+                    ),
+                ]
             )
 
         data.append(
@@ -165,9 +210,7 @@ def ajax_dashboard(request) -> JsonResponse:  # pylint: disable=too-many-locals
                 },
                 "fleet_name": fleet.name,
                 "created_at": fleet.created_at,
-                "join": button_join,
-                "details": button_details,
-                "edit": button_edit,
+                "actions": "".join(buttons),
             }
         )
 
@@ -419,9 +462,25 @@ def fleet_details(request, fleet_id):
     :return:
     """
 
-    context = {"fleet_id": fleet_id}
+    try:
+        fleet = Fleet.objects.get(fleet_id=fleet_id)
+    except Fleet.DoesNotExist:
+        logger.debug(f"Fleet with ID {fleet_id} does not exist.")
 
-    logger.info(msg=f"Fleet {fleet_id} details view called by {request.user}")
+        messages.error(
+            request,
+            mark_safe(
+                _(
+                    "<h4>Error!</h4><p>Fleet does not exist or is no longer available.</p>"
+                )
+            ),
+        )
+
+        return redirect("fleetfinder:dashboard")
+
+    context = {"fleet": fleet}
+
+    logger.info(msg=f"Fleet {fleet.fleet_id} details view called by {request.user}")
 
     return render(
         request=request,
@@ -433,8 +492,7 @@ def fleet_details(request, fleet_id):
 @login_required()
 @permission_required(perm="fleetfinder.manage_fleets")
 def ajax_fleet_details(
-    request,  # pylint: disable=unused-argument
-    fleet_id,
+    request, fleet_id  # pylint: disable=unused-argument
 ) -> JsonResponse:
     """
     Ajax :: Fleet Details
@@ -443,7 +501,20 @@ def ajax_fleet_details(
     :param fleet_id:
     """
 
-    fleet = get_fleet_composition(fleet_id)
+    try:
+        fleet = get_fleet_composition(fleet_id)
+    except Fleet.DoesNotExist:
+        logger.debug(f"Fleet with ID {fleet_id} does not exist.")
+
+        return JsonResponse(
+            data={"error": _(f"Fleet with ID {fleet_id} does not exist.")}, safe=False
+        )
+    except RuntimeError as ex:
+        logger.debug(f"Error retrieving fleet composition: {ex}", exc_info=True)
+
+        return JsonResponse(
+            data={"error": _(f"Error retrieving fleet composition: {ex}")}, safe=False
+        )
 
     data = {
         "fleet_member": list(fleet.fleet),
@@ -454,3 +525,60 @@ def ajax_fleet_details(
     }
 
     return JsonResponse(data=data, safe=False)
+
+
+@login_required()
+@permission_required(perm="fleetfinder.manage_fleets")
+def ajax_fleet_kick_member(request: WSGIRequest, fleet_id: int) -> JsonResponse:
+    """
+    Ajax :: Kick member from fleet
+
+    :param request: WSGIRequest object containing the request data
+    :type request: WSGIRequest
+    :param fleet_id: The ID of the fleet from which to kick a member
+    :type fleet_id: int
+    :return: JsonResponse indicating success or failure of the operation
+    :rtype: JsonResponse
+    """
+
+    if request.method != "POST":
+        return JsonResponse(
+            data={"success": False, "error": _("Method not allowed")}, status=405
+        )
+
+    try:
+        fleet = Fleet.objects.get(fleet_id=fleet_id)
+        data = json.loads(request.body)
+        member_id = data.get("memberId")
+
+        if not member_id:
+            return JsonResponse(
+                data={"success": False, "error": _("Member ID required")}, status=400
+            )
+
+        logger.debug(f"Request data for kicking member: {data}")
+
+        token = Token.get_token(
+            character_id=fleet.fleet_commander.character_id,
+            scopes=["esi-fleets.write_fleet.v1"],
+        )
+
+        esi.client.Fleets.delete_fleets_fleet_id_members_member_id(
+            fleet_id=fleet_id,
+            member_id=member_id,
+            token=token.valid_access_token(),
+        ).result()
+
+        return JsonResponse(data={"success": True}, status=200)
+    except Fleet.DoesNotExist:
+        return JsonResponse(
+            data={"success": False, "error": _("Fleet not found")}, status=404
+        )
+    except (json.JSONDecodeError, ValueError):
+        return JsonResponse(
+            data={"success": False, "error": _("Invalid request data")}, status=400
+        )
+    except HTTPNotFound:
+        return JsonResponse(
+            data={"success": False, "error": _("Member not found in fleet")}, status=404
+        )

aa_fleetfinder-2.6.1.dist-info/RECORD

@@ -1,75 +0,0 @@
-fleetfinder/__init__.py,sha256=JOGpcCpLD-GH6uOgcCzYiaay2kV7Ij5QgJW0CjIe_CI,415
-fleetfinder/app_settings.py,sha256=XE5oZFg2Vhn5OYQFehoOwjgVgKAvXcyj5NGmrbr3bk8,261
-fleetfinder/apps.py,sha256=5t6R6HS_2cK3oCtTomvOM0dagt4sQkbnIWBhxT8dHrw,448
-fleetfinder/auth_hooks.py,sha256=_oHqIEfTFDB1lsVAOrEGCc6aLiLpRtjcPw7CdLNSdKw,1234
-fleetfinder/models.py,sha256=MEqsa-gRzFlCoU5awPwlLUzJ_2A2sNo9cPtfT-hVCNU,2805
-fleetfinder/providers.py,sha256=Je9FZvALV1ARn_34yllhztl5nG3tT7y1ri7utFHwO_o,298
-fleetfinder/tasks.py,sha256=iVPqv_LLHVyZ_th7CGgt9K4HqWLiDJ7VbZwTP4hdtG0,9915
-fleetfinder/urls.py,sha256=oL6zOnvQaGXFp-mOhsL9C_jU16YSPMAXUBM8s2_m4_U,1128
-fleetfinder/views.py,sha256=PdzaKqYB-zFtEHWrxxre9cvgEtkU3O9UQsK6cqpBjfo,13247
-fleetfinder/locale/django.pot,sha256=r2Ongkp6aH3AGxGtwBdwhtco7FwpKN_Css5-NQmbRZI,6027
-fleetfinder/locale/cs_CZ/LC_MESSAGES/django.mo,sha256=5R9bbNXwdd02SL7SFFIErS-ytrzIyCYPf0VZOtg9KT8,954
-fleetfinder/locale/cs_CZ/LC_MESSAGES/django.po,sha256=ZcCMF7Wg79KKAyHl3TQZ-1Xfw1K_Bo1FoiGdSyxImgc,6407
-fleetfinder/locale/de/LC_MESSAGES/django.mo,sha256=UVkUJUU9Pzh1WATNNE5RerVTqoQ4zM5JXgMJu7kG2B4,4328
-fleetfinder/locale/de/LC_MESSAGES/django.po,sha256=ofWY4mLnXdGIWEYAT587LNoRFRekX1GJ6cbGcU8qpbU,7748
-fleetfinder/locale/es/LC_MESSAGES/django.mo,sha256=mcwRf6XMLVJDJ5wAkCOtwV7rqf_BkgZqBUY6p026kaI,3648
-fleetfinder/locale/es/LC_MESSAGES/django.po,sha256=tvyjlGxlw3E0ClfvGtz8uBUnCYfYtJnlNjaL0nYlDXE,7819
-fleetfinder/locale/fr_FR/LC_MESSAGES/django.mo,sha256=YRnYDqb5xhNh94JmtVjqu2Ge6w0RifUrfYFfj0flgbE,2543
-fleetfinder/locale/fr_FR/LC_MESSAGES/django.po,sha256=nD8ZsdA5s2AngZalECTnuSPY6JFyw8QUogHqcDd0IHc,7205
-fleetfinder/locale/it_IT/LC_MESSAGES/django.mo,sha256=T8RDYnDQ22o4_xxwcmq3znMN5QKlZbty-mWB7dxdEbI,588
-fleetfinder/locale/it_IT/LC_MESSAGES/django.po,sha256=3T0Gx35bxN04bm_zJFmAN4Cum3tIHxwGEMBefjxahms,6231
-fleetfinder/locale/ja/LC_MESSAGES/django.mo,sha256=5mlXpXBHCUM4QNz2hzagZSgJeR-QJIzEEBPxXzGN64I,1579
-fleetfinder/locale/ja/LC_MESSAGES/django.po,sha256=tMpDfTgXfVjA1Zlm_afLaBlKdDQ-YrLewqt5OS1rp5E,6695
-fleetfinder/locale/ko_KR/LC_MESSAGES/django.mo,sha256=9cfJWD33X_4WYSaFyGZIMzBtUgbmpU0-rkU5vdVRiTI,3272
-fleetfinder/locale/ko_KR/LC_MESSAGES/django.po,sha256=O9pQ2nG5Z7-RlcqBXmtgw8TedLt4KCE4JxROMDfb3c4,8144
-fleetfinder/locale/nl_NL/LC_MESSAGES/django.mo,sha256=hY0OE4OeTR2OJEImNcsL8tWjBqe0rJYToAlRXZ44ngA,480
-fleetfinder/locale/nl_NL/LC_MESSAGES/django.po,sha256=AneS1YGgS8ZmwAreBqpGDlS3b8cJYCfchfG3sarvRxA,6149
-fleetfinder/locale/pl_PL/LC_MESSAGES/django.mo,sha256=Tn664mvAzrylWiO5ferY3XeQuZTRuND77MPmgAZSvZs,1008
-fleetfinder/locale/pl_PL/LC_MESSAGES/django.po,sha256=kR2ZzURcaOYNZ_ZMO6i1G3mu3nVjlsCpk2qR3PyvB7A,6439
-fleetfinder/locale/ru/LC_MESSAGES/django.mo,sha256=nphsjOteZ0-rwwH52Jovk4Jy1ouz-9Wo-7WC6_Bmc_k,4716
-fleetfinder/locale/ru/LC_MESSAGES/django.po,sha256=jIJFmtU-8ZvF5rDEZLYeR_zOf6YhtnbhjJfYvCgIl4E,8765
-fleetfinder/locale/sk/LC_MESSAGES/django.mo,sha256=ydYhRqhAuhtbbNwWz_TkLnphHfGgKDcKugeyLxmpZWk,559
-fleetfinder/locale/sk/LC_MESSAGES/django.po,sha256=yQ1aIRfm6J8i4adgeYUQvx7gMO56E0G8vYITh3B_CLQ,6224
-fleetfinder/locale/uk/LC_MESSAGES/django.mo,sha256=NfWLKGzF2U1WHI_R5OjskcPta-uVhTE6sDwCyi3pSyc,4697
-fleetfinder/locale/uk/LC_MESSAGES/django.po,sha256=BV0LM1BrzaPq5FDhdnAs2BaeR2KAInGSaK0yLH4ZcBI,8844
-fleetfinder/locale/zh_Hans/LC_MESSAGES/django.mo,sha256=3tiyQVoDtsbjyYPetn2m9kG5lBB0c_7HyZhzhENsbWs,3624
-fleetfinder/locale/zh_Hans/LC_MESSAGES/django.po,sha256=mr-3VOcDuBfDbZU1QPgqA6DXzcWQrI9DU9b2YF0PGCU,7603
-fleetfinder/migrations/0001_initial.py,sha256=4Jsjh77PXS87OHBHam8KOFSTaRvlS-qpPmD5vNnVagI,2445
-fleetfinder/migrations/0002_esi_error_handling_and_verbose_names.py,sha256=CqOqsJDz-GFj3E6DwShKf0fUIgEKhd4NMJIfu21eEJ0,3229
-fleetfinder/migrations/0003_alter_fleet_fleet_commander_alter_fleet_groups_and_more.py,sha256=RbjYRrPVTq-adUQPbXpXVRAT2VmOW0wEdacWhxlggX4,1606
-fleetfinder/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-fleetfinder/static/fleetfinder/css/fleetfinder.css,sha256=vEH1tqeXdaxBXdcIoumkkeKO0yiDx4QCV1b6ABTIq9s,220
-fleetfinder/static/fleetfinder/css/fleetfinder.min.css,sha256=LCv69fVoF30tzjHWh-5n6zjzxntbLr72pGZBMvfef9Y,214
-fleetfinder/static/fleetfinder/css/fleetfinder.min.css.map,sha256=aJugfXCEpodHUPdC4pC1kqgHjpowmYKZ-S2eEuUpBE4,391
-fleetfinder/static/fleetfinder/libs/slim-select/2.6.0/css/slimselect.css,sha256=zTRZNeH78b45F2ziMIyO0CTeDBkD6bOoyDLJpl3RvIg,11846
-fleetfinder/static/fleetfinder/libs/slim-select/2.6.0/css/slimselect.min.css,sha256=GYCm-lR2rkNgRBBlPnK6B6q5DAve2IGBCCcJg-7Zpy0,9397
-fleetfinder/static/fleetfinder/libs/slim-select/2.6.0/css/slimselect.min.css.map,sha256=_6vjeCQxnhz-ZLaVJ3-0a3x7xY2N82z45xLZyRPuoUw,14992
-fleetfinder/static/fleetfinder/libs/slim-select/2.6.0/js/slimselect.min.js,sha256=SbN31KIE-T0-x8Th6Ui6QWM7c8lsGb3_q-RzUd9Ga9I,36199
-fleetfinder/templates/fleetfinder/base.html,sha256=jtUSpk3VABhqp0xJKdDKKgpHa4Iwl1T9nQFenV7yDds,834
-fleetfinder/templates/fleetfinder/create-fleet.html,sha256=zkVw_qLFw5BvrlrayUKmZB19v5PkGVqVt7rVEl-rKzc,1196
-fleetfinder/templates/fleetfinder/dashboard.html,sha256=-65xAKhKpJNnBSsfBr7QuHfzNxuwqwgltKvxV5s2X8Y,5753
-fleetfinder/templates/fleetfinder/edit-fleet.html,sha256=XahECF3ZJKTiAr8oNp7bqbIHjACpfxi1_mIhXP1XIvY,1206
-fleetfinder/templates/fleetfinder/fleet-details.html,sha256=-jPoaInabNpCQiBPFoTBCUtS38drBc09-F12_ugqb14,4795
-fleetfinder/templates/fleetfinder/join-fleet.html,sha256=mn_B8o5MUlG4UYvFajoGaGmtTbQDJiYIZa-LsSmer50,2000
-fleetfinder/templates/fleetfinder/bundles/css/fleetfinder-css.html,sha256=qwygOlxlL_346BHPBNU8KZhNFdJKmOXx81zSsDIKbjk,71
-fleetfinder/templates/fleetfinder/bundles/css/slim-select-css.html,sha256=i_aZCBfN7XVHEcXycjQDvmt1kVYwDw_5QobTW1jYcwA,93
-fleetfinder/templates/fleetfinder/bundles/js/slim-select-js.html,sha256=1IAeWgMkHrbVbhwSBOekt7NfFc8y4LvKh2OqXQmu940,91
-fleetfinder/templates/fleetfinder/partials/body/form-fleet-details.html,sha256=o5HUU2YvcgDE8OTz1xU_hIRPeU3o23vGMog7RW-6Fd4,2183
-fleetfinder/templates/fleetfinder/partials/footer/app-translation-footer.html,sha256=nDZPOnsQLBN9meAhxnhd0ynUQIVi3YPzhi47n89zcIg,422
-fleetfinder/templates/fleetfinder/partials/header/header-nav-left.html,sha256=l9GUryGNYZjfej_SKa_wg2aQZE5ybPBFz21dgGixcwk,287
-fleetfinder/templates/fleetfinder/partials/header/header-nav-right.html,sha256=o8njJMpjCG0W9O_fP-NNOM1Mi1gUl7fARV1XTXrJXCI,575
-fleetfinder/templatetags/__init__.py,sha256=sP2D1ovt2gGAPLcGQkByRgXYhvUJ6C52mZMlLIALQ8s,37
-fleetfinder/templatetags/fleetfinder.py,sha256=I_pLRgCPS6MYdzvsLZL0quNTor_BNz_2125DnpvqbFE,717
-fleetfinder/tests/__init__.py,sha256=NLuMBNDHYOXDmPgpyG-g_kDaATVQWv1iC-dJ8BA1kZc,29
-fleetfinder/tests/test_access.py,sha256=rQAfeEre2CmCszFTLV_53HK7m5Odq7ZqACJ3kcedgjk,1691
-fleetfinder/tests/test_auth_hooks.py,sha256=XEB0LJmxxJCDlYhxKzcRiEHYrn1k_NkShrDGV_bcweg,2174
-fleetfinder/tests/test_settings.py,sha256=CuarOzsrkoMx7dmqolsnhnuhis7N10GaOULo6KYIl7k,710
-fleetfinder/tests/test_tasks.py,sha256=b8f0tJ5pouhKdHXoyK4uPCGmqHVvsJOyvrkiJE6cznc,3986
-fleetfinder/tests/test_templatetags.py,sha256=lIe1X0TCuFwWcgsqZw4VGQLgqMsqEjNbPwqhtD8c4Qk,1414
-fleetfinder/tests/test_user_agent.py,sha256=sqKr_2IXoqULgqmFqoNV8fUR2Xv9QkA7On0Ae0FRuM8,1003
-fleetfinder/tests/test_views.py,sha256=LMDJCZErBSUM_CItbi0GJ8psQIINfySAGTElVoNPwkg,14165
-fleetfinder/tests/utils.py,sha256=ynwH67jb14UFi6hpLAXe_FcYdQcjET_sxuUylWPNpnk,1451
-aa_fleetfinder-2.6.1.dist-info/METADATA,sha256=RTql0Ev7xtC4XEbgSw-YDwEYNRI-YTZOhfIhvrqqkgw,48096
-aa_fleetfinder-2.6.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-aa_fleetfinder-2.6.1.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-aa_fleetfinder-2.6.1.dist-info/RECORD,,