aa-structures 2.6.1__tar.gz → 2.6.2__tar.gz

{aa_structures-2.6.1 → aa_structures-2.6.2}/PKG-INFO

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

{aa_structures-2.6.1 → aa_structures-2.6.2}/structures/__init__.py

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

{aa_structures-2.6.1 → aa_structures-2.6.2}/structures/core/notification_embeds/billing_embeds.py

@@ -12,6 +12,7 @@ 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
@@ -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)[0]
+        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)
         )

{aa_structures-2.6.1 → aa_structures-2.6.2}/structures/core/notification_embeds/character_embeds.py

@@ -7,6 +7,7 @@ import dhooks_lite
 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,12 +21,12 @@ 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"]
-        )[0]
-        self._corporation = EveEntity.objects.get_or_create_esi(
-            id=self._parsed_text["corpID"]
-        )[0]
+        self._character = get_or_create_esi_obj(
+            EveEntity, id=self._parsed_text["charID"]
+        )
+        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)
         self._application_text = self._parsed_text.get("applicationText", "")

{aa_structures-2.6.1 → aa_structures-2.6.2}/structures/core/notification_embeds/main.py

@@ -14,7 +14,7 @@ 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
@@ -83,7 +83,7 @@ class NotificationBaseEmbed:
             key = "aggressorID"
         else:
             return "(Unknown aggressor)"
-        entity = EveEntity.objects.get_or_create_esi(id=self._parsed_text[key])[0]
+        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:

{aa_structures-2.6.1 → aa_structures-2.6.2}/structures/core/notification_embeds/moonmining_embeds.py

@@ -11,6 +11,7 @@ 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)[0]
+            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,9 +64,7 @@ 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"]
-        )[0]
+        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")
@@ -76,7 +75,7 @@ class NotificationMoonminningExtractionStarted(NotificationMoonminingEmbed):
             "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,
@@ -101,7 +100,7 @@ class NotificationMoonminningExtractionFinished(NotificationMoonminingEmbed):
             "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,
@@ -122,7 +121,7 @@ class NotificationMoonminningAutomaticFracture(NotificationMoonminingEmbed):
             " 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,9 +136,9 @@ 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"]
-            )[0]
+            cancelled_by = get_or_create_esi_obj(
+                EveEntity, id=self._parsed_text["cancelledBy"]
+            )
         else:
             cancelled_by = _("(unknown)")
         self._title = _("Extraction cancelled")
@@ -169,7 +168,7 @@ class NotificationMoonminningLaserFired(NotificationMoonminingEmbed):
             "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,

{aa_structures-2.6.1 → aa_structures-2.6.2}/structures/core/notification_embeds/orbital_embeds.py

@@ -10,6 +10,7 @@ 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,9 +27,9 @@ 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
-        )[0]
+        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()
         )

{aa_structures-2.6.1 → aa_structures-2.6.2}/structures/core/notification_embeds/sov_embeds.py

@@ -95,12 +95,8 @@ 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"]
-        )[0]
-        corporation = EveEntity.objects.get_or_create_esi(
-            id=self._parsed_text["corpID"]
-        )[0]
+        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
         )
@@ -119,12 +115,8 @@ 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"]
-        )[0]
-        corporation = EveEntity.objects.get_or_create_esi(
-            id=self._parsed_text["corpID"]
-        )[0]
+        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 "
@@ -183,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")
-        )[0]
+        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)[0]
+            alliance = get_or_create_esi_obj(EveEntity, id=alliance_id)
             structure_owner = f"{corp_link} ({alliance.name})"
         else:
             structure_owner = corp_link
@@ -197,7 +189,7 @@ 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)[0]
+            eve_moon = get_or_create_esi_obj(EveMoon, id=moon_id)
             location_text = _(" near **%s**") % eve_moon.name
         else:
             location_text = ""

{aa_structures-2.6.1 → aa_structures-2.6.2}/structures/core/notification_embeds/structures_embeds.py

@@ -47,19 +47,24 @@ class NotificationStructureEmbed(NotificationBaseEmbed):
             structure_type = structure.eve_type
             structure_solar_system = structure.eve_solar_system
             owner_link = gen_corporation_link(str(structure.owner))
-            location = f" at {structure.eve_moon} " if structure.eve_moon else ""
+            # Translators: Context is a location, e.g. a moon
+            location = _(" at %s ") % structure.eve_moon if structure.eve_moon else ""
 
         self._structure = structure
-        self._description = _(
-            "The %(structure_type)s %(structure_name)s%(location)s in %(solar_system)s "
-            "belonging to %(owner_link)s "
-        ) % {
-            "structure_type": structure_type.name,
-            "structure_name": Webhook.text_bold(structure_name),
-            "location": location,
-            "solar_system": gen_solar_system_text(structure_solar_system),
-            "owner_link": owner_link,
-        }
+        self._description = (
+            _(
+                "The %(structure_type)s %(structure_name)s%(location)s "
+                "in %(solar_system)s belonging to %(owner_link)s"
+            )
+            % {
+                "structure_type": structure_type.name,
+                "structure_name": Webhook.text_bold(structure_name),
+                "location": location,
+                "solar_system": gen_solar_system_text(structure_solar_system),
+                "owner_link": owner_link,
+            }
+            + " "
+        )
         self._thumbnail = dhooks_lite.Thumbnail(
             structure_type.icon_url(size=self.ICON_DEFAULT_SIZE)
         )
@@ -97,11 +102,10 @@ class NotificationStructureJumpFuelAlert(NotificationStructureEmbed):
         self._description += _(
             "is below %(threshold)s units on Liquid Ozone.\n"
             "Remaining units: %(remaining)s."
-            % {
-                "threshold": f"{Webhook.text_bold(threshold_str)}",
-                "remaining": f"{Webhook.text_bold(quantity_str)}",
-            }
-        )
+        ) % {
+            "threshold": f"{Webhook.text_bold(threshold_str)}",
+            "remaining": f"{Webhook.text_bold(quantity_str)}",
+        }
         self._color = Webhook.Color.WARNING
 
 
@@ -161,10 +165,10 @@ class NotificationStructureUnderAttack(NotificationStructureEmbed):
     def __init__(self, notification: Notification) -> None:
         super().__init__(notification)
         self._title = _("Structure under attack")
-        self._description += _("is under attack by %s.\n%s") % (
-            self._get_attacker_link(),
-            self.compile_damage_text("Percentage"),
-        )
+        self._description += _("is under attack by %(attacker)s.\n%(damage_text)s") % {
+            "attacker": self._get_attacker_link(),
+            "damage_text": self.compile_damage_text("Percentage"),
+        }
         self._color = Webhook.Color.DANGER
 
     def _get_attacker_link(self) -> str:
@@ -175,7 +179,7 @@ class NotificationStructureUnderAttack(NotificationStructureEmbed):
         if self._parsed_text.get("corpName"):
             return gen_corporation_link(self._parsed_text["corpName"])
 
-        return "(unknown)"
+        return _("(unknown)")
 
 
 class NotificationStructureLostShield(NotificationStructureEmbed):
@@ -291,7 +295,7 @@ class NotificationStructureReinforceChange(NotificationBaseEmbed):
                             id=structure_info[2]
                         ),
                         eve_solar_system=None,
-                        owner_link="(unknown)",
+                        owner_link=_("(unknown)"),
                     )
                 )
             else:
@@ -322,6 +326,6 @@ class NotificationStructureReinforceChange(NotificationBaseEmbed):
             }
 
         self._description += _(
-            "\n\nChange becomes effective at %s."
+            _("\n\nChange becomes effective at %s.")
         ) % target_datetime_formatted(change_effective)
         self._color = Webhook.Color.INFO

{aa_structures-2.6.1 → aa_structures-2.6.2}/structures/core/notification_embeds/tower_embeds.py

@@ -36,15 +36,21 @@ class NotificationTowerEmbed(NotificationBaseEmbed):
         self._thumbnail = dhooks_lite.Thumbnail(
             structure_type.icon_url(size=self.ICON_DEFAULT_SIZE)
         )
-        self._description = _(
-            "The starbase %(structure_name)s at %(moon)s "
-            "in %(solar_system)s belonging to %(owner_link)s "
-        ) % {
-            "structure_name": Webhook.text_bold(structure_name),
-            "moon": eve_moon.name,
-            "solar_system": gen_solar_system_text(eve_moon.eve_planet.eve_solar_system),
-            "owner_link": gen_corporation_link(str(notification.owner)),
-        }
+        self._description = (
+            _(
+                "The starbase %(structure_name)s at %(moon)s "
+                "in %(solar_system)s belonging to %(owner_link)s"
+            )
+            % {
+                "structure_name": Webhook.text_bold(structure_name),
+                "moon": eve_moon.name,
+                "solar_system": gen_solar_system_text(
+                    eve_moon.eve_planet.eve_solar_system
+                ),
+                "owner_link": gen_corporation_link(str(notification.owner)),
+            }
+            + " "
+        )
 
 
 class NotificationTowerAlertMsg(NotificationTowerEmbed):
@@ -138,7 +144,7 @@ class NotificationTowerReinforcedExtra(GeneratedNotificationTowerEmbed):
                 dt.datetime.fromisoformat(notification.details["reinforced_until"])
             )
         except (KeyError, ValueError):
-            reinforced_until = "(unknown)"
+            reinforced_until = _("(unknown)")
 
         self._description += (
             _("has been reinforced and will come out at: %s.") % reinforced_until