aa-structures 2.16.0__tar.gz → 3.0.0__tar.gz

{aa_structures-2.16.0 → aa_structures-3.0.0}/PKG-INFO

@@ -1,13 +1,12 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: aa-structures
-Version: 2.16.0
+Version: 3.0.0
 Summary: App for managing Eve Online structures with Alliance Auth.
 Author-email: Erik Kalkoken <kalkoken87@gmail.com>
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 Classifier: Environment :: Web Environment
 Classifier: Framework :: Django
-Classifier: Framework :: Django :: 4.0
 Classifier: Framework :: Django :: 4.2
 Classifier: Intended Audience :: End Users/Desktop
 Classifier: License :: OSI Approved :: MIT License
@@ -17,10 +16,12 @@ Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
 Classifier: Topic :: Internet :: WWW/HTTP
 Classifier: Topic :: Internet :: WWW/HTTP :: Dynamic Content
+License-File: LICENSE
 Requires-Dist: allianceauth-app-utils>=1.22
-Requires-Dist: allianceauth>=3.0
+Requires-Dist: allianceauth>=4
 Requires-Dist: dhooks-lite>=1.0
 Requires-Dist: django-eveuniverse>=1.5.2
 Requires-Dist: django-multiselectfield

{aa_structures-2.16.0 → aa_structures-3.0.0}/pyproject.toml

@@ -12,7 +12,6 @@ authors = [{ name = "Erik Kalkoken", email = "kalkoken87@gmail.com" }]
 classifiers = [
     "Environment :: Web Environment",
     "Framework :: Django",
-    "Framework :: Django :: 4.0",
     "Framework :: Django :: 4.2",
     "Intended Audience :: End Users/Desktop",
     "License :: OSI Approved :: MIT License",
@@ -22,12 +21,13 @@ classifiers = [
     "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.12",
     "Topic :: Internet :: WWW/HTTP",
     "Topic :: Internet :: WWW/HTTP :: Dynamic Content",
 ]
 dependencies = [
     "allianceauth-app-utils>=1.22",
-    "allianceauth>=3.0",
+    "allianceauth>=4",
     "dhooks-lite>=1.0",
     "django-eveuniverse>=1.5.2",
     "django-multiselectfield",

{aa_structures-2.16.0 → aa_structures-3.0.0}/structures/__init__.py

@@ -3,5 +3,5 @@
 # pylint: disable = invalid-name
 default_app_config = "structures.apps.StructuresConfig"
 
-__version__ = "2.16.0"
+__version__ = "3.0.0"
 __title__ = "Structures"

{aa_structures-2.16.0 → aa_structures-3.0.0}/structures/core/notification_embeds/corporate_embeds.py

@@ -157,3 +157,61 @@ class NotificationCharLeftCorpMsg(NotificationCorpCharEmbed):
             "corporation_name": self._corporation_link,
         }
         self._color = Webhook.Color.INFO
+
+
+class NotificationCorpGoalEmbed(NotificationBaseEmbed):
+    def __init__(self, notification: Notification) -> None:
+        super().__init__(notification)
+        self._creator = get_or_create_eve_entity(id=self._data["creator_id"])
+        self._creator_link = gen_eve_entity_link(self._creator)
+        self._corporation = get_or_create_eve_entity(id=self._data["corporation_id"])
+        self._goal_name = self._data["goal_name"]
+        self._thumbnail = dhooks_lite.Thumbnail(
+            self._corporation.icon_url(size=self.ICON_DEFAULT_SIZE)
+        )
+
+
+class NotificationCorpGoalClosed(NotificationCorpGoalEmbed):
+    def __init__(self, notification: Notification) -> None:
+        super().__init__(notification)
+        self._title = _("Project canceled")
+        closer = get_or_create_eve_entity(id=self._data["closer_id"])
+        self._description = _(
+            "Project **%(goal_name)s** has ben closed by %(closer)s "
+            "and will not accept further contributions."
+            % {
+                "goal_name": self._goal_name,
+                "closer": gen_eve_entity_link(closer),
+            }
+        )
+        self._color = Webhook.Color.INFO
+
+
+class NotificationCorpGoalCompleted(NotificationCorpGoalEmbed):
+    def __init__(self, notification: Notification) -> None:
+        super().__init__(notification)
+        self._title = _("Project completed")
+        self._description = _(
+            "Project **%(goal_name)s** created by %(creator)s "
+            "has been successfully completed after reaching it's target."
+            % {
+                "goal_name": self._goal_name,
+                "creator": self._creator_link,
+            }
+        )
+        self._color = Webhook.Color.SUCCESS
+
+
+class NotificationCorpGoalCreated(NotificationCorpGoalEmbed):
+    def __init__(self, notification: Notification) -> None:
+        super().__init__(notification)
+        self._title = _("New Project Available")
+        self._description = _(
+            "Project **%(goal_name)s** has been created by %(creator)s "
+            "and is open for contributions."
+            % {
+                "goal_name": self._goal_name,
+                "creator": self._creator_link,
+            }
+        )
+        self._color = Webhook.Color.INFO

{aa_structures-2.16.0 → aa_structures-3.0.0}/structures/core/notification_embeds/main.py

@@ -1,4 +1,4 @@
-"""Billing embeds."""
+"""Dispatcher for all embeds."""
 
 # pylint: disable=missing-class-docstring
 
@@ -198,6 +198,9 @@ class NotificationBaseEmbed:
             NotificationCorpAppInvitedMsg,
             NotificationCorpAppNewMsg,
             NotificationCorpAppRejectCustomMsg,
+            NotificationCorpGoalClosed,
+            NotificationCorpGoalCompleted,
+            NotificationCorpGoalCreated,
         )
         from .moonmining_embeds import (
             NotificationMoonminningAutomaticFracture,
@@ -283,7 +286,7 @@ class NotificationBaseEmbed:
             NT.BILLING_CORP_ALL_BILL_MSG: NotificationCorpAllBillMsg,
             NT.BILLING_I_HUB_BILL_ABOUT_TO_EXPIRE: NotificationBillingIHubBillAboutToExpire,
             NT.BILLING_I_HUB_DESTROYED_BY_BILL_FAILURE: NotificationBillingIHubDestroyedByBillFailure,
-            # character
+            # Corporate
             NT.CHAR_APP_ACCEPT_MSG: NotificationCharAppAcceptMsg,
             NT.CHAR_APP_WITHDRAW_MSG: NotificationCharAppWithdrawMsg,
             NT.CHAR_LEFT_CORP_MSG: NotificationCharLeftCorpMsg,
@@ -291,6 +294,9 @@ class NotificationBaseEmbed:
             NT.CORP_APP_NEW_MSG: NotificationCorpAppNewMsg,
             NT.CORP_APP_REJECT_CUSTOM_MSG: NotificationCorpAppRejectCustomMsg,
             NT.CORP_APP_REJECT_MSG: NotificationCharAppRejectMsg,
+            NT.CORPORATION_GOAL_CLOSED: NotificationCorpGoalClosed,
+            NT.CORPORATION_GOAL_COMPLETED: NotificationCorpGoalCompleted,
+            NT.CORPORATION_GOAL_CREATED: NotificationCorpGoalCreated,
             # moonmining
             NT.MOONMINING_AUTOMATIC_FRACTURE: NotificationMoonminningAutomaticFracture,
             NT.MOONMINING_EXTRACTION_CANCELLED: NotificationMoonminningExtractionCanceled,

{aa_structures-2.16.0 → aa_structures-3.0.0}/structures/core/notification_types.py

@@ -11,61 +11,42 @@ from structures.app_settings import STRUCTURES_FEATURE_REFUELED_NOTIFICATIONS
 class NotificationType(models.TextChoices):
     """Definition of all supported notification types."""
 
-    # upwell structures
-    OWNERSHIP_TRANSFERRED = "OwnershipTransferred", _(
-        "Upwell structure ownership transferred"
-    )
-    STRUCTURE_ANCHORING = "StructureAnchoring", _("Upwell structure anchoring")
-    STRUCTURE_DESTROYED = "StructureDestroyed", _("Upwell structure destroyed")
-    STRUCTURE_FUEL_ALERT = "StructureFuelAlert", _("Upwell structure fuel alert")
-    STRUCTURE_JUMP_FUEL_ALERT = "StructureJumpFuelAlert", _(
-        "Upwell structure jump fuel alert"
-    )
-    STRUCTURE_LOST_ARMOR = "StructureLostArmor", _("Upwell structure lost armor")
-    STRUCTURE_LOST_SHIELD = "StructureLostShields", _("Upwell structure lost shields")
-    STRUCTURE_LOW_REAGENTS_ALERT = "StructureLowReagentsAlert", _(
-        "Structure low reagents alert"
-    )
-    STRUCTURE_NO_REAGENTS_ALERT = "StructureNoReagentsAlert", _(
-        "Structure no reagents alert"
-    )
-    STRUCTURE_ONLINE = "StructureOnline", _("Upwell structure went online")
-    STRUCTURE_REFUELED_EXTRA = "StructureRefueledExtra", _("Upwell structure refueled")
-    STRUCTURE_REINFORCEMENT_CHANGED = "StructuresReinforcementChanged", _(
-        "Upwell structure reinforcement time changed"
-    )
-    STRUCTURE_SERVICES_OFFLINE = "StructureServicesOffline", _(
-        "Upwell structure services went offline"
+    # billing
+    BILLING_BILL_OUT_OF_MONEY_MSG = "BillOutOfMoneyMsg", _("Bill out of money")
+    BILLING_CORP_ALL_BILL_MSG = "CorpAllBillMsg", _("Corp alliance billing message")
+    BILLING_I_HUB_BILL_ABOUT_TO_EXPIRE = (
+        "InfrastructureHubBillAboutToExpire",
+        _("I-HUB bill about to expire"),
     )
-    STRUCTURE_UNANCHORING = "StructureUnanchoring", _("Upwell structure unanchoring")
-    STRUCTURE_UNDER_ATTACK = "StructureUnderAttack", _(
-        "Upwell structure is under attack"
+    BILLING_I_HUB_DESTROYED_BY_BILL_FAILURE = (
+        "IHubDestroyedByBillFailure",
+        _("I_HUB destroyed by bill failure"),
     )
-    STRUCTURE_WENT_HIGH_POWER = "StructureWentHighPower", _(
-        "Upwell structure went high power"
+
+    # Corporation Membership
+    CHAR_APP_ACCEPT_MSG = "CharAppAcceptMsg", _("Character joins corporation")
+    CORP_APP_INVITED_MSG = "CorpAppInvitedMsg", _(
+        "Character invited to join corporation"
     )
-    STRUCTURE_WENT_LOW_POWER = "StructureWentLowPower", _(
-        "Upwell structure went low power"
+    CORP_APP_NEW_MSG = "CorpAppNewMsg", _("Character submitted application")
+    CORP_APP_REJECT_MSG = "CharAppRejectMsg", _("Corp application rejected message")
+    CORP_APP_REJECT_CUSTOM_MSG = "CorpAppRejectCustomMsg", _(
+        "Corp application rejected custom message"
     )
+    CHAR_APP_WITHDRAW_MSG = "CharAppWithdrawMsg", _("Character withdrew application")
+    CHAR_LEFT_CORP_MSG = "CharLeftCorpMsg", _("Character leaves corporation")
 
-    # Skyhook structures
-    SKYHOOK_DEPLOYED = "SkyhookDeployed", _("Skyhook deployed")
-    SKYHOOK_DESTROYED = "SkyhookDestroyed", _("Skyhook destroyed")
-    SKYHOOK_LOST_SHIELDS = "SkyhookLostShields", _("Skyhook lost shields")
-    SKYHOOK_ONLINE = "SkyhookOnline", _("Skyhook online")
-    SKYHOOK_UNDER_ATTACK = "SkyhookUnderAttack", _("Skyhook under attack")
-
-    # customs offices
-    ORBITAL_ATTACKED = "OrbitalAttacked", _("Customs office attacked")
-    ORBITAL_REINFORCED = "OrbitalReinforced", _("Customs office reinforced")
+    # Corporation Goals
+    CORPORATION_GOAL_CLOSED = "CorporationGoalClosed", _("Corporation goal closed")
+    CORPORATION_GOAL_COMPLETED = "CorporationGoalCompleted", _(
+        "Corporation goal completed"
+    )
+    CORPORATION_GOAL_CREATED = "CorporationGoalCreated", _("Corporation goal created")
+    # CORPORATION_GOAL_NAME_CHANGE = "CorporationGoalNameChange", _(
+    #     "Corporation goal name change"
+    # )
 
-    # starbases
-    TOWER_ALERT_MSG = "TowerAlertMsg", _("Starbase attacked")
-    TOWER_REFUELED_EXTRA = "TowerRefueledExtra", _("Starbase refueled (BETA)")
-    TOWER_REINFORCED_EXTRA = "TowerReinforcedExtra", _("Starbase reinforced (BETA)")
-    TOWER_RESOURCE_ALERT_MSG = "TowerResourceAlertMsg", _("Starbase fuel alert")
-
-    # moon mining
+    # Moon Mining
     MOONMINING_AUTOMATIC_FRACTURE = "MoonminingAutomaticFracture", _(
         "Moon mining automatic fracture triggered"
     )
@@ -80,7 +61,18 @@ class NotificationType(models.TextChoices):
     )
     MOONMINING_LASER_FIRED = "MoonminingLaserFired", _("Moonmining laser fired")
 
-    # sov
+    # Skyhook structures
+    SKYHOOK_DEPLOYED = "SkyhookDeployed", _("Skyhook deployed")
+    SKYHOOK_DESTROYED = "SkyhookDestroyed", _("Skyhook destroyed")
+    SKYHOOK_LOST_SHIELDS = "SkyhookLostShields", _("Skyhook lost shields")
+    SKYHOOK_ONLINE = "SkyhookOnline", _("Skyhook online")
+    SKYHOOK_UNDER_ATTACK = "SkyhookUnderAttack", _("Skyhook under attack")
+
+    # Orbitals
+    ORBITAL_ATTACKED = "OrbitalAttacked", _("Customs office attacked")
+    ORBITAL_REINFORCED = "OrbitalReinforced", _("Customs office reinforced")
+
+    # Sov
     SOV_ALL_CLAIM_ACQUIRED_MSG = "SovAllClaimAquiredMsg", _(
         "Sovereignty claim acknowledgment"  # SovAllClaimAquiredMsg [sic!]
     )
@@ -101,7 +93,50 @@ class NotificationType(models.TextChoices):
         "Sovereignty command node event started"
     )
 
-    # wars
+    # Starbases
+    TOWER_ALERT_MSG = "TowerAlertMsg", _("Starbase attacked")
+    TOWER_REFUELED_EXTRA = "TowerRefueledExtra", _("Starbase refueled (BETA)")
+    TOWER_REINFORCED_EXTRA = "TowerReinforcedExtra", _("Starbase reinforced (BETA)")
+    TOWER_RESOURCE_ALERT_MSG = "TowerResourceAlertMsg", _("Starbase fuel alert")
+
+    # Upwell Structures
+    OWNERSHIP_TRANSFERRED = "OwnershipTransferred", _(
+        "Upwell structure ownership transferred"
+    )
+    STRUCTURE_ANCHORING = "StructureAnchoring", _("Upwell structure anchoring")
+    STRUCTURE_DESTROYED = "StructureDestroyed", _("Upwell structure destroyed")
+    STRUCTURE_FUEL_ALERT = "StructureFuelAlert", _("Upwell structure fuel alert")
+    STRUCTURE_JUMP_FUEL_ALERT = "StructureJumpFuelAlert", _(
+        "Upwell structure jump fuel alert"
+    )
+    STRUCTURE_LOST_ARMOR = "StructureLostArmor", _("Upwell structure lost armor")
+    STRUCTURE_LOST_SHIELD = "StructureLostShields", _("Upwell structure lost shields")
+    STRUCTURE_LOW_REAGENTS_ALERT = "StructureLowReagentsAlert", _(
+        "Structure low reagents alert"
+    )
+    STRUCTURE_NO_REAGENTS_ALERT = "StructureNoReagentsAlert", _(
+        "Structure no reagents alert"
+    )
+    STRUCTURE_ONLINE = "StructureOnline", _("Upwell structure went online")
+    STRUCTURE_REFUELED_EXTRA = "StructureRefueledExtra", _("Upwell structure refueled")
+    STRUCTURE_REINFORCEMENT_CHANGED = "StructuresReinforcementChanged", _(
+        "Upwell structure reinforcement time changed"
+    )
+    STRUCTURE_SERVICES_OFFLINE = "StructureServicesOffline", _(
+        "Upwell structure services went offline"
+    )
+    STRUCTURE_UNANCHORING = "StructureUnanchoring", _("Upwell structure unanchoring")
+    STRUCTURE_UNDER_ATTACK = "StructureUnderAttack", _(
+        "Upwell structure is under attack"
+    )
+    STRUCTURE_WENT_HIGH_POWER = "StructureWentHighPower", _(
+        "Upwell structure went high power"
+    )
+    STRUCTURE_WENT_LOW_POWER = "StructureWentLowPower", _(
+        "Upwell structure went low power"
+    )
+
+    # Wars
     WAR_ACCEPTED_ALLY = "AcceptedAlly", _("War accepted ally")
     WAR_ALL_WAR_CORP_JOINED_ALLIANCE_MSG = "AllWarCorpJoinedAllianceMsg", _(
         "Alliance war corporation joined alliance message"
@@ -142,31 +177,6 @@ class NotificationType(models.TextChoices):
     )
     WAR_WAR_SURRENDER_OFFER_MSG = "WarSurrenderOfferMsg", _("War surrender offered")
 
-    # corporation membership
-    CHAR_APP_ACCEPT_MSG = "CharAppAcceptMsg", _("Character joins corporation")
-    CORP_APP_INVITED_MSG = "CorpAppInvitedMsg", _(
-        "Character invited to join corporation"
-    )
-    CORP_APP_NEW_MSG = "CorpAppNewMsg", _("Character submitted application")
-    CORP_APP_REJECT_MSG = "CharAppRejectMsg", _("Corp application rejected message")
-    CORP_APP_REJECT_CUSTOM_MSG = "CorpAppRejectCustomMsg", _(
-        "Corp application rejected custom message"
-    )
-    CHAR_APP_WITHDRAW_MSG = "CharAppWithdrawMsg", _("Character withdrew application")
-    CHAR_LEFT_CORP_MSG = "CharLeftCorpMsg", _("Character leaves corporation")
-
-    # billing
-    BILLING_BILL_OUT_OF_MONEY_MSG = "BillOutOfMoneyMsg", _("Bill out of money")
-    BILLING_CORP_ALL_BILL_MSG = "CorpAllBillMsg", _("Corp alliance billing message")
-    BILLING_I_HUB_BILL_ABOUT_TO_EXPIRE = (
-        "InfrastructureHubBillAboutToExpire",
-        _("I-HUB bill about to expire"),
-    )
-    BILLING_I_HUB_DESTROYED_BY_BILL_FAILURE = (
-        "IHubDestroyedByBillFailure",
-        _("I_HUB destroyed by bill failure"),
-    )
-
     @classmethod
     def esi_notifications(cls) -> Set["NotificationType"]:
         """Return all ESI notification types."""

{aa_structures-2.16.0 → aa_structures-3.0.0}/structures/core/serializers.py

@@ -330,8 +330,8 @@ class _AbstractStructureListSerializer(ABC):
         ):
             ajax_url = reverse("structures:structure_details", args=[structure.id])
             row["details"] = format_html(
-                '<button type="button" class="btn btn-default" '
-                'data-toggle="modal" data-target="#modalUpwellDetails" '
+                '<button type="button" class="btn btn-secondary" '
+                'data-bs-toggle="modal" data-bs-target="#modalUpwellDetails" '
                 f"data-ajax_url={ajax_url} "
                 f'title="{_("Show fitting")}">'
                 '<i class="fas fa-search"></i></button>'
@@ -340,8 +340,8 @@ class _AbstractStructureListSerializer(ABC):
         elif structure.is_poco:
             ajax_url = reverse("structures:poco_details", args=[structure.id])
             row["details"] = format_html(
-                '<button type="button" class="btn btn-default" '
-                'data-toggle="modal" data-target="#modalPocoDetails" '
+                '<button type="button" class="btn btn-secondary" '
+                'data-bs-toggle="modal" data-bs-target="#modalPocoDetails" '
                 f"data-ajax_url={ajax_url} "
                 f'title="{_("Show details")}">'
                 '<i class="fas fa-search"></i></button>'
@@ -350,8 +350,8 @@ class _AbstractStructureListSerializer(ABC):
         elif structure.is_starbase:
             ajax_url = reverse("structures:starbase_detail", args=[structure.id])
             row["details"] = format_html(
-                '<button type="button" class="btn btn-default" '
-                'data-toggle="modal" data-target="#modalStarbaseDetail" '
+                '<button type="button" class="btn btn-secondary" '
+                'data-bs-toggle="modal" data-bs-target="#modalStarbaseDetail" '
                 f"data-ajax_url={ajax_url} "
                 f'title="{_("Show details")}">'
                 '<i class="fas fa-search"></i></button>'

aa_structures-3.0.0/structures/migrations/0009_add_project_goal_notifications.py

@@ -0,0 +1,152 @@
+# Generated by Django 4.2.16 on 2024-11-05 14:05
+
+import multiselectfield.db.fields
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("structures", "0008_add_notificationtypes_skyhook_metenox"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="webhook",
+            name="notification_types",
+            field=multiselectfield.db.fields.MultiSelectField(
+                choices=[
+                    ("BillOutOfMoneyMsg", "Bill out of money"),
+                    ("CorpAllBillMsg", "Corp alliance billing message"),
+                    (
+                        "InfrastructureHubBillAboutToExpire",
+                        "I-HUB bill about to expire",
+                    ),
+                    ("IHubDestroyedByBillFailure", "I_HUB destroyed by bill failure"),
+                    ("CharAppAcceptMsg", "Character joins corporation"),
+                    ("CorpAppInvitedMsg", "Character invited to join corporation"),
+                    ("CorpAppNewMsg", "Character submitted application"),
+                    ("CharAppRejectMsg", "Corp application rejected message"),
+                    (
+                        "CorpAppRejectCustomMsg",
+                        "Corp application rejected custom message",
+                    ),
+                    ("CharAppWithdrawMsg", "Character withdrew application"),
+                    ("CharLeftCorpMsg", "Character leaves corporation"),
+                    ("CorporationGoalClosed", "Corporation goal closed"),
+                    ("CorporationGoalCompleted", "Corporation goal completed"),
+                    ("CorporationGoalCreated", "Corporation goal created"),
+                    (
+                        "MoonminingAutomaticFracture",
+                        "Moon mining automatic fracture triggered",
+                    ),
+                    (
+                        "MoonminingExtractionCancelled",
+                        "Moon mining extraction cancelled",
+                    ),
+                    ("MoonminingExtractionFinished", "Moon mining extraction finished"),
+                    ("MoonminingExtractionStarted", "Moon mining extraction started"),
+                    ("MoonminingLaserFired", "Moonmining laser fired"),
+                    ("SkyhookDeployed", "Skyhook deployed"),
+                    ("SkyhookDestroyed", "Skyhook destroyed"),
+                    ("SkyhookLostShields", "Skyhook lost shields"),
+                    ("SkyhookOnline", "Skyhook online"),
+                    ("SkyhookUnderAttack", "Skyhook under attack"),
+                    ("OrbitalAttacked", "Customs office attacked"),
+                    ("OrbitalReinforced", "Customs office reinforced"),
+                    ("SovAllClaimAquiredMsg", "Sovereignty claim acknowledgment"),
+                    ("SovAllClaimLostMsg", "Sovereignty lost"),
+                    ("AllAnchoringMsg", "Structure anchoring in alliance space"),
+                    ("EntosisCaptureStarted", "Sovereignty entosis capture started"),
+                    ("SovStructureDestroyed", "Sovereignty structure destroyed"),
+                    ("SovStructureReinforced", "Sovereignty structure reinforced"),
+                    (
+                        "SovCommandNodeEventStarted",
+                        "Sovereignty command node event started",
+                    ),
+                    ("TowerAlertMsg", "Starbase attacked"),
+                    ("TowerRefueledExtra", "Starbase refueled (BETA)"),
+                    ("TowerReinforcedExtra", "Starbase reinforced (BETA)"),
+                    ("TowerResourceAlertMsg", "Starbase fuel alert"),
+                    ("OwnershipTransferred", "Upwell structure ownership transferred"),
+                    ("StructureAnchoring", "Upwell structure anchoring"),
+                    ("StructureDestroyed", "Upwell structure destroyed"),
+                    ("StructureFuelAlert", "Upwell structure fuel alert"),
+                    ("StructureJumpFuelAlert", "Upwell structure jump fuel alert"),
+                    ("StructureLostArmor", "Upwell structure lost armor"),
+                    ("StructureLostShields", "Upwell structure lost shields"),
+                    ("StructureLowReagentsAlert", "Structure low reagents alert"),
+                    ("StructureNoReagentsAlert", "Structure no reagents alert"),
+                    ("StructureOnline", "Upwell structure went online"),
+                    ("StructureRefueledExtra", "Upwell structure refueled"),
+                    (
+                        "StructuresReinforcementChanged",
+                        "Upwell structure reinforcement time changed",
+                    ),
+                    (
+                        "StructureServicesOffline",
+                        "Upwell structure services went offline",
+                    ),
+                    ("StructureUnanchoring", "Upwell structure unanchoring"),
+                    ("StructureUnderAttack", "Upwell structure is under attack"),
+                    ("StructureWentHighPower", "Upwell structure went high power"),
+                    ("StructureWentLowPower", "Upwell structure went low power"),
+                    ("AcceptedAlly", "War accepted ally"),
+                    (
+                        "AllWarCorpJoinedAllianceMsg",
+                        "Alliance war corporation joined alliance message",
+                    ),
+                    ("AllWarSurrenderMsg", "Alliance war surrender message"),
+                    ("AllyJoinedWarAggressorMsg", "War ally joined aggressor"),
+                    ("AllyJoinedWarAllyMsg", "War ally joined ally"),
+                    ("AllyJoinedWarDefenderMsg", "War ally joined defender"),
+                    ("CorpWarSurrenderMsg", "War party surrendered"),
+                    ("CorpBecameWarEligible", "War corporation became eligible"),
+                    ("CorpNoLongerWarEligible", "War corporation no longer eligible"),
+                    ("DeclareWar", "War declared"),
+                    ("WarHQRemovedFromSpace", "War HQ removed from space"),
+                    ("WarInvalid", "War invalid"),
+                    (
+                        "MercOfferedNegotiationMsg",
+                        "War mercenary offered negotiation message",
+                    ),
+                    ("MercOfferRetractedMsg", "War mercenary offer retracted message"),
+                    ("OfferedSurrender", "War offered surrender"),
+                    ("OfferedToAlly", "War offered to become ally"),
+                    ("WarAdopted", "War adopted"),
+                    ("WarDeclared", "War declared"),
+                    ("WarInherited", "War inherited"),
+                    ("WarRetractedByConcord", "War retracted by Concord"),
+                    ("WarSurrenderOfferMsg", "War surrender offered"),
+                ],
+                default=[
+                    "OrbitalAttacked",
+                    "OrbitalReinforced",
+                    "SkyhookDestroyed",
+                    "SkyhookLostShields",
+                    "SkyhookOnline",
+                    "SkyhookUnderAttack",
+                    "SovStructureDestroyed",
+                    "SovStructureReinforced",
+                    "StructureAnchoring",
+                    "StructureDestroyed",
+                    "StructureFuelAlert",
+                    "StructureLostArmor",
+                    "StructureLostShields",
+                    "StructureLowReagentsAlert",
+                    "StructureNoReagentsAlert",
+                    "StructureOnline",
+                    "StructureServicesOffline",
+                    "StructureUnderAttack",
+                    "StructureWentHighPower",
+                    "StructureWentLowPower",
+                    "TowerAlertMsg",
+                    "TowerResourceAlertMsg",
+                ],
+                help_text="Select which type of notifications should be forwarded to this webhook",
+                max_length=1544,
+                verbose_name="notification types",
+            ),
+        ),
+    ]

{aa_structures-2.16.0 → aa_structures-3.0.0}/structures/models/owners.py

@@ -703,7 +703,7 @@ class Owner(models.Model):
 
             s.eve_moon = celestial.eve_object
             s.save()
-            logger.info("%s: Resolved moon for Metenox: %d", self, s.name)
+            logger.info("%s: Resolved moon for Metenox: %s", self, s.name)
 
     def _fetch_custom_offices(self, token: Token) -> bool:
         """Fetch custom offices from ESI for this owner.

{aa_structures-2.16.0 → aa_structures-3.0.0}/structures/static/structures/js/public.js

@@ -92,41 +92,47 @@ $(document).ready(function () {
                 {
                     idx: pocos_idx_start,
                     title: filterTitles.constellation,
-                    maxWidth: "11em",
+                    maxWidth: "10em",
                 },
                 {
                     idx: pocos_idx_start + 1,
                     title: filterTitles.planet_type,
+                    maxWidth: "10em",
                 },
                 {
                     idx: pocos_idx_start + 2,
                     title: filterTitles.space_type,
+                    maxWidth: "10em",
                 },
                 {
                     idx: pocos_idx_start + 3,
                     title: filterTitles.region,
+                    maxWidth: "10em",
                 },
                 {
                     idx: pocos_idx_start + 4,
                     title: filterTitles.solar_system,
+                    maxWidth: "10em",
                 },
                 {
                     idx: pocos_idx_start + 5,
                     title: filterTitles.corporation,
-                    maxWidth: "11em",
+                    maxWidth: "10em",
                 },
                 {
                     idx: pocos_idx_start + 6,
                     title: filterTitles.alliance,
-                    maxWidth: "11em",
+                    maxWidth: "10em",
                 },
                 {
                     idx: pocos_idx_start + 7,
                     title: filterTitles.access,
+                    maxWidth: "10em",
                 },
             ],
             autoSize: false,
             bootstrap: true,
+            bootstrap_version: 5,
         },
     });
 });

{aa_structures-2.16.0 → aa_structures-3.0.0}/structures/static/structures/js/structures.js

@@ -22,7 +22,7 @@ $(document).ready(function () {
     $('a[href="#' + tabId + '"]').tab("show");
 
     /* remember last selected tab */
-    $('a[data-toggle="tab"]').on("shown.bs.tab", function (e) {
+    $('a[data-bs-toggle="tab"]').on("shown.bs.tab", function (e) {
         const selectedTabId = $(e.target).attr("href").substr(1);
         setCookie(COOKIE_LAST_TAB_ID, selectedTabId, COOKIE_LAST_TAB_HOURS);
     });
@@ -155,6 +155,7 @@ $(document).ready(function () {
                 ],
                 autoSize: false,
                 bootstrap: true,
+                bootstrap_version: 5,
             },
         },
     });
@@ -242,6 +243,7 @@ $(document).ready(function () {
                 ],
                 autoSize: false,
                 bootstrap: true,
+                bootstrap_version: 5,
             },
         },
     });
@@ -328,6 +330,7 @@ $(document).ready(function () {
                 ],
                 autoSize: false,
                 bootstrap: true,
+                bootstrap_version: 5,
             },
         },
     });
@@ -455,6 +458,7 @@ $(document).ready(function () {
             ],
             autoSize: false,
             bootstrap: true,
+            bootstrap_version: 5,
         },
         createdRow: function (row, data, dataIndex) {
             if (data["is_reinforced"]) {