aa-structures 2.6.0__py3-none-any.whl → 2.6.2__py3-none-any.whl

structures/core/notification_embeds/billing_embeds.py

@@ -6,12 +6,13 @@
 import dhooks_lite
 
 from django.db import models
-from django.utils.translation import gettext as __
+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.models import Notification, Webhook
 
 from .helpers import gen_solar_system_text, target_datetime_formatted
@@ -21,8 +22,8 @@ from .main import NotificationBaseEmbed
 class BillType(models.IntegerChoices):
     """A bill type for infrastructure hub bills."""
 
-    UNKNOWN = 0, __("Unknown Bill")
-    INFRASTRUCTURE_HUB = 7, __("Infrastructure Hub Bill")
+    UNKNOWN = 0, _("Unknown Bill")
+    INFRASTRUCTURE_HUB = 7, _("Infrastructure Hub Bill")
 
     @classmethod
     def to_enum(cls, bill_id: int):
@@ -39,8 +40,8 @@ class NotificationBillingBillOutOfMoneyMsg(NotificationBaseEmbed):
         bill_type_id = self._parsed_text["billTypeID"]
         bill_type_str = BillType.to_enum(bill_type_id).label
         due_date = ldap_time_2_datetime(self._parsed_text["dueDate"])
-        self._title = __("Insufficient Funds for Bill")
-        self._description = __(
+        self._title = _("Insufficient Funds for Bill")
+        self._description = _(
             "The selected corporation wallet division for automatic payments "
             "does not have enough current funds available to pay the %(bill_type)s "
             "due to be paid by %(due_date)s. "
@@ -58,8 +59,8 @@ class NotificationBillingIHubBillAboutToExpire(NotificationBaseEmbed):
         super().__init__(notification)
         solar_system_link = gen_solar_system_text(self._notification.eve_solar_system())
         due_date = ldap_time_2_datetime(self._parsed_text.get("dueDate"))
-        self._title = __("IHub Bill About to Expire")
-        self._description = __(
+        self._title = _("IHub Bill About to Expire")
+        self._description = _(
             "Maintenance bill for Infrastructure Hub in %(solar_system)s "
             "expires at %(due_date)s, "
             "if not paid in time this Infrastructure Hub will self-destruct."
@@ -68,7 +69,7 @@ class NotificationBillingIHubBillAboutToExpire(NotificationBaseEmbed):
             "due_date": target_datetime_formatted(due_date),
         }
         self._color = Webhook.Color.DANGER
-        structure_type, _ = EveType.objects.get_or_create_esi(id=EveTypeId.IHUB)
+        structure_type = get_or_create_esi_obj(EveType, id=EveTypeId.IHUB)
         self._thumbnail = dhooks_lite.Thumbnail(
             structure_type.icon_url(size=self.ICON_DEFAULT_SIZE)
         )
@@ -80,10 +81,10 @@ class NotificationBillingIHubDestroyedByBillFailure(NotificationBaseEmbed):
         solar_system_link = gen_solar_system_text(self._notification.eve_solar_system())
         structure_type = self._notification.eve_structure_type()
         self._title = (
-            __("%s has self-destructed due to unpaid maintenance bills")
+            _("%s has self-destructed due to unpaid maintenance bills")
             % structure_type.name
         )
-        self._description = __(
+        self._description = _(
             "%(structure_type)s in %(solar_system)s has self-destructed, "
             "as the standard maintenance bills where not paid."
         ) % {"structure_type": structure_type.name, "solar_system": solar_system_link}

structures/core/notification_embeds/character_embeds.py

@@ -4,9 +4,10 @@
 
 import dhooks_lite
 
-from django.utils.translation import gettext as __
+from django.utils.translation import gettext as _
 from eveuniverse.models import EveEntity
 
+from structures.helpers import get_or_create_esi_obj
 from structures.models import Notification, Webhook
 
 from .helpers import (
@@ -20,11 +21,11 @@ from .main import NotificationBaseEmbed
 class NotificationCorpCharEmbed(NotificationBaseEmbed):
     def __init__(self, notification: Notification) -> None:
         super().__init__(notification)
-        self._character, _ = EveEntity.objects.get_or_create_esi(
-            id=self._parsed_text["charID"]
+        self._character = get_or_create_esi_obj(
+            EveEntity, id=self._parsed_text["charID"]
         )
-        self._corporation, _ = EveEntity.objects.get_or_create_esi(
-            id=self._parsed_text["corpID"]
+        self._corporation = get_or_create_esi_obj(
+            EveEntity, id=self._parsed_text["corpID"]
         )
         self._character_link = gen_eve_entity_link(self._character)
         self._corporation_link = gen_corporation_link(self._corporation.name)
@@ -37,10 +38,10 @@ class NotificationCorpCharEmbed(NotificationBaseEmbed):
 class NotificationCorpAppNewMsg(NotificationCorpCharEmbed):
     def __init__(self, notification: Notification) -> None:
         super().__init__(notification)
-        self._title = __("New application from %(character_name)s") % {
+        self._title = _("New application from %(character_name)s") % {
             "character_name": self._character.name,
         }
-        self._description = __(
+        self._description = _(
             "New application from %(character_name)s to join %(corporation_name)s:\n"
             "> %(application_text)s"
             % {
@@ -55,13 +56,13 @@ class NotificationCorpAppNewMsg(NotificationCorpCharEmbed):
 class NotificationCorpAppInvitedMsg(NotificationCorpCharEmbed):
     def __init__(self, notification: Notification) -> None:
         super().__init__(notification)
-        self._title = __("%(character_name)s has been invited") % {
+        self._title = _("%(character_name)s has been invited") % {
             "character_name": self._character.name
         }
         inviting_character = gen_eve_entity_link_from_id(
             self._parsed_text.get("invokingCharID")
         )
-        self._description = __(
+        self._description = _(
             "%(character_name)s has been invited to join %(corporation_name)s "
             "by %(inviting_character)s.\n"
             "Application:\n"
@@ -79,10 +80,10 @@ class NotificationCorpAppInvitedMsg(NotificationCorpCharEmbed):
 class NotificationCorpAppRejectCustomMsg(NotificationCorpCharEmbed):
     def __init__(self, notification: Notification) -> None:
         super().__init__(notification)
-        self._title = __("Rejected application from %(character_name)s") % {
+        self._title = _("Rejected application from %(character_name)s") % {
             "character_name": self._character.name
         }
-        self._description = __(
+        self._description = _(
             "Application from %(character_name)s to join %(corporation_name)s:\n"
             "> %(application_text)s\n"
             "Has been rejected:\n"
@@ -100,10 +101,10 @@ class NotificationCorpAppRejectCustomMsg(NotificationCorpCharEmbed):
 class NotificationCharAppWithdrawMsg(NotificationCorpCharEmbed):
     def __init__(self, notification: Notification) -> None:
         super().__init__(notification)
-        self._title = __("%(character_name)s withdrew his/her application") % {
+        self._title = _("%(character_name)s withdrew his/her application") % {
             "character_name": self._character.name,
         }
-        self._description = __(
+        self._description = _(
             "%(character_name)s withdrew his/her application to join "
             "%(corporation_name)s:\n"
             "> %(application_text)s"
@@ -119,11 +120,11 @@ class NotificationCharAppWithdrawMsg(NotificationCorpCharEmbed):
 class NotificationCharAppAcceptMsg(NotificationCorpCharEmbed):
     def __init__(self, notification: Notification) -> None:
         super().__init__(notification)
-        self._title = __("%(character_name)s joins %(corporation_name)s") % {
+        self._title = _("%(character_name)s joins %(corporation_name)s") % {
             "character_name": self._character.name,
             "corporation_name": self._corporation.name,
         }
-        self._description = __(
+        self._description = _(
             "%(character_name)s is now a member of %(corporation_name)s."
         ) % {
             "character_name": self._character_link,
@@ -135,11 +136,11 @@ class NotificationCharAppAcceptMsg(NotificationCorpCharEmbed):
 class NotificationCharLeftCorpMsg(NotificationCorpCharEmbed):
     def __init__(self, notification: Notification) -> None:
         super().__init__(notification)
-        self._title = __("%(character_name)s has left %(corporation_name)s") % {
+        self._title = _("%(character_name)s has left %(corporation_name)s") % {
             "character_name": self._character.name,
             "corporation_name": self._corporation.name,
         }
-        self._description = __(
+        self._description = _(
             "%(character_name)s is no longer a member of %(corporation_name)s."
         ) % {
             "character_name": self._character_link,

structures/core/notification_embeds/main.py

@@ -7,14 +7,14 @@ from typing import Optional
 import dhooks_lite
 
 from django.conf import settings
-from django.utils.translation import gettext as __
+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 is_absolute_url
+from structures.helpers import get_or_create_esi_obj, is_absolute_url
 from structures.models.notifications import Notification, NotificationBase, Webhook
 
 from .helpers import target_datetime_formatted
@@ -59,9 +59,9 @@ class NotificationBaseEmbed:
     def compile_damage_text(self, field_postfix: str, factor: int = 1) -> str:
         """Compile damage text for Structures and POSes"""
         damage_labels = [
-            ("shield", __("shield")),
-            ("armor", __("armor")),
-            ("hull", __("hull")),
+            ("shield", _("shield")),
+            ("armor", _("armor")),
+            ("hull", _("hull")),
         ]
         damage_parts = []
         for prop in damage_labels:
@@ -83,7 +83,7 @@ class NotificationBaseEmbed:
             key = "aggressorID"
         else:
             return "(Unknown aggressor)"
-        entity, _ = EveEntity.objects.get_or_create_esi(id=self._parsed_text[key])
+        entity = get_or_create_esi_obj(EveEntity, id=self._parsed_text[key])
         return Webhook.create_link(entity.name, entity.profile_url)
 
     def fuel_expires_target_date(self) -> str:

structures/core/notification_embeds/moonmining_embeds.py

@@ -5,12 +5,13 @@
 
 import dhooks_lite
 
-from django.utils.translation import gettext as __
+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.models import Notification, Webhook
 
 from .helpers import (
@@ -37,7 +38,7 @@ class NotificationMoonminingEmbed(NotificationBaseEmbed):
             structure_type.icon_url(size=self.ICON_DEFAULT_SIZE)
         )
         self.ore_text = (
-            __("\nEstimated ore composition: %s") % self._ore_composition_text()
+            _("Estimated ore composition: %s") % self._ore_composition_text()
             if STRUCTURES_NOTIFICATION_SHOW_MOON_ORE
             else ""
         )
@@ -48,7 +49,7 @@ class NotificationMoonminingEmbed(NotificationBaseEmbed):
 
         ore_list = []
         for ore_type_id, volume in self._parsed_text["oreVolumeByType"].items():
-            ore_type, _ = EveType.objects.get_or_create_esi(id=ore_type_id)
+            ore_type = get_or_create_esi_obj(EveType, id=ore_type_id)
             if ore_type:
                 ore_list.append(
                     {"id": ore_type_id, "name": ore_type.name, "volume": volume}
@@ -63,20 +64,18 @@ class NotificationMoonminingEmbed(NotificationBaseEmbed):
 class NotificationMoonminningExtractionStarted(NotificationMoonminingEmbed):
     def __init__(self, notification: Notification) -> None:
         super().__init__(notification)
-        started_by, _ = EveEntity.objects.get_or_create_esi(
-            id=self._parsed_text["startedBy"]
-        )
+        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"])
-        self._title = __("Moon mining extraction started")
-        self._description = __(
+        self._title = _("Moon mining extraction started")
+        self._description = _(
             "A moon mining extraction has been started "
             "for %(structure_name)s at %(moon)s in %(solar_system)s "
             "belonging to %(owner_link)s. "
             "Extraction was started by %(character)s.\n"
             "The chunk will be ready on location at %(ready_time)s, "
             "and will fracture automatically on %(auto_time)s.\n"
-            "%(ore_text)s"
+            "\n%(ore_text)s"
         ) % {
             "structure_name": Webhook.text_bold(self._structure_name),
             "moon": self._moon.name,
@@ -94,14 +93,14 @@ class NotificationMoonminningExtractionFinished(NotificationMoonminingEmbed):
     def __init__(self, notification: Notification) -> None:
         super().__init__(notification)
         auto_time = ldap_time_2_datetime(self._parsed_text["autoTime"])
-        self._title = __("Extraction finished")
-        self._description = __(
+        self._title = _("Extraction finished")
+        self._description = _(
             "The extraction for %(structure_name)s at %(moon)s "
             "in %(solar_system)s belonging to %(owner_link)s "
             "is finished and the chunk is ready "
             "to be shot at.\n"
             "The chunk will automatically fracture on %(auto_time)s.\n"
-            "%(ore_text)s"
+            "\n%(ore_text)s"
         ) % {
             "structure_name": Webhook.text_bold(self._structure_name),
             "moon": self._moon.name,
@@ -116,13 +115,13 @@ class NotificationMoonminningExtractionFinished(NotificationMoonminingEmbed):
 class NotificationMoonminningAutomaticFracture(NotificationMoonminingEmbed):
     def __init__(self, notification: Notification) -> None:
         super().__init__(notification)
-        self._title = __("Automatic Fracture")
-        self._description = __(
+        self._title = _("Automatic Fracture")
+        self._description = _(
             "The moon drill fitted to %(structure_name)s at %(moon)s"
             " in %(solar_system)s belonging to %(owner_link)s "
             "has automatically been fired "
             "and the moon products are ready to be harvested.\n"
-            "%(ore_text)s"
+            "\n%(ore_text)s"
         ) % {
             "structure_name": Webhook.text_bold(self._structure_name),
             "moon": self._moon.name,
@@ -137,13 +136,13 @@ class NotificationMoonminningExtractionCanceled(NotificationMoonminingEmbed):
     def __init__(self, notification: Notification) -> None:
         super().__init__(notification)
         if self._parsed_text["cancelledBy"]:
-            cancelled_by, _ = EveEntity.objects.get_or_create_esi(
-                id=self._parsed_text["cancelledBy"]
+            cancelled_by = get_or_create_esi_obj(
+                EveEntity, id=self._parsed_text["cancelledBy"]
             )
         else:
-            cancelled_by = __("(unknown)")
-        self._title = __("Extraction cancelled")
-        self._description = __(
+            cancelled_by = _("(unknown)")
+        self._title = _("Extraction cancelled")
+        self._description = _(
             "An ongoing extraction for %(structure_name)s at %(moon)s "
             "in %(solar_system)s belonging to %(owner_link)s "
             "has been cancelled by %(character)s."
@@ -160,16 +159,16 @@ 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"]
-        )
-        self._title = __("Moon drill fired")
-        self._description = __(
+        fired_by = EveEntity.objects.get_or_create_esi(id=self._parsed_text["firedBy"])[
+            0
+        ]
+        self._title = _("Moon drill fired")
+        self._description = _(
             "The moon drill fitted to %(structure_name)s at %(moon)s "
             "in %(solar_system)s belonging to %(owner_link)s "
             "has been fired by %(character)s "
             "and the moon products are ready to be harvested.\n"
-            "%(ore_text)s"
+            "\n%(ore_text)s"
         ) % {
             "structure_name": Webhook.text_bold(self._structure_name),
             "moon": self._moon.name,

structures/core/notification_embeds/orbital_embeds.py

@@ -4,12 +4,13 @@
 
 import dhooks_lite
 
-from django.utils.translation import gettext as __
+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.models import Notification, Webhook
 
 from .helpers import (
@@ -26,8 +27,8 @@ class NotificationOrbitalEmbed(NotificationBaseEmbed):
     def __init__(self, notification: Notification) -> None:
         super().__init__(notification)
         self._planet = self._notification.eve_planet()
-        self._structure_type, _ = EveType.objects.get_or_create_esi(
-            id=EveTypeId.CUSTOMS_OFFICE
+        self._structure_type = get_or_create_esi_obj(
+            EveType, id=EveTypeId.CUSTOMS_OFFICE
         )
         self._solar_system_link = gen_solar_system_text(
             self._notification.eve_solar_system()
@@ -42,8 +43,8 @@ class NotificationOrbitalEmbed(NotificationBaseEmbed):
 class NotificationOrbitalAttacked(NotificationOrbitalEmbed):
     def __init__(self, notification: Notification) -> None:
         super().__init__(notification)
-        self._title = __("Orbital under attack")
-        self._description = __(
+        self._title = _("Orbital under attack")
+        self._description = _(
             "The %(structure_type)s at %(planet)s in %(solar_system)s "
             "belonging to %(owner_link)s "
             "is under attack by %(aggressor)s."
@@ -63,8 +64,8 @@ class NotificationOrbitalReinforced(NotificationOrbitalEmbed):
         reinforce_exit_time = ldap_time_2_datetime(
             self._parsed_text["reinforceExitTime"]
         )
-        self._title = __("Orbital reinforced")
-        self._description = __(
+        self._title = _("Orbital reinforced")
+        self._description = _(
             "The %(structure_type)s at %(planet)s in %(solar_system)s "
             "belonging to %(owner_link)s "
             "has been reinforced by %(aggressor)s "

structures/core/notification_embeds/sov_embeds.py

@@ -4,13 +4,14 @@
 
 import dhooks_lite
 
-from django.utils.translation import gettext as __
+from django.utils.translation import gettext as _
 from eveuniverse.models import EveEntity, EveMoon, EveType
 
 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.models import Notification, Webhook
 
 from .helpers import (
@@ -38,7 +39,7 @@ class NotificationSovEmbed(NotificationBaseEmbed):
             )
         else:
             structure_type_id = EveTypeId.TCU
-        structure_type, _ = EveType.objects.get_or_create_esi(id=structure_type_id)
+        structure_type = get_or_create_esi_obj(EveType, id=structure_type_id)
         self._structure_type_name = structure_type.name
         try:
             self._sov_owner_link = gen_alliance_link(notification.sender.name)
@@ -52,11 +53,11 @@ class NotificationSovEmbed(NotificationBaseEmbed):
 class NotificationSovEntosisCaptureStarted(NotificationSovEmbed):
     def __init__(self, notification: Notification) -> None:
         super().__init__(notification)
-        self._title = __("%(structure_type)s in %(solar_system)s is being captured") % {
+        self._title = _("%(structure_type)s in %(solar_system)s is being captured") % {
             "structure_type": Webhook.text_bold(self._structure_type_name),
             "solar_system": self._solar_system.name,
         }
-        self._description = __(
+        self._description = _(
             "A capsuleer has started to influence the %(type)s "
             "in %(solar_system)s belonging to %(owner)s "
             "with an Entosis Link."
@@ -71,14 +72,14 @@ class NotificationSovEntosisCaptureStarted(NotificationSovEmbed):
 class NotificationSovCommandNodeEventStarted(NotificationSovEmbed):
     def __init__(self, notification: Notification) -> None:
         super().__init__(notification)
-        self._title = __(
+        self._title = _(
             "Command nodes for %(structure_type)s in %(solar_system)s "
             "have begun to decloak"
         ) % {
             "structure_type": Webhook.text_bold(self._structure_type_name),
             "solar_system": self._solar_system.name,
         }
-        self._description = __(
+        self._description = _(
             "Command nodes for %(structure_type)s in %(solar_system)s "
             "belonging to %(owner)s can now be found throughout "
             "the %(constellation)s constellation"
@@ -94,16 +95,12 @@ class NotificationSovCommandNodeEventStarted(NotificationSovEmbed):
 class NotificationSovAllClaimAcquiredMsg(NotificationSovEmbed):
     def __init__(self, notification: Notification) -> None:
         super().__init__(notification)
-        alliance, _ = EveEntity.objects.get_or_create_esi(
-            id=self._parsed_text["allianceID"]
-        )
-        corporation, _ = EveEntity.objects.get_or_create_esi(
-            id=self._parsed_text["corpID"]
-        )
+        alliance = get_or_create_esi_obj(EveEntity, id=self._parsed_text["allianceID"])
+        corporation = get_or_create_esi_obj(EveEntity, id=self._parsed_text["corpID"])
         self._title = (
-            __("DED Sovereignty claim acknowledgment: %s") % self._solar_system.name
+            _("DED Sovereignty claim acknowledgment: %s") % self._solar_system.name
         )
-        self._description = __(
+        self._description = _(
             "DED now officially acknowledges that your "
             "member corporation %(corporation)s has claimed "
             "sovereignty on behalf of %(alliance)s in %(solar_system)s."
@@ -118,14 +115,10 @@ class NotificationSovAllClaimAcquiredMsg(NotificationSovEmbed):
 class NotificationSovAllClaimLostMsg(NotificationSovEmbed):
     def __init__(self, notification: Notification) -> None:
         super().__init__(notification)
-        alliance, _ = EveEntity.objects.get_or_create_esi(
-            id=self._parsed_text["allianceID"]
-        )
-        corporation, _ = EveEntity.objects.get_or_create_esi(
-            id=self._parsed_text["corpID"]
-        )
-        self._title = __("Lost sovereignty in: %s") % self._solar_system.name
-        self._description = __(
+        alliance = get_or_create_esi_obj(EveEntity, id=self._parsed_text["allianceID"])
+        corporation = get_or_create_esi_obj(EveEntity, id=self._parsed_text["corpID"])
+        self._title = _("Lost sovereignty in: %s") % self._solar_system.name
+        self._description = _(
             "DED acknowledges that member corporation %(corporation)s has lost its "
             "claim to sovereignty on behalf of %(alliance)s in %(solar_system)s."
         ) % {
@@ -140,13 +133,13 @@ class NotificationSovStructureReinforced(NotificationSovEmbed):
     def __init__(self, notification: Notification) -> None:
         super().__init__(notification)
         timer_starts = ldap_time_2_datetime(self._parsed_text["decloakTime"])
-        self._title = __(
+        self._title = _(
             "%(structure_type)s in %(solar_system)s has entered reinforced mode"
         ) % {
             "structure_type": Webhook.text_bold(self._structure_type_name),
             "solar_system": self._solar_system.name,
         }
-        self._description = __(
+        self._description = _(
             "The %(structure_type)s in %(solar_system)s belonging "
             "to %(owner)s has been reinforced by "
             "hostile forces and command nodes "
@@ -163,13 +156,11 @@ class NotificationSovStructureReinforced(NotificationSovEmbed):
 class NotificationSovStructureDestroyed(NotificationSovEmbed):
     def __init__(self, notification: Notification) -> None:
         super().__init__(notification)
-        self._title = __(
-            "%(structure_type)s in %(solar_system)s has been destroyed"
-        ) % {
+        self._title = _("%(structure_type)s in %(solar_system)s has been destroyed") % {
             "structure_type": Webhook.text_bold(self._structure_type_name),
             "solar_system": self._solar_system.name,
         }
-        self._description = __(
+        self._description = _(
             "The command nodes for %(structure_type)s "
             "in %(solar_system)s belonging to %(owner)s have been "
             "destroyed by hostile forces."
@@ -184,13 +175,13 @@ class NotificationSovStructureDestroyed(NotificationSovEmbed):
 class NotificationSovAllAnchoringMsg(NotificationBaseEmbed):
     def __init__(self, notification: Notification) -> None:
         super().__init__(notification)
-        corporation, _ = EveEntity.objects.get_or_create_esi(
-            id=self._parsed_text.get("corpID")
+        corporation = get_or_create_esi_obj(
+            EveEntity, id=self._parsed_text.get("corpID")
         )
         corp_link = gen_eve_entity_link(corporation)
         alliance_id = self._parsed_text.get("allianceID")
         if alliance_id:
-            alliance, _ = EveEntity.objects.get_or_create_esi(id=alliance_id)
+            alliance = get_or_create_esi_obj(EveEntity, id=alliance_id)
             structure_owner = f"{corp_link} ({alliance.name})"
         else:
             structure_owner = corp_link
@@ -198,15 +189,15 @@ class NotificationSovAllAnchoringMsg(NotificationBaseEmbed):
         structure_type = self._notification.eve_structure_type("typeID")
         moon_id = self._parsed_text.get("moonID")
         if moon_id:
-            eve_moon, _ = EveMoon.objects.get_or_create_esi(id=moon_id)
-            location_text = __(" near **%s**") % eve_moon.name
+            eve_moon = get_or_create_esi_obj(EveMoon, id=moon_id)
+            location_text = _(" near **%s**") % eve_moon.name
         else:
             location_text = ""
-        self._title = __("%(structure_type)s anchored in %(solar_system)s") % {
+        self._title = _("%(structure_type)s anchored in %(solar_system)s") % {
             "structure_type": structure_type.eve_group.name,
             "solar_system": eve_solar_system.name,
         }
-        self._description = __(
+        self._description = _(
             "A %(structure_type)s from %(structure_owner)s has anchored "
             "in %(solar_system)s%(location_text)s."
         ) % {