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

{aa_structures-2.6.1.dist-info → aa_structures-2.6.2.dist-info}/METADATA

@@ -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.dist-info → aa_structures-2.6.2.dist-info}/RECORD

@@ -1,4 +1,4 @@
-structures/__init__.py,sha256=fgJiF9Ghh5QJwUoTRlznhNcBZDRZOjj2F_V4zDhCVvk,203
+structures/__init__.py,sha256=KOKNTOpenIiuO_fDHTBNBibijr_3uh2Y7JptMnk0dVM,203
 structures/admin.py,sha256=t6-f7c-eUFeg1NKGVhYmypbLKVlTSmRZXVXPIdGPe7E,37409
 structures/app_settings.py,sha256=nNERL_qmuaa8EkzvT3rzVD8KhKeajS0fRaTPK4suArM,6267
 structures/apps.py,sha256=MNZH9l3qWCwuS7OGiKGkBVrDzKoOFlqwDdEgyEFzxVA,195
@@ -10,7 +10,7 @@ structures/managers.py,sha256=y5yasAI25pjGP1iEc5evJ49thOh4xggv6bU3XaVcMW4,19003
 structures/providers.py,sha256=9QYHd8X5HwBhrbgbX3LUrXXV1KGM3hFhcxK6qIJjJtg,317
 structures/tasks.py,sha256=JAbTUUodVmn8J3b23Z2VzMV8_CeOem4ZHcksq29uJyY,9061
 structures/urls.py,sha256=fMct2Q-CFdMlteFfzAvMoEs5ynXD8vQvABQO3WkAtlY,1086
-structures/views.py,sha256=Dm-PxMGod2oR7MHO8dz6T-FUcRyt_lWfKiNhtHFdboU,22044
+structures/views.py,sha256=sOFwVlwpWme0huiZPuRkFdlSBFocvBblbb7Pem9yDD4,22011
 structures/core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 structures/core/notification_timers.py,sha256=G-QwpqP9HFv_Y7KsID9bLF-GluEJ1-duSJQN-zqJtM0,14977
 structures/core/notification_types.py,sha256=CL5f8NUdn6hXqW9JEvKpch-2VSgczC3mpjIXlFwwaXQ,11199
@@ -18,37 +18,37 @@ structures/core/serializers.py,sha256=tHuLk4yf9R562qHMjAX_IjDp4hgSWa8lvsUopE11Hx
 structures/core/sovereignty.py,sha256=XKgjAFO4BfLpEEUz_hBr2DVDnvWBq9sL9EEQiT4T0n0,730
 structures/core/starbases.py,sha256=nw7skHYATrnAV-zuPAuxmhM5E4Aqjc_DHSU2TYWgBng,1757
 structures/core/notification_embeds/__init__.py,sha256=30cpjKLZ5_OFtXDACDcjvWQAYszM2BrYxUYb5PRQoTA,131
-structures/core/notification_embeds/billing_embeds.py,sha256=u38QeFQNpaXiYLYSM9f_LyYDM841boKfikX-S1p1B6o,3733
-structures/core/notification_embeds/character_embeds.py,sha256=tQrJXK-qYjckgVnnCrAPa7fUksh0N2muhoeDeSnAsHg,5594
+structures/core/notification_embeds/billing_embeds.py,sha256=PGCdBDfi8JABv5WR0uyNgsAA922mAP3O-y7mQ-yhGH0,3780
+structures/core/notification_embeds/character_embeds.py,sha256=BCGser4iZb4di6DOfRAeQLhPydCvA6-kBOjXwlUmRUw,5635
 structures/core/notification_embeds/helpers.py,sha256=0SlrLLFyV0IrdOYfIOLQs0xZgzK8bO7Iroqh7dZnm98,2974
-structures/core/notification_embeds/main.py,sha256=fWomTsKBzRbvXy1x-DucB4Za_Bv8OtQHO1cLqv8vtuM,13484
-structures/core/notification_embeds/moonmining_embeds.py,sha256=zl9QhvcdgCK3KgTIGP2_UDDhLzk3YdaaS_uhiLrORPY,7294
-structures/core/notification_embeds/orbital_embeds.py,sha256=h9RtUMYcslXb5FrUIJmnqybXSWpMo4ifTpntRcpmPNQ,2914
-structures/core/notification_embeds/sov_embeds.py,sha256=65ULOPPlc9p_whItLNriGECZ0hGIkYdi3Yh6aTccf1M,9137
-structures/core/notification_embeds/structures_embeds.py,sha256=x9Z4k7mGUMr8oavWEF-dcxTGvOJkQtnS-zdEcCrCuck,13178
-structures/core/notification_embeds/tower_embeds.py,sha256=r6LH1I-Jhdxlj-4qAlHG20TAtVc4K8zR56N8YOVdiP4,5743
+structures/core/notification_embeds/main.py,sha256=Pr_VdNmfZfP_JsY3e-mY2okDPm6LBGTrWPy_3BhrN_8,13501
+structures/core/notification_embeds/moonmining_embeds.py,sha256=65psg46D2jGgtC-TIjkBtPUHhjSdqYKZaO5GPwenJCQ,7313
+structures/core/notification_embeds/orbital_embeds.py,sha256=0By9aYJx2hInazvMx5eVJvDkSXcND5ztURfKVPuWZjQ,2961
+structures/core/notification_embeds/sov_embeds.py,sha256=3UI2xcfrfBJYizxJLX16MSx57rbAlHWdGhcZx34gh38,9007
+structures/core/notification_embeds/structures_embeds.py,sha256=QCtKdNh-UYLqQTFkZpr-3xtTNzJ6_XKm18-BBIsA6yA,13369
+structures/core/notification_embeds/tower_embeds.py,sha256=etUR9I0VTtAyLX3EWqUZAzte1MaXasLYIgFqCQ1qjnI,5869
 structures/core/notification_embeds/war_embeds.py,sha256=Qc-RUuuSmT1EBkV9D-_vZQ5QX30UGLow2PonC-wBO6U,9050
-structures/locale/django.pot,sha256=jdx-h1A8UXeEujz1vrA6Ei8XsnsM8idlZM4t1vqseFs,46273
+structures/locale/django.pot,sha256=gJ_fSJvJjZ9WQC5X3Y-D82nkPOWxPiMIMd5atvBuYYo,58740
 structures/locale/de/LC_MESSAGES/django.mo,sha256=SPRb-Sy7v4zt56YPqZ13E-oNglUV8g7q0TDZuF9afek,4495
-structures/locale/de/LC_MESSAGES/django.po,sha256=N2sETF5NncNOVfhicRx8CY7sABOybstYOzfBl3pQP3M,47720
+structures/locale/de/LC_MESSAGES/django.po,sha256=BgJZlXwAwxYe6jcS4eRndTUNGo6hX9imcUNKW-DMcSo,60160
 structures/locale/en/LC_MESSAGES/django.mo,sha256=N1pb17IfLd0ASiKO8d68-B4ygSpDkhKOCs8YTzMXQo0,380
-structures/locale/en/LC_MESSAGES/django.po,sha256=0b9L0QD6eAaWgEJ3DK_8ainiQgMkcwq9bKtLxaWsqek,46320
+structures/locale/en/LC_MESSAGES/django.po,sha256=vjAEpVbQH-NIBTkrk7ykT3ScFAxJEmo2KXU0_vpm7Rc,58787
 structures/locale/es/LC_MESSAGES/django.mo,sha256=htEILnvb29fbtfWUHaalRhIU1kx7ylRarFNgXjNYBuk,871
-structures/locale/es/LC_MESSAGES/django.po,sha256=58TncdktF9ciU2FQ3Q1OSZK9o2CXNBPrMJnXLqpuWVU,46565
+structures/locale/es/LC_MESSAGES/django.po,sha256=0yAN0Hb0ZKgmgNeUOUEW30C_PaMNVzDhW4aPegCE7z0,59005
 structures/locale/fr_FR/LC_MESSAGES/django.mo,sha256=UXCQbz2AxBvh-IQ7bGgjoBnijo8h9DfE9107A-2Mgkk,337
-structures/locale/fr_FR/LC_MESSAGES/django.po,sha256=jdx-h1A8UXeEujz1vrA6Ei8XsnsM8idlZM4t1vqseFs,46273
+structures/locale/fr_FR/LC_MESSAGES/django.po,sha256=gJ_fSJvJjZ9WQC5X3Y-D82nkPOWxPiMIMd5atvBuYYo,58740
 structures/locale/it_IT/LC_MESSAGES/django.mo,sha256=UXCQbz2AxBvh-IQ7bGgjoBnijo8h9DfE9107A-2Mgkk,337
-structures/locale/it_IT/LC_MESSAGES/django.po,sha256=jdx-h1A8UXeEujz1vrA6Ei8XsnsM8idlZM4t1vqseFs,46273
+structures/locale/it_IT/LC_MESSAGES/django.po,sha256=gJ_fSJvJjZ9WQC5X3Y-D82nkPOWxPiMIMd5atvBuYYo,58740
 structures/locale/ja/LC_MESSAGES/django.mo,sha256=XMj5I8Aah7EGpU-KfFOr25hoOxxLT5dfmjror1-uc8g,373
-structures/locale/ja/LC_MESSAGES/django.po,sha256=ixz4NOW8ZoWDnJQS6-V3nEnzfYrPBud5o7k6GL9PtQs,46313
+structures/locale/ja/LC_MESSAGES/django.po,sha256=_fj8dXozLcWSfrh3COs_MaAJQajXgVPF9i8kq4bRsJo,58780
 structures/locale/ko_KR/LC_MESSAGES/django.mo,sha256=Oq6yqHS8xGE_0aqbnmLnzZaLWWbLiapC0_S4tmdLDqA,391
-structures/locale/ko_KR/LC_MESSAGES/django.po,sha256=W1TxeBo3uPGllQ0yAdxp3a2ApTjFKUvukuqU5CFHzQ0,46297
-structures/locale/ru/LC_MESSAGES/django.mo,sha256=rScAxkkERgdEypFcQGq1srActGtSOnTJNhv2czipZag,54848
-structures/locale/ru/LC_MESSAGES/django.po,sha256=1_uMwJwJObAlIta62i6EbIZAwgd8iHSAToev2jmnEYU,74681
+structures/locale/ko_KR/LC_MESSAGES/django.po,sha256=_fwBw1RWHfW8CKCNa6FTRJtL_P8cWjyta3ex3iuT14g,58737
+structures/locale/ru/LC_MESSAGES/django.mo,sha256=eXLViTne15HyFtVusQAMcfBlxhHXs1X2VyhVNPCAqX0,70358
+structures/locale/ru/LC_MESSAGES/django.po,sha256=z9y4LpWbtJIeD5zdlcdSqsssYyDpW0AeUjAadqxHgr8,95509
 structures/locale/uk/LC_MESSAGES/django.mo,sha256=WJ7UMXi2qaLIrpvAm-c-O78ZBcbnQfTzQAK0Xp1LIak,609
-structures/locale/uk/LC_MESSAGES/django.po,sha256=KdlLRb0W_q_WNm2MToyTZ_Z-Td9p2hsBjEATHGO6jNY,46515
+structures/locale/uk/LC_MESSAGES/django.po,sha256=jFo9kej6b1zSu5_J3gCWeHl2PogX3wQKIAmwotKC6b4,58955
 structures/locale/zh_Hans/LC_MESSAGES/django.mo,sha256=hg7JkPlzTeMN2NIs99mR4_ZDVLYz9GgfyAfgsclbIng,3291
-structures/locale/zh_Hans/LC_MESSAGES/django.po,sha256=Z7xUPLFhKS8oKANK7LEXE7N7tU8Rz-p7GY7bN_AkSW0,47243
+structures/locale/zh_Hans/LC_MESSAGES/django.po,sha256=5fRh8DobwOdnFj4c_trm8MDlsGMh1kPdKmxIQWYkIGY,59683
 structures/management/commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 structures/management/commands/structures_load_eve.py,sha256=UIGjeOchZr5eM8LtRpRp6-328tphQ11uITfriCtXjzM,1507
 structures/management/commands/structures_preload_eveuniverse.py,sha256=oYf4OILhQmTodMGV_01b96aqouP5FmWmvbTxi9v0xa0,2489
@@ -117,7 +117,7 @@ structures/static/structures/img/panel/tyrannis_blue.png,sha256=79O2YMMnVsAi1cMW
 structures/static/structures/img/panel/tyrannis_darkred.png,sha256=CwCeqXvr6Nm-Kf7XKfLCHyEiwufJkTrkk-B6g57uCBg,42833
 structures/static/structures/img/panel/tyrannis_default.png,sha256=18TntkT7i0YZHZ-v9D_-glKHDKYEA0rSTjXMqwXFy0Q,38343
 structures/static/structures/img/panel/tyrannis_revelations.png,sha256=mnaL5lt-1D-Do7sb77QJDc3EPtoynz207Z932S09is0,42868
-structures/templates/structures/base.html,sha256=NXJP-b546wLQ3VYKtdwubzqBQ3mZ0BJGiLRtl31cBwQ,298
+structures/templates/structures/base.html,sha256=KqUbI5pTp17tj97gjxZHjcsuZyNl1ggD1j9ra3Z447U,310
 structures/templates/structures/main.html,sha256=4sl71KGoAAtTywcJNvgdS7RpK15_XJ4JYuVpUC8nwT8,21200
 structures/templates/structures/modals/fitting_assets.html,sha256=0GSpDAk-wgvaZdxM9JzteUYhoPsek5y-L4TdG2q5Sbg,264
 structures/templates/structures/modals/fitting_gfx.html,sha256=hmdU1Zv09woGKigUugbBRxScKQun8l81yEPUMGrok2g,9530
@@ -185,7 +185,7 @@ structures/webhooks/models.py,sha256=RXLFMSnTyC7hYAoxhD3BmJivaQtVE0-pXd-BG_MdnBw
 structures/webhooks/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 structures/webhooks/tests/test_core.py,sha256=gDW9o9wF20iqqX-u4notowfbxPSfFylJkngV5XkSOd0,6412
 structures/webhooks/tests/test_utils.py,sha256=ekADFv0JOEtXeqdiejbeqrABO__Q1flJHzVieQ7L9e0,459
-aa_structures-2.6.1.dist-info/LICENSE,sha256=XZiwB_S_40_HhnvLg5xvtBb3g1oGjPrk0rpFwk8iInE,1070
-aa_structures-2.6.1.dist-info/WHEEL,sha256=EZbGkh7Ie4PoZfRQ8I0ZuP9VklN_TvcZ6DSE5Uar4z4,81
-aa_structures-2.6.1.dist-info/METADATA,sha256=E8VTFUW7AYtxB5uOdnSWAZdHsci-0LiDnxU2d9YavWo,5974
-aa_structures-2.6.1.dist-info/RECORD,,
+aa_structures-2.6.2.dist-info/LICENSE,sha256=XZiwB_S_40_HhnvLg5xvtBb3g1oGjPrk0rpFwk8iInE,1070
+aa_structures-2.6.2.dist-info/WHEEL,sha256=EZbGkh7Ie4PoZfRQ8I0ZuP9VklN_TvcZ6DSE5Uar4z4,81
+aa_structures-2.6.2.dist-info/METADATA,sha256=Z_44f0ru_pQaqrI7ANm9CuEtURNKiTJfZIXUFcIIFrU,5974
+aa_structures-2.6.2.dist-info/RECORD,,

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"

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)
         )

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", "")

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:

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,

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()
         )

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 = ""

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

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