aa-structures 2.8.0__py3-none-any.whl → 2.9.1__py3-none-any.whl

structures/core/notification_embeds/main.py

@@ -2,19 +2,19 @@
 
 # pylint: disable=missing-class-docstring
 
+import re
 from typing import Optional
 
 import dhooks_lite
 
 from django.conf import settings
 from django.utils.translation import gettext as _
-from eveuniverse.models import EveEntity
 
 from app_utils.urls import reverse_absolute, static_file_absolute_url
 
 from structures import __title__
 from structures.core.notification_types import NotificationType
-from structures.helpers import get_or_create_esi_obj, is_absolute_url
+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
@@ -33,7 +33,7 @@ class NotificationBaseEmbed:
         if not isinstance(notification, NotificationBase):
             raise TypeError("notification must be of type Notification")
         self._notification = notification
-        self._parsed_text = notification.parsed_text()
+        self._data = notification.parsed_text()
         self._title = ""
         self._description = ""
         self._color = None
@@ -66,24 +66,24 @@ class NotificationBaseEmbed:
         damage_parts = []
         for prop in damage_labels:
             field_name = f"{prop[0]}{field_postfix}"
-            if field_name in self._parsed_text:
+            if field_name in self._data:
                 label = prop[1]
-                value = self._parsed_text[field_name] * factor
+                value = self._data[field_name] * factor
                 damage_parts.append(f"{label}: {value:.1f}%")
         damage_text = " | ".join(damage_parts)
         return damage_text
 
     def get_aggressor_link(self) -> str:
         """Returns the aggressor link from a parsed_text for POS and POCOs only."""
-        if self._parsed_text.get("aggressorAllianceID"):
+        if self._data.get("aggressorAllianceID"):
             key = "aggressorAllianceID"
-        elif self._parsed_text.get("aggressorCorpID"):
+        elif self._data.get("aggressorCorpID"):
             key = "aggressorCorpID"
-        elif self._parsed_text.get("aggressorID"):
+        elif self._data.get("aggressorID"):
             key = "aggressorID"
         else:
             return "(Unknown aggressor)"
-        entity = get_or_create_esi_obj(EveEntity, id=self._parsed_text[key])
+        entity = get_or_create_eve_entity(id=self._data[key])
         return Webhook.create_link(entity.name, entity.profile_url)
 
     def fuel_expires_target_date(self) -> str:
@@ -153,16 +153,18 @@ class NotificationBaseEmbed:
 
     # pylint: disable = too-many-locals
     @staticmethod
-    def create(notification: "NotificationBase") -> "NotificationBaseEmbed":
+    def create(notif: "NotificationBase") -> "NotificationBaseEmbed":
         """Creates a new instance of the respective subclass for given Notification."""
 
         from .billing_embeds import (
             NotificationBillingBillOutOfMoneyMsg,
             NotificationBillingIHubBillAboutToExpire,
             NotificationBillingIHubDestroyedByBillFailure,
+            NotificationCorpAllBillMsg,
         )
-        from .character_embeds import (
+        from .corporate_embeds import (
             NotificationCharAppAcceptMsg,
+            NotificationCharAppRejectMsg,
             NotificationCharAppWithdrawMsg,
             NotificationCharLeftCorpMsg,
             NotificationCorpAppInvitedMsg,
@@ -213,26 +215,42 @@ class NotificationBaseEmbed:
             NotificationTowerResourceAlertMsg,
         )
         from .war_embeds import (
+            NotificationAcceptedAlly,
+            NotificationAllWarCorpJoinedAllianceMsg,
+            NotificationAllWarSurrenderMsg,
             NotificationAllyJoinedWarMsg,
             NotificationCorpWarSurrenderMsg,
+            NotificationDeclareWar,
+            NotificationMercOfferedNegotiationMsg,
+            NotificationMercOfferRetractedMsg,
+            NotificationOfferedSurrender,
+            NotificationOfferedToAlly,
             NotificationWarAdopted,
             NotificationWarCorporationBecameEligible,
             NotificationWarCorporationNoLongerEligible,
             NotificationWarDeclared,
+            NotificationWarHQRemovedFromSpace,
             NotificationWarInherited,
+            NotificationWarInvalid,
             NotificationWarRetractedByConcord,
             NotificationWarSurrenderOfferMsg,
         )
 
-        if not isinstance(notification, NotificationBase):
+        if not isinstance(notif, NotificationBase):
             raise TypeError("notification must be of type NotificationBase")
 
         NT = NotificationType
         notif_type_2_class = {
+            # Billing
+            NT.BILLING_CORP_ALL_BILL_MSG: NotificationCorpAllBillMsg,
+            NT.BILLING_BILL_OUT_OF_MONEY_MSG: NotificationBillingBillOutOfMoneyMsg,
+            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.CORP_APP_INVITED_MSG: NotificationCorpAppInvitedMsg,
             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,
@@ -242,7 +260,23 @@ class NotificationBaseEmbed:
             NT.MOONMINING_AUTOMATIC_FRACTURE: NotificationMoonminningAutomaticFracture,
             NT.MOONMINING_EXTRACTION_CANCELLED: NotificationMoonminningExtractionCanceled,
             NT.MOONMINING_LASER_FIRED: NotificationMoonminningLaserFired,
-            # upwell structures
+            # 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_CLAIM_ACQUIRED_MSG: NotificationSovAllClaimAcquiredMsg,
+            NT.SOV_ALL_CLAIM_LOST_MSG: NotificationSovAllClaimLostMsg,
+            NT.SOV_STRUCTURE_REINFORCED: NotificationSovStructureReinforced,
+            NT.SOV_STRUCTURE_DESTROYED: NotificationSovStructureDestroyed,
+            NT.SOV_ALL_ANCHORING_MSG: NotificationSovAllAnchoringMsg,
+            # Towers
+            NT.TOWER_ALERT_MSG: NotificationTowerAlertMsg,
+            NT.TOWER_RESOURCE_ALERT_MSG: NotificationTowerResourceAlertMsg,
+            NT.TOWER_REFUELED_EXTRA: NotificationTowerRefueledExtra,
+            NT.TOWER_REINFORCED_EXTRA: NotificationTowerReinforcedExtra,
+            # Upwell structures
             NT.STRUCTURE_ONLINE: NotificationStructureOnline,
             NT.STRUCTURE_FUEL_ALERT: NotificationStructureFuelAlert,
             NT.STRUCTURE_JUMP_FUEL_ALERT: NotificationStructureJumpFuelAlert,
@@ -258,42 +292,46 @@ class NotificationBaseEmbed:
             NT.OWNERSHIP_TRANSFERRED: NotificationStructureOwnershipTransferred,
             NT.STRUCTURE_ANCHORING: NotificationStructureAnchoring,
             NT.STRUCTURE_REINFORCEMENT_CHANGED: NotificationStructureReinforceChange,
-            # Orbitals
-            NT.ORBITAL_ATTACKED: NotificationOrbitalAttacked,
-            NT.ORBITAL_REINFORCED: NotificationOrbitalReinforced,
-            # Towers
-            NT.TOWER_ALERT_MSG: NotificationTowerAlertMsg,
-            NT.TOWER_RESOURCE_ALERT_MSG: NotificationTowerResourceAlertMsg,
-            NT.TOWER_REFUELED_EXTRA: NotificationTowerRefueledExtra,
-            NT.TOWER_REINFORCED_EXTRA: NotificationTowerReinforcedExtra,
-            # Sov
-            NT.SOV_ENTOSIS_CAPTURE_STARTED: NotificationSovEntosisCaptureStarted,
-            NT.SOV_COMMAND_NODE_EVENT_STARTED: NotificationSovCommandNodeEventStarted,
-            NT.SOV_ALL_CLAIM_ACQUIRED_MSG: NotificationSovAllClaimAcquiredMsg,
-            NT.SOV_ALL_CLAIM_LOST_MSG: NotificationSovAllClaimLostMsg,
-            NT.SOV_STRUCTURE_REINFORCED: NotificationSovStructureReinforced,
-            NT.SOV_STRUCTURE_DESTROYED: NotificationSovStructureDestroyed,
-            NT.SOV_ALL_ANCHORING_MSG: NotificationSovAllAnchoringMsg,
             # War
+            NT.WAR_ACCEPTED_ALLY: NotificationAcceptedAlly,
             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_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_OFFERED_SURRENDER: NotificationOfferedSurrender,
             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_CORPORATION_BECAME_ELIGIBLE: NotificationWarCorporationBecameEligible,
-            NT.WAR_CORPORATION_NO_LONGER_ELIGIBLE: NotificationWarCorporationNoLongerEligible,
             NT.WAR_WAR_SURRENDER_OFFER_MSG: NotificationWarSurrenderOfferMsg,
-            # Billing
-            NT.BILLING_BILL_OUT_OF_MONEY_MSG: NotificationBillingBillOutOfMoneyMsg,
-            NT.BILLING_I_HUB_BILL_ABOUT_TO_EXPIRE: NotificationBillingIHubBillAboutToExpire,
-            NT.BILLING_I_HUB_DESTROYED_BY_BILL_FAILURE: NotificationBillingIHubDestroyedByBillFailure,
         }
         try:
-            notif_class = notif_type_2_class[notification.notif_type]
+            notif_class = notif_type_2_class[notif.notif_type]
         except KeyError:
-            raise NotImplementedError(repr(notification.notif_type)) from None
+            return NotificationGenericEmbed(notif)
+
+        return notif_class(notif)
+
 
-        return notif_class(notification)
+class NotificationGenericEmbed(NotificationBaseEmbed):
+    """A generic embed for undefined notifs."""
+
+    def __init__(self, notif: Notification) -> None:
+        super().__init__(notif)
+        self._title = re.sub(
+            r"((?<=[a-z])[A-Z]|(?<!\A)[A-Z](?=[a-z]))", r" \1", notif.notif_type
+        )
+        self._color = Webhook.Color.INFO
+        self._thumbnail = dhooks_lite.Thumbnail(
+            notif.sender.icon_url(size=self.ICON_DEFAULT_SIZE)
+        )

structures/core/notification_embeds/moonmining_embeds.py

@@ -6,12 +6,11 @@
 import dhooks_lite
 
 from django.utils.translation import gettext as _
-from eveuniverse.models import EveEntity, EveType
 
 from app_utils.datetime import ldap_time_2_datetime
 
 from structures.app_settings import STRUCTURES_NOTIFICATION_SHOW_MOON_ORE
-from structures.helpers import get_or_create_esi_obj
+from structures.helpers import get_or_create_eve_entity, get_or_create_eve_type
 from structures.models import Notification, Webhook
 
 from .helpers import (
@@ -31,7 +30,7 @@ class NotificationMoonminingEmbed(NotificationBaseEmbed):
         self._solar_system_link = gen_solar_system_text(
             self._notification.eve_solar_system()
         )
-        self._structure_name = self._parsed_text["structureName"]
+        self._structure_name = self._data["structureName"]
         self._owner_link = gen_corporation_link(str(notification.owner))
         structure_type = self._notification.eve_structure_type()
         self._thumbnail = dhooks_lite.Thumbnail(
@@ -44,12 +43,12 @@ class NotificationMoonminingEmbed(NotificationBaseEmbed):
         )
 
     def _ore_composition_text(self) -> str:
-        if "oreVolumeByType" not in self._parsed_text:
+        if "oreVolumeByType" not in self._data:
             return ""
 
         ore_list = []
-        for ore_type_id, volume in self._parsed_text["oreVolumeByType"].items():
-            ore_type = get_or_create_esi_obj(EveType, id=ore_type_id)
+        for ore_type_id, volume in self._data["oreVolumeByType"].items():
+            ore_type = get_or_create_eve_type(id=ore_type_id)
             if ore_type:
                 ore_list.append(
                     {"id": ore_type_id, "name": ore_type.name, "volume": volume}
@@ -64,9 +63,9 @@ class NotificationMoonminingEmbed(NotificationBaseEmbed):
 class NotificationMoonminningExtractionStarted(NotificationMoonminingEmbed):
     def __init__(self, notification: Notification) -> None:
         super().__init__(notification)
-        started_by = get_or_create_esi_obj(EveEntity, id=self._parsed_text["startedBy"])
-        ready_time = ldap_time_2_datetime(self._parsed_text["readyTime"])
-        auto_time = ldap_time_2_datetime(self._parsed_text["autoTime"])
+        started_by = get_or_create_eve_entity(id=self._data["startedBy"])
+        ready_time = ldap_time_2_datetime(self._data["readyTime"])
+        auto_time = ldap_time_2_datetime(self._data["autoTime"])
         self._title = _("Moon mining extraction started")
         self._description = _(
             "A moon mining extraction has been started "
@@ -92,7 +91,7 @@ class NotificationMoonminningExtractionStarted(NotificationMoonminingEmbed):
 class NotificationMoonminningExtractionFinished(NotificationMoonminingEmbed):
     def __init__(self, notification: Notification) -> None:
         super().__init__(notification)
-        auto_time = ldap_time_2_datetime(self._parsed_text["autoTime"])
+        auto_time = ldap_time_2_datetime(self._data["autoTime"])
         self._title = _("Extraction finished")
         self._description = _(
             "The extraction for %(structure_name)s at %(moon)s "
@@ -135,10 +134,8 @@ class NotificationMoonminningAutomaticFracture(NotificationMoonminingEmbed):
 class NotificationMoonminningExtractionCanceled(NotificationMoonminingEmbed):
     def __init__(self, notification: Notification) -> None:
         super().__init__(notification)
-        if self._parsed_text["cancelledBy"]:
-            cancelled_by = get_or_create_esi_obj(
-                EveEntity, id=self._parsed_text["cancelledBy"]
-            )
+        if self._data["cancelledBy"]:
+            cancelled_by = get_or_create_eve_entity(id=self._data["cancelledBy"])
         else:
             cancelled_by = _("(unknown)")
         self._title = _("Extraction cancelled")
@@ -159,9 +156,7 @@ class NotificationMoonminningExtractionCanceled(NotificationMoonminingEmbed):
 class NotificationMoonminningLaserFired(NotificationMoonminingEmbed):
     def __init__(self, notification: Notification) -> None:
         super().__init__(notification)
-        fired_by = EveEntity.objects.get_or_create_esi(id=self._parsed_text["firedBy"])[
-            0
-        ]
+        fired_by = get_or_create_eve_entity(id=self._data["firedBy"])
         self._title = _("Moon drill fired")
         self._description = _(
             "The moon drill fitted to %(structure_name)s at %(moon)s "

structures/core/notification_embeds/orbital_embeds.py

@@ -5,12 +5,11 @@
 import dhooks_lite
 
 from django.utils.translation import gettext as _
-from eveuniverse.models import EveType
 
 from app_utils.datetime import ldap_time_2_datetime
 
 from structures.constants import EveTypeId
-from structures.helpers import get_or_create_esi_obj
+from structures.helpers import get_or_create_eve_type
 from structures.models import Notification, Webhook
 
 from .helpers import (
@@ -27,9 +26,7 @@ class NotificationOrbitalEmbed(NotificationBaseEmbed):
     def __init__(self, notification: Notification) -> None:
         super().__init__(notification)
         self._planet = self._notification.eve_planet()
-        self._structure_type = get_or_create_esi_obj(
-            EveType, id=EveTypeId.CUSTOMS_OFFICE
-        )
+        self._structure_type = get_or_create_eve_type(id=EveTypeId.CUSTOMS_OFFICE)
         self._solar_system_link = gen_solar_system_text(
             self._notification.eve_solar_system()
         )
@@ -61,9 +58,7 @@ class NotificationOrbitalAttacked(NotificationOrbitalEmbed):
 class NotificationOrbitalReinforced(NotificationOrbitalEmbed):
     def __init__(self, notification: Notification) -> None:
         super().__init__(notification)
-        reinforce_exit_time = ldap_time_2_datetime(
-            self._parsed_text["reinforceExitTime"]
-        )
+        reinforce_exit_time = ldap_time_2_datetime(self._data["reinforceExitTime"])
         self._title = _("Orbital reinforced")
         self._description = _(
             "The %(structure_type)s at %(planet)s in %(solar_system)s "

structures/core/notification_embeds/sov_embeds.py

@@ -5,13 +5,17 @@
 import dhooks_lite
 
 from django.utils.translation import gettext as _
-from eveuniverse.models import EveEntity, EveMoon, EveType
+from eveuniverse.models import EveMoon
 
 from app_utils.datetime import ldap_time_2_datetime
 
 from structures.constants import EveTypeId
 from structures.core import sovereignty
-from structures.helpers import get_or_create_esi_obj
+from structures.helpers import (
+    get_or_create_esi_obj,
+    get_or_create_eve_entity,
+    get_or_create_eve_type,
+)
 from structures.models import Notification, Webhook
 
 from .helpers import (
@@ -31,15 +35,15 @@ class NotificationSovEmbed(NotificationBaseEmbed):
         super().__init__(notification)
         self._solar_system = self._notification.eve_solar_system()
         self._solar_system_link = gen_solar_system_text(self._solar_system)
-        if "structureTypeID" in self._parsed_text:
-            structure_type_id = self._parsed_text["structureTypeID"]
-        elif "campaignEventType" in self._parsed_text:
+        if "structureTypeID" in self._data:
+            structure_type_id = self._data["structureTypeID"]
+        elif "campaignEventType" in self._data:
             structure_type_id = sovereignty.event_type_to_type_id(
-                self._parsed_text["campaignEventType"]
+                self._data["campaignEventType"]
             )
         else:
             structure_type_id = EveTypeId.TCU
-        structure_type = get_or_create_esi_obj(EveType, id=structure_type_id)
+        structure_type = get_or_create_eve_type(id=structure_type_id)
         self._structure_type_name = structure_type.name
         try:
             self._sov_owner_link = gen_alliance_link(notification.sender.name)
@@ -95,8 +99,8 @@ class NotificationSovCommandNodeEventStarted(NotificationSovEmbed):
 class NotificationSovAllClaimAcquiredMsg(NotificationSovEmbed):
     def __init__(self, notification: Notification) -> None:
         super().__init__(notification)
-        alliance = get_or_create_esi_obj(EveEntity, id=self._parsed_text["allianceID"])
-        corporation = get_or_create_esi_obj(EveEntity, id=self._parsed_text["corpID"])
+        alliance = get_or_create_eve_entity(id=self._data["allianceID"])
+        corporation = get_or_create_eve_entity(id=self._data["corpID"])
         self._title = (
             _("DED Sovereignty claim acknowledgment: %s") % self._solar_system.name
         )
@@ -115,8 +119,8 @@ class NotificationSovAllClaimAcquiredMsg(NotificationSovEmbed):
 class NotificationSovAllClaimLostMsg(NotificationSovEmbed):
     def __init__(self, notification: Notification) -> None:
         super().__init__(notification)
-        alliance = get_or_create_esi_obj(EveEntity, id=self._parsed_text["allianceID"])
-        corporation = get_or_create_esi_obj(EveEntity, id=self._parsed_text["corpID"])
+        alliance = get_or_create_eve_entity(id=self._data["allianceID"])
+        corporation = get_or_create_eve_entity(id=self._data["corpID"])
         self._title = _("Lost sovereignty in: %s") % self._solar_system.name
         self._description = _(
             "DED acknowledges that member corporation %(corporation)s has lost its "
@@ -132,7 +136,7 @@ class NotificationSovAllClaimLostMsg(NotificationSovEmbed):
 class NotificationSovStructureReinforced(NotificationSovEmbed):
     def __init__(self, notification: Notification) -> None:
         super().__init__(notification)
-        timer_starts = ldap_time_2_datetime(self._parsed_text["decloakTime"])
+        timer_starts = ldap_time_2_datetime(self._data["decloakTime"])
         self._title = _(
             "%(structure_type)s in %(solar_system)s has entered reinforced mode"
         ) % {
@@ -175,21 +179,19 @@ class NotificationSovStructureDestroyed(NotificationSovEmbed):
 class NotificationSovAllAnchoringMsg(NotificationBaseEmbed):
     def __init__(self, notification: Notification) -> None:
         super().__init__(notification)
-        corporation = get_or_create_esi_obj(
-            EveEntity, id=self._parsed_text.get("corpID")
-        )
+        corporation = get_or_create_eve_entity(id=self._data.get("corpID"))
         corp_link = gen_eve_entity_link(corporation)
-        alliance_id = self._parsed_text.get("allianceID")
+        alliance_id = self._data.get("allianceID")
         if alliance_id:
-            alliance = get_or_create_esi_obj(EveEntity, id=alliance_id)
+            alliance = get_or_create_eve_entity(id=alliance_id)
             structure_owner = f"{corp_link} ({alliance.name})"
         else:
             structure_owner = corp_link
         eve_solar_system = self._notification.eve_solar_system()
         structure_type = self._notification.eve_structure_type("typeID")
-        moon_id = self._parsed_text.get("moonID")
+        moon_id = self._data.get("moonID")
         if moon_id:
-            eve_moon = get_or_create_esi_obj(EveMoon, id=moon_id)
+            eve_moon: EveMoon = get_or_create_esi_obj(EveMoon, id=moon_id)
             location_text = _(" near **%s**") % eve_moon.name
         else:
             location_text = ""

structures/core/notification_embeds/structures_embeds.py

@@ -7,11 +7,10 @@ from collections import namedtuple
 import dhooks_lite
 
 from django.utils.translation import gettext as _
-from eveuniverse.models import EveEntity, EveType
 
 from app_utils.datetime import ldap_time_2_datetime, ldap_timedelta_2_timedelta
 
-from structures.helpers import get_or_create_esi_obj
+from structures.helpers import get_or_create_eve_entity, get_or_create_eve_type
 from structures.models import Notification, Structure, Webhook
 
 from .helpers import (
@@ -31,7 +30,7 @@ class NotificationStructureEmbed(NotificationBaseEmbed):
         super().__init__(notification)
         try:
             structure = Structure.objects.select_related_defaults().get(
-                id=self._parsed_text["structureID"]
+                id=self._data["structureID"]
             )
         except Structure.DoesNotExist:
             structure = None
@@ -97,7 +96,7 @@ class NotificationStructureJumpFuelAlert(NotificationStructureEmbed):
     def __init__(self, notification: Notification) -> None:
         super().__init__(notification)
         self._title = _("Jump gate low on Liquid Ozone")
-        threshold_str = f"{self._parsed_text['threshold']:,}"
+        threshold_str = f"{self._data['threshold']:,}"
         quantity_str = f"{self._structure.jump_fuel_quantity():,}"
         self._description += _(
             "is below %(threshold)s units on Liquid Ozone.\n"
@@ -153,7 +152,7 @@ class NotificationStructureUnanchoring(NotificationStructureEmbed):
         super().__init__(notification)
         self._title = _("Structure un-anchoring")
         unanchored_at = notification.timestamp + ldap_timedelta_2_timedelta(
-            self._parsed_text["timeLeft"]
+            self._data["timeLeft"]
         )
         self._description += _(
             "has started un-anchoring. It will be fully un-anchored at: %s"
@@ -173,11 +172,11 @@ class NotificationStructureUnderAttack(NotificationStructureEmbed):
 
     def _get_attacker_link(self) -> str:
         """Returns the attacker link from a parsed_text for Upwell structures only."""
-        if self._parsed_text.get("allianceName"):
-            return gen_alliance_link(self._parsed_text["allianceName"])
+        if self._data.get("allianceName"):
+            return gen_alliance_link(self._data["allianceName"])
 
-        if self._parsed_text.get("corpName"):
-            return gen_corporation_link(self._parsed_text["corpName"])
+        if self._data.get("corpName"):
+            return gen_corporation_link(self._data["corpName"])
 
         return _("(unknown)")
 
@@ -187,7 +186,7 @@ class NotificationStructureLostShield(NotificationStructureEmbed):
         super().__init__(notification)
         self._title = _("Structure lost shield")
         timer_ends_at = notification.timestamp + ldap_timedelta_2_timedelta(
-            self._parsed_text["timeLeft"]
+            self._data["timeLeft"]
         )
         self._description += _(
             "has lost its shields. Armor timer end at: %s"
@@ -200,7 +199,7 @@ class NotificationStructureLostArmor(NotificationStructureEmbed):
         super().__init__(notification)
         self._title = _("Structure lost armor")
         timer_ends_at = notification.timestamp + ldap_timedelta_2_timedelta(
-            self._parsed_text["timeLeft"]
+            self._data["timeLeft"]
         )
         self._description += _(
             "has lost its armor. Hull timer end at: %s"
@@ -224,18 +223,14 @@ class NotificationStructureOwnershipTransferred(NotificationBaseEmbed):
             "The %(structure_type)s %(structure_name)s in %(solar_system)s "
         ) % {
             "structure_type": structure_type.name,
-            "structure_name": Webhook.text_bold(self._parsed_text["structureName"]),
+            "structure_name": Webhook.text_bold(self._data["structureName"]),
             "solar_system": gen_solar_system_text(
                 self._notification.eve_solar_system()
             ),
         }
-        from_corporation = get_or_create_esi_obj(
-            EveEntity, id=self._parsed_text["oldOwnerCorpID"]
-        )
-        to_corporation = get_or_create_esi_obj(
-            EveEntity, id=self._parsed_text["newOwnerCorpID"]
-        )
-        character = get_or_create_esi_obj(EveEntity, id=self._parsed_text["charID"])
+        from_corporation = get_or_create_eve_entity(id=self._data["oldOwnerCorpID"])
+        to_corporation = get_or_create_eve_entity(id=self._data["newOwnerCorpID"])
+        character = get_or_create_eve_entity(id=self._data["charID"])
         self._description += _(
             "has been transferred from %(from_corporation)s "
             "to %(to_corporation)s by %(character)s."
@@ -256,9 +251,7 @@ class NotificationStructureAnchoring(NotificationBaseEmbed):
         super().__init__(notification)
         structure_type = self._notification.eve_structure_type()
         solar_system = self._notification.eve_solar_system("solarsystemID")
-        owner_link = gen_corporation_link(
-            self._parsed_text.get("ownerCorpName", "(unknown)")
-        )
+        owner_link = gen_corporation_link(self._data.get("ownerCorpName", "(unknown)"))
         self._description = _(
             "A %(structure_type)s belonging to %(owner_link)s "
             "has started anchoring in %(solar_system)s. "
@@ -282,7 +275,7 @@ class NotificationStructureReinforceChange(NotificationBaseEmbed):
     def __init__(self, notification: Notification) -> None:
         super().__init__(notification)
         all_structure_info = []
-        for structure_info in self._parsed_text["allStructureInfo"]:
+        for structure_info in self._data["allStructureInfo"]:
             try:
                 structure = Structure.objects.select_related_defaults().get(
                     id=structure_info[0]
@@ -291,7 +284,7 @@ class NotificationStructureReinforceChange(NotificationBaseEmbed):
                 all_structure_info.append(
                     self.StructureInfo(
                         name=structure_info[1],
-                        eve_type=get_or_create_esi_obj(EveType, id=structure_info[2]),
+                        eve_type=get_or_create_eve_type(id=structure_info[2]),
                         eve_solar_system=None,
                         owner_link=_("(unknown)"),
                     )
@@ -307,11 +300,11 @@ class NotificationStructureReinforceChange(NotificationBaseEmbed):
                 )
 
         self._title = _("Structure reinforcement time changed")
-        change_effective = ldap_time_2_datetime(self._parsed_text["timestamp"])
+        change_effective = ldap_time_2_datetime(self._data["timestamp"])
         self._description = _(
             "Reinforcement hour has been changed to %s "
             "for the following structures:\n"
-        ) % Webhook.text_bold(self._parsed_text["hour"])
+        ) % Webhook.text_bold(self._data["hour"])
         for structure_info in all_structure_info:
             if eve_solar_system := structure_info.eve_solar_system:
                 solar_system_text = gen_solar_system_text(eve_solar_system)

structures/core/notification_embeds/tower_embeds.py

@@ -69,8 +69,8 @@ class NotificationTowerAlertMsg(NotificationTowerEmbed):
 class NotificationTowerResourceAlertMsg(NotificationTowerEmbed):
     def __init__(self, notification: Notification) -> None:
         super().__init__(notification)
-        if "wants" in self._parsed_text and self._parsed_text["wants"]:
-            fuel_quantity = self._parsed_text["wants"][0]["quantity"]
+        if "wants" in self._data and self._data["wants"]:
+            fuel_quantity = self._data["wants"][0]["quantity"]
             starbase_type = self._notification.eve_structure_type("typeID")
             seconds = starbases.fuel_duration(
                 starbase_type=starbase_type,