aa-structures 2.11.0__tar.gz → 2.13.0__tar.gz

{aa_structures-2.11.0 → aa_structures-2.13.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: aa-structures
-Version: 2.11.0
+Version: 2.13.0
 Summary: App for managing Eve Online structures with Alliance Auth.
 Author-email: Erik Kalkoken <kalkoken87@gmail.com>
 Requires-Python: >=3.8

{aa_structures-2.11.0 → aa_structures-2.13.0}/structures/__init__.py

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

{aa_structures-2.11.0 → aa_structures-2.13.0}/structures/core/notification_embeds/main.py

@@ -10,6 +10,8 @@ import dhooks_lite
 from django.conf import settings
 from django.utils.translation import gettext as _
 
+from allianceauth.services.hooks import get_extension_logger
+from app_utils.logging import LoggerAddTag
 from app_utils.urls import reverse_absolute, static_file_absolute_url
 
 from structures import __title__
@@ -17,7 +19,9 @@ from structures.core.notification_types import NotificationType
 from structures.helpers import get_or_create_eve_entity, is_absolute_url
 from structures.models.notifications import Notification, NotificationBase, Webhook
 
-from .helpers import target_datetime_formatted
+from .helpers import gen_alliance_link, gen_corporation_link, target_datetime_formatted
+
+logger = LoggerAddTag(get_extension_logger(__name__), __title__)
 
 
 class NotificationBaseEmbed:
@@ -73,9 +77,9 @@ class NotificationBaseEmbed:
         damage_text = " | ".join(damage_parts)
         return damage_text
 
-    def get_aggressor_link(self) -> str:
+    def gen_aggressor_link(self) -> str:
         """Returns the aggressor link from a parsed_text for POS and POCOs only."""
-        if self._data.get("aggressorAllianceID"):
+        if key := self._data.get("aggressorAllianceID"):
             key = "aggressorAllianceID"
         elif self._data.get("aggressorCorpID"):
             key = "aggressorCorpID"
@@ -86,6 +90,16 @@ class NotificationBaseEmbed:
         entity = get_or_create_eve_entity(id=self._data[key])
         return Webhook.create_link(entity.name, entity.profile_url)
 
+    def gen_attacker_link(self) -> str:
+        """Returns the attacker link from a parsed_text for Upwell structures only."""
+        if name := self._data.get("allianceName"):
+            return gen_alliance_link(name)
+
+        if name := self._data.get("corpName"):
+            return gen_corporation_link(name)
+
+        return _("(unknown)")
+
     def fuel_expires_target_date(self) -> str:
         """Return calculated target date when fuel expires. Returns '?' when no data."""
         if self._structure and self._structure.fuel_expires_at:
@@ -141,6 +155,20 @@ class NotificationBaseEmbed:
             footer_text += f" #{my_text}"
         footer_icon_url = footer_icon_url if is_absolute_url(footer_icon_url) else None
         footer = dhooks_lite.Footer(text=footer_text, icon_url=footer_icon_url)
+        max_description = dhooks_lite.Embed.MAX_DESCRIPTION
+        if self._description and len(self._description) > max_description:
+            logger.warning(
+                "%s: Description of notification is too long: %s",
+                self,
+                self._description,
+            )
+            self._description = self._description[:max_description]
+        max_title = dhooks_lite.Embed.MAX_TITLE
+        if self._title and len(self._title) > max_title:
+            logger.warning(
+                "%s: Title of notification is too long: %s", self, self._title
+            )
+            self._title = self._title[:max_title]
         return dhooks_lite.Embed(
             author=author,
             color=self._color,
@@ -182,6 +210,13 @@ class NotificationBaseEmbed:
             NotificationOrbitalAttacked,
             NotificationOrbitalReinforced,
         )
+        from .skyhook_embeds import (
+            NotificationSkyhookDeployed,
+            NotificationSkyhookDestroyed,
+            NotificationSkyhookLostShield,
+            NotificationSkyhookOnline,
+            NotificationSkyhookUnderAttack,
+        )
         from .sov_embeds import (
             NotificationSovAllAnchoringMsg,
             NotificationSovAllClaimAcquiredMsg,
@@ -198,6 +233,8 @@ class NotificationBaseEmbed:
             NotificationStructureJumpFuelAlert,
             NotificationStructureLostArmor,
             NotificationStructureLostShield,
+            NotificationStructureLowReagentsAlert,
+            NotificationStructureNoReagentsAlert,
             NotificationStructureOnline,
             NotificationStructureOwnershipTransferred,
             NotificationStructureRefueledExtra,
@@ -242,76 +279,84 @@ class NotificationBaseEmbed:
         NT = NotificationType
         notif_type_2_class = {
             # Billing
-            NT.BILLING_CORP_ALL_BILL_MSG: NotificationCorpAllBillMsg,
             NT.BILLING_BILL_OUT_OF_MONEY_MSG: NotificationBillingBillOutOfMoneyMsg,
+            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
-            NT.CORP_APP_NEW_MSG: NotificationCorpAppNewMsg,
+            NT.CHAR_APP_ACCEPT_MSG: NotificationCharAppAcceptMsg,
+            NT.CHAR_APP_WITHDRAW_MSG: NotificationCharAppWithdrawMsg,
+            NT.CHAR_LEFT_CORP_MSG: NotificationCharLeftCorpMsg,
             NT.CORP_APP_INVITED_MSG: NotificationCorpAppInvitedMsg,
+            NT.CORP_APP_NEW_MSG: NotificationCorpAppNewMsg,
             NT.CORP_APP_REJECT_CUSTOM_MSG: NotificationCorpAppRejectCustomMsg,
             NT.CORP_APP_REJECT_MSG: NotificationCharAppRejectMsg,
-            NT.CHAR_APP_WITHDRAW_MSG: NotificationCharAppWithdrawMsg,
-            NT.CHAR_APP_ACCEPT_MSG: NotificationCharAppAcceptMsg,
-            NT.CHAR_LEFT_CORP_MSG: NotificationCharLeftCorpMsg,
             # moonmining
-            NT.MOONMINING_EXTRACTION_STARTED: NotificationMoonminningExtractionStarted,
-            NT.MOONMINING_EXTRACTION_FINISHED: NotificationMoonminningExtractionFinished,
             NT.MOONMINING_AUTOMATIC_FRACTURE: NotificationMoonminningAutomaticFracture,
             NT.MOONMINING_EXTRACTION_CANCELLED: NotificationMoonminningExtractionCanceled,
+            NT.MOONMINING_EXTRACTION_FINISHED: NotificationMoonminningExtractionFinished,
+            NT.MOONMINING_EXTRACTION_STARTED: NotificationMoonminningExtractionStarted,
             NT.MOONMINING_LASER_FIRED: NotificationMoonminningLaserFired,
             # Orbitals
             NT.ORBITAL_ATTACKED: NotificationOrbitalAttacked,
             NT.ORBITAL_REINFORCED: NotificationOrbitalReinforced,
             # Sov
-            NT.SOV_ENTOSIS_CAPTURE_STARTED: NotificationSovEntosisCaptureStarted,
-            NT.SOV_COMMAND_NODE_EVENT_STARTED: NotificationSovCommandNodeEventStarted,
+            NT.SOV_ALL_ANCHORING_MSG: NotificationSovAllAnchoringMsg,
             NT.SOV_ALL_CLAIM_ACQUIRED_MSG: NotificationSovAllClaimAcquiredMsg,
             NT.SOV_ALL_CLAIM_LOST_MSG: NotificationSovAllClaimLostMsg,
-            NT.SOV_STRUCTURE_REINFORCED: NotificationSovStructureReinforced,
+            NT.SOV_COMMAND_NODE_EVENT_STARTED: NotificationSovCommandNodeEventStarted,
+            NT.SOV_ENTOSIS_CAPTURE_STARTED: NotificationSovEntosisCaptureStarted,
             NT.SOV_STRUCTURE_DESTROYED: NotificationSovStructureDestroyed,
-            NT.SOV_ALL_ANCHORING_MSG: NotificationSovAllAnchoringMsg,
+            NT.SOV_STRUCTURE_REINFORCED: NotificationSovStructureReinforced,
             # Towers
             NT.TOWER_ALERT_MSG: NotificationTowerAlertMsg,
-            NT.TOWER_RESOURCE_ALERT_MSG: NotificationTowerResourceAlertMsg,
             NT.TOWER_REFUELED_EXTRA: NotificationTowerRefueledExtra,
             NT.TOWER_REINFORCED_EXTRA: NotificationTowerReinforcedExtra,
+            NT.TOWER_RESOURCE_ALERT_MSG: NotificationTowerResourceAlertMsg,
+            # Skyhooks
+            NT.SKYHOOK_DEPLOYED: NotificationSkyhookDeployed,
+            NT.SKYHOOK_DESTROYED: NotificationSkyhookDestroyed,
+            NT.SKYHOOK_LOST_SHIELDS: NotificationSkyhookLostShield,
+            NT.SKYHOOK_ONLINE: NotificationSkyhookOnline,
+            NT.SKYHOOK_UNDER_ATTACK: NotificationSkyhookUnderAttack,
             # Upwell structures
-            NT.STRUCTURE_ONLINE: NotificationStructureOnline,
+            NT.OWNERSHIP_TRANSFERRED: NotificationStructureOwnershipTransferred,
+            NT.STRUCTURE_ANCHORING: NotificationStructureAnchoring,
+            NT.STRUCTURE_DESTROYED: NotificationStructureDestroyed,
             NT.STRUCTURE_FUEL_ALERT: NotificationStructureFuelAlert,
             NT.STRUCTURE_JUMP_FUEL_ALERT: NotificationStructureJumpFuelAlert,
+            NT.STRUCTURE_LOST_ARMOR: NotificationStructureLostArmor,
+            NT.STRUCTURE_LOST_SHIELD: NotificationStructureLostShield,
+            NT.STRUCTURE_LOW_REAGENTS_ALERT: NotificationStructureLowReagentsAlert,
+            NT.STRUCTURE_NO_REAGENTS_ALERT: NotificationStructureNoReagentsAlert,
+            NT.STRUCTURE_ONLINE: NotificationStructureOnline,
             NT.STRUCTURE_REFUELED_EXTRA: NotificationStructureRefueledExtra,
+            NT.STRUCTURE_REINFORCEMENT_CHANGED: NotificationStructureReinforceChange,
             NT.STRUCTURE_SERVICES_OFFLINE: NotificationStructureServicesOffline,
-            NT.STRUCTURE_WENT_LOW_POWER: NotificationStructureWentLowPower,
-            NT.STRUCTURE_WENT_HIGH_POWER: NotificationStructureWentHighPower,
             NT.STRUCTURE_UNANCHORING: NotificationStructureUnanchoring,
             NT.STRUCTURE_UNDER_ATTACK: NotificationStructureUnderAttack,
-            NT.STRUCTURE_LOST_SHIELD: NotificationStructureLostShield,
-            NT.STRUCTURE_LOST_ARMOR: NotificationStructureLostArmor,
-            NT.STRUCTURE_DESTROYED: NotificationStructureDestroyed,
-            NT.OWNERSHIP_TRANSFERRED: NotificationStructureOwnershipTransferred,
-            NT.STRUCTURE_ANCHORING: NotificationStructureAnchoring,
-            NT.STRUCTURE_REINFORCEMENT_CHANGED: NotificationStructureReinforceChange,
+            NT.STRUCTURE_WENT_HIGH_POWER: NotificationStructureWentHighPower,
+            NT.STRUCTURE_WENT_LOW_POWER: NotificationStructureWentLowPower,
             # War
             NT.WAR_ACCEPTED_ALLY: NotificationAcceptedAlly,
+            NT.WAR_ALL_WAR_CORP_JOINED_ALLIANCE_MSG: NotificationAllWarCorpJoinedAllianceMsg,
+            NT.WAR_ALL_WAR_SURRENDER_MSG: NotificationAllWarSurrenderMsg,
             NT.WAR_ALLY_JOINED_WAR_AGGRESSOR_MSG: NotificationAllyJoinedWarMsg,
             NT.WAR_ALLY_JOINED_WAR_ALLY_MSG: NotificationAllyJoinedWarMsg,
             NT.WAR_ALLY_JOINED_WAR_DEFENDER_MSG: NotificationAllyJoinedWarMsg,
-            NT.WAR_ALL_WAR_CORP_JOINED_ALLIANCE_MSG: NotificationAllWarCorpJoinedAllianceMsg,
-            NT.WAR_ALL_WAR_SURRENDER_MSG: NotificationAllWarSurrenderMsg,
+            NT.WAR_CORP_WAR_SURRENDER_MSG: NotificationCorpWarSurrenderMsg,
             NT.WAR_CORPORATION_BECAME_ELIGIBLE: NotificationWarCorporationBecameEligible,
             NT.WAR_CORPORATION_NO_LONGER_ELIGIBLE: NotificationWarCorporationNoLongerEligible,
             NT.WAR_DECLARE_WAR: NotificationDeclareWar,
-            NT.WAR_MERC_OFFERED_NEGOTIATION_MSG: NotificationMercOfferedNegotiationMsg,
-            NT.WAR_MERC_OFFER_RETRACTED_MSG: NotificationMercOfferRetractedMsg,
-            NT.WAR_CORP_WAR_SURRENDER_MSG: NotificationCorpWarSurrenderMsg,
             NT.WAR_HQ_REMOVED_FROM_SPACE: NotificationWarHQRemovedFromSpace,
-            NT.WAR_OFFERED_TO_ALLY: NotificationOfferedToAlly,
+            NT.WAR_INVALID: NotificationWarInvalid,
+            NT.WAR_MERC_OFFER_RETRACTED_MSG: NotificationMercOfferRetractedMsg,
+            NT.WAR_MERC_OFFERED_NEGOTIATION_MSG: NotificationMercOfferedNegotiationMsg,
             NT.WAR_OFFERED_SURRENDER: NotificationOfferedSurrender,
+            NT.WAR_OFFERED_TO_ALLY: NotificationOfferedToAlly,
             NT.WAR_WAR_ADOPTED: NotificationWarAdopted,
             NT.WAR_WAR_DECLARED: NotificationWarDeclared,
             NT.WAR_WAR_INHERITED: NotificationWarInherited,
-            NT.WAR_INVALID: NotificationWarInvalid,
             NT.WAR_WAR_RETRACTED_BY_CONCORD: NotificationWarRetractedByConcord,
             NT.WAR_WAR_SURRENDER_OFFER_MSG: NotificationWarSurrenderOfferMsg,
         }

{aa_structures-2.11.0 → aa_structures-2.13.0}/structures/core/notification_embeds/orbital_embeds.py

@@ -31,7 +31,7 @@ class NotificationOrbitalEmbed(NotificationBaseEmbed):
             self._notification.eve_solar_system()
         )
         self._owner_link = gen_corporation_link(str(notification.owner))
-        self._aggressor_link = self.get_aggressor_link()
+        self._aggressor_link = self.gen_aggressor_link()
         self._thumbnail = dhooks_lite.Thumbnail(
             self._structure_type.icon_url(size=self.ICON_DEFAULT_SIZE)
         )

aa_structures-2.13.0/structures/core/notification_embeds/skyhook_embeds.py

@@ -0,0 +1,89 @@
+"""Skyhook embeds."""
+
+# pylint: disable=missing-class-docstring
+
+import dhooks_lite
+
+from django.utils.translation import gettext as _
+
+from app_utils.datetime import ldap_time_2_datetime
+
+from structures.models import Notification, Webhook
+
+from .helpers import (
+    gen_corporation_link,
+    gen_solar_system_text,
+    target_datetime_formatted,
+)
+from .main import NotificationBaseEmbed
+
+
+class NotificationSkyhookEmbed(NotificationBaseEmbed):
+    """Base class for most structure related notification embeds."""
+
+    def __init__(self, n: Notification) -> None:
+        super().__init__(n)
+        type_ = n.eve_structure_type("typeID")
+        solar_system = n.eve_solar_system("solarsystemID")
+        self._description = _(
+            "The %(structure_type)s at **%(planet)s** "
+            "in %(solar_system)s belonging to %(owner_link)s "
+        ) % {
+            "structure_type": type_,
+            "planet": n.eve_planet(),
+            "solar_system": gen_solar_system_text(solar_system),
+            "owner_link": gen_corporation_link(str(n.owner)),
+        }
+        self._thumbnail = dhooks_lite.Thumbnail(
+            type_.icon_url(size=self.ICON_DEFAULT_SIZE)
+        )
+
+
+class NotificationSkyhookDeployed(NotificationSkyhookEmbed):
+    def __init__(self, n: Notification) -> None:
+        super().__init__(n)
+        self._title = _("Skyhook has started onlining")
+        self._description += _("has started onlining.")
+        self._color = Webhook.Color.INFO
+
+
+class NotificationSkyhookDestroyed(NotificationSkyhookEmbed):
+    def __init__(self, n: Notification) -> None:
+        super().__init__(n)
+        self._title = _("Skyhook destroyed")
+        self._description += _("has been destroyed.")
+        self._color = Webhook.Color.DANGER
+
+
+class NotificationSkyhookLostShield(NotificationSkyhookEmbed):
+    def __init__(self, n: Notification) -> None:
+        super().__init__(n)
+        self._title = _("Skyhook lost shield")
+        timer_ends_at = ldap_time_2_datetime(self._data["timestamp"])
+        self._description += _(
+            "has lost its shields and is now in reinforcement state until : %s"
+        ) % target_datetime_formatted(timer_ends_at)
+        self._color = Webhook.Color.DANGER
+
+
+class NotificationSkyhookOnline(NotificationSkyhookEmbed):
+    def __init__(self, n: Notification) -> None:
+        super().__init__(n)
+        self._title = _("Skyhook online")
+        self._description += _("is now online.")
+        self._color = Webhook.Color.SUCCESS
+
+
+class NotificationSkyhookUnderAttack(NotificationSkyhookEmbed):
+    def __init__(self, n: Notification) -> None:
+        super().__init__(n)
+        self._title = _("Skyhook under attack")
+        self._description += _(
+            "is under attack by %(attacker)s.\n"
+            "%(damage_text)s"
+            % {
+                "attacker": self.gen_attacker_link(),
+                "damage_text": self.compile_damage_text("Percentage"),
+            }
+        )
+        self._color = Webhook.Color.DANGER

{aa_structures-2.11.0 → aa_structures-2.13.0}/structures/core/notification_embeds/structures_embeds.py

@@ -14,7 +14,6 @@ from structures.helpers import get_or_create_eve_entity, get_or_create_eve_type
 from structures.models import Notification, Structure, Webhook
 
 from .helpers import (
-    gen_alliance_link,
     gen_corporation_link,
     gen_solar_system_text,
     target_datetime_formatted,
@@ -165,21 +164,11 @@ class NotificationStructureUnderAttack(NotificationStructureEmbed):
         super().__init__(notification)
         self._title = _("Structure under attack")
         self._description += _("is under attack by %(attacker)s.\n%(damage_text)s") % {
-            "attacker": self._get_attacker_link(),
+            "attacker": self.gen_attacker_link(),
             "damage_text": self.compile_damage_text("Percentage"),
         }
         self._color = Webhook.Color.DANGER
 
-    def _get_attacker_link(self) -> str:
-        """Returns the attacker link from a parsed_text for Upwell structures only."""
-        if self._data.get("allianceName"):
-            return gen_alliance_link(self._data["allianceName"])
-
-        if self._data.get("corpName"):
-            return gen_corporation_link(self._data["corpName"])
-
-        return _("(unknown)")
-
 
 class NotificationStructureLostShield(NotificationStructureEmbed):
     def __init__(self, notification: Notification) -> None:
@@ -324,3 +313,25 @@ class NotificationStructureReinforceChange(NotificationBaseEmbed):
             _("\n\nChange becomes effective at %s.")
         ) % target_datetime_formatted(change_effective)
         self._color = Webhook.Color.INFO
+
+
+class NotificationStructureLowReagentsAlert(NotificationStructureEmbed):
+    def __init__(self, notification: Notification) -> None:
+        super().__init__(notification)
+        self._title = _("Structure low on reagents")
+        self._description += _(
+            "has insufficient reagents present to support "
+            "one full day of moon drill activity."
+        )
+        self._color = Webhook.Color.WARNING
+
+
+class NotificationStructureNoReagentsAlert(NotificationStructureEmbed):
+    def __init__(self, notification: Notification) -> None:
+        super().__init__(notification)
+        self._title = _("Structure out of reagents")
+        self._description += _(
+            "has run out of reagents, "
+            "which is preventing further moon material production."
+        )
+        self._color = Webhook.Color.DANGER

{aa_structures-2.11.0 → aa_structures-2.13.0}/structures/core/notification_embeds/tower_embeds.py

@@ -56,7 +56,7 @@ class NotificationTowerEmbed(NotificationBaseEmbed):
 class NotificationTowerAlertMsg(NotificationTowerEmbed):
     def __init__(self, notification: Notification) -> None:
         super().__init__(notification)
-        aggressor_link = self.get_aggressor_link()
+        aggressor_link = self.gen_aggressor_link()
         damage_text = self.compile_damage_text("Value", 100)
         self._title = _("Starbase under attack")
         self._description += _("is under attack by %(aggressor)s.\n%(damage_text)s") % {

{aa_structures-2.11.0 → aa_structures-2.13.0}/structures/core/notification_types.py

@@ -23,6 +23,12 @@ class NotificationType(models.TextChoices):
     )
     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", _(
@@ -42,15 +48,22 @@ class NotificationType(models.TextChoices):
         "Upwell structure went low power"
     )
 
+    # 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")
 
     # starbases
     TOWER_ALERT_MSG = "TowerAlertMsg", _("Starbase attacked")
-    TOWER_RESOURCE_ALERT_MSG = "TowerResourceAlertMsg", _("Starbase fuel alert")
     TOWER_REFUELED_EXTRA = "TowerRefueledExtra", _("Starbase refueled (BETA)")
     TOWER_REINFORCED_EXTRA = "TowerReinforcedExtra", _("Starbase reinforced (BETA)")
+    TOWER_RESOURCE_ALERT_MSG = "TowerResourceAlertMsg", _("Starbase fuel alert")
 
     # moon mining
     MOONMINING_AUTOMATIC_FRACTURE = "MoonminingAutomaticFracture", _(
@@ -121,7 +134,7 @@ class NotificationType(models.TextChoices):
     )
     WAR_OFFERED_SURRENDER = "OfferedSurrender", _("War offered surrender")
     WAR_OFFERED_TO_ALLY = "OfferedToAlly", _("War offered to become ally")
-    WAR_WAR_ADOPTED = "WarAdopted", _("War adopted")
+    WAR_WAR_ADOPTED = "WarAdopted", _("War adopted")  # FIXME: Should be "WarAdopted "
     WAR_WAR_DECLARED = "WarDeclared", _("War declared")
     WAR_WAR_INHERITED = "WarInherited", _("War inherited")
     WAR_WAR_RETRACTED_BY_CONCORD = "WarRetractedByConcord", _(
@@ -143,8 +156,8 @@ class NotificationType(models.TextChoices):
     CHAR_LEFT_CORP_MSG = "CharLeftCorpMsg", _("Character leaves corporation")
 
     # billing
-    BILLING_CORP_ALL_BILL_MSG = "CorpAllBillMsg", _("Corp alliance billing message")
     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"),
@@ -173,34 +186,40 @@ class NotificationType(models.TextChoices):
     def webhook_defaults(cls) -> List["NotificationType"]:
         """List of default notifications for new webhooks."""
         return [
+            cls.ORBITAL_ATTACKED,
+            cls.ORBITAL_REINFORCED,
+            cls.SKYHOOK_DESTROYED,
+            cls.SKYHOOK_LOST_SHIELDS,
+            cls.SKYHOOK_ONLINE,
+            cls.SKYHOOK_UNDER_ATTACK,
+            cls.SOV_STRUCTURE_DESTROYED,
+            cls.SOV_STRUCTURE_REINFORCED,
             cls.STRUCTURE_ANCHORING,
             cls.STRUCTURE_DESTROYED,
             cls.STRUCTURE_FUEL_ALERT,
             cls.STRUCTURE_LOST_ARMOR,
             cls.STRUCTURE_LOST_SHIELD,
+            cls.STRUCTURE_LOW_REAGENTS_ALERT,
+            cls.STRUCTURE_NO_REAGENTS_ALERT,
             cls.STRUCTURE_ONLINE,
             cls.STRUCTURE_SERVICES_OFFLINE,
             cls.STRUCTURE_UNDER_ATTACK,
             cls.STRUCTURE_WENT_HIGH_POWER,
             cls.STRUCTURE_WENT_LOW_POWER,
-            cls.ORBITAL_ATTACKED,
-            cls.ORBITAL_REINFORCED,
             cls.TOWER_ALERT_MSG,
             cls.TOWER_RESOURCE_ALERT_MSG,
-            cls.SOV_STRUCTURE_REINFORCED,
-            cls.SOV_STRUCTURE_DESTROYED,
         ]
 
     @classmethod
     def relevant_for_timerboard(cls) -> Set["NotificationType"]:
         """Notification types that can create timers."""
         return {
-            cls.STRUCTURE_LOST_SHIELD,
-            cls.STRUCTURE_LOST_ARMOR,
-            cls.ORBITAL_REINFORCED,
-            cls.MOONMINING_EXTRACTION_STARTED,
             cls.MOONMINING_EXTRACTION_CANCELLED,
+            cls.MOONMINING_EXTRACTION_STARTED,
+            cls.ORBITAL_REINFORCED,
             cls.SOV_STRUCTURE_REINFORCED,
+            cls.STRUCTURE_LOST_ARMOR,
+            cls.STRUCTURE_LOST_SHIELD,
             cls.TOWER_REINFORCED_EXTRA,
         }
 
@@ -210,15 +229,15 @@ class NotificationType(models.TextChoices):
         return {
             # billing
             cls.BILLING_BILL_OUT_OF_MONEY_MSG,
-            cls.BILLING_I_HUB_DESTROYED_BY_BILL_FAILURE,
             cls.BILLING_I_HUB_BILL_ABOUT_TO_EXPIRE,
+            cls.BILLING_I_HUB_DESTROYED_BY_BILL_FAILURE,
             # sov
-            cls.SOV_ENTOSIS_CAPTURE_STARTED,
-            cls.SOV_COMMAND_NODE_EVENT_STARTED,
             cls.SOV_ALL_CLAIM_ACQUIRED_MSG,
-            cls.SOV_STRUCTURE_REINFORCED,
-            cls.SOV_STRUCTURE_DESTROYED,
             cls.SOV_ALL_CLAIM_LOST_MSG,
+            cls.SOV_COMMAND_NODE_EVENT_STARTED,
+            cls.SOV_ENTOSIS_CAPTURE_STARTED,
+            cls.SOV_STRUCTURE_DESTROYED,
+            cls.SOV_STRUCTURE_REINFORCED,
             # cls.SOV_ALL_ANCHORING_MSG, # This notif is not broadcasted to all corporations
             # wars
             cls.WAR_ALLY_JOINED_WAR_AGGRESSOR_MSG,
@@ -238,43 +257,45 @@ class NotificationType(models.TextChoices):
     def relevant_for_moonmining(cls) -> Set["NotificationType"]:
         """Notification types about moon mining."""
         return {
-            cls.MOONMINING_EXTRACTION_STARTED,
+            cls.MOONMINING_AUTOMATIC_FRACTURE,
             cls.MOONMINING_EXTRACTION_CANCELLED,
-            cls.MOONMINING_LASER_FIRED,
             cls.MOONMINING_EXTRACTION_FINISHED,
-            cls.MOONMINING_AUTOMATIC_FRACTURE,
+            cls.MOONMINING_EXTRACTION_STARTED,
+            cls.MOONMINING_LASER_FIRED,
         }
 
     @classmethod
     def structure_related(cls) -> Set["NotificationType"]:
         """Notification types that are related to a structure."""
         return {
-            cls.STRUCTURE_ONLINE,
+            cls.MOONMINING_AUTOMATIC_FRACTURE,
+            cls.MOONMINING_EXTRACTION_CANCELLED,
+            cls.MOONMINING_EXTRACTION_FINISHED,
+            cls.MOONMINING_EXTRACTION_STARTED,
+            cls.MOONMINING_LASER_FIRED,
+            cls.ORBITAL_ATTACKED,
+            cls.ORBITAL_REINFORCED,
+            cls.OWNERSHIP_TRANSFERRED,
+            cls.STRUCTURE_ANCHORING,
+            cls.STRUCTURE_DESTROYED,
             cls.STRUCTURE_FUEL_ALERT,
             cls.STRUCTURE_JUMP_FUEL_ALERT,
+            cls.STRUCTURE_LOST_ARMOR,
+            cls.STRUCTURE_LOST_SHIELD,
+            cls.STRUCTURE_LOW_REAGENTS_ALERT,
+            cls.STRUCTURE_NO_REAGENTS_ALERT,
+            cls.STRUCTURE_ONLINE,
             cls.STRUCTURE_REFUELED_EXTRA,
+            cls.STRUCTURE_REINFORCEMENT_CHANGED,
             cls.STRUCTURE_SERVICES_OFFLINE,
-            cls.STRUCTURE_WENT_LOW_POWER,
-            cls.STRUCTURE_WENT_HIGH_POWER,
             cls.STRUCTURE_UNANCHORING,
             cls.STRUCTURE_UNDER_ATTACK,
-            cls.STRUCTURE_LOST_SHIELD,
-            cls.STRUCTURE_LOST_ARMOR,
-            cls.STRUCTURE_DESTROYED,
-            cls.OWNERSHIP_TRANSFERRED,
-            cls.STRUCTURE_ANCHORING,
-            cls.MOONMINING_EXTRACTION_STARTED,
-            cls.MOONMINING_EXTRACTION_FINISHED,
-            cls.MOONMINING_AUTOMATIC_FRACTURE,
-            cls.MOONMINING_EXTRACTION_CANCELLED,
-            cls.MOONMINING_LASER_FIRED,
-            cls.STRUCTURE_REINFORCEMENT_CHANGED,
-            cls.ORBITAL_ATTACKED,
-            cls.ORBITAL_REINFORCED,
+            cls.STRUCTURE_WENT_HIGH_POWER,
+            cls.STRUCTURE_WENT_LOW_POWER,
             cls.TOWER_ALERT_MSG,
-            cls.TOWER_RESOURCE_ALERT_MSG,
             cls.TOWER_REFUELED_EXTRA,
             cls.TOWER_REINFORCED_EXTRA,
+            cls.TOWER_RESOURCE_ALERT_MSG,
         }
 
     @classmethod

{aa_structures-2.11.0 → aa_structures-2.13.0}/structures/managers.py

@@ -237,7 +237,7 @@ class StructureQuerySet(models.QuerySet):
 
     def select_related_defaults(self) -> models.QuerySet:
         """returns a QuerySet with the default select_related"""
-        return self.select_related(
+        return self.select_related(  # pylint: disable=E1102
             "owner",
             "owner__corporation",
             "owner__corporation__alliance",
@@ -383,7 +383,9 @@ class StructureManagerBase(models.Manager):
     def update_or_create_from_dict(self, structure: dict, owner) -> Tuple[Any, bool]:
         """update or create structure from given dict"""
 
-        eve_type, _ = EveType.objects.get_or_create_esi(id=structure["type_id"])
+        eve_type: EveType = EveType.objects.get_or_create_esi(id=structure["type_id"])[
+            0
+        ]
         eve_solar_system, _ = EveSolarSystem.objects.get_or_create_esi(
             id=structure["system_id"]
         )
@@ -423,10 +425,11 @@ class StructureManagerBase(models.Manager):
         if old_obj:
             obj.handle_fuel_notifications(old_obj)
 
-        # Make sure we have dogmas loaded for this type for fittings
-        EveType.objects.get_or_create_esi(
-            id=structure["type_id"], enabled_sections=[EveType.Section.DOGMAS]
-        )
+        # Make sure we have dogmas loaded with all upwell structures for fittings
+        if eve_type.eve_group.eve_category_id == EveCategoryId.STRUCTURE:
+            EveType.objects.get_or_create_esi(
+                id=structure["type_id"], enabled_sections=[EveType.Section.DOGMAS]
+            )
 
         self._save_related_structure_services(structure, obj)