aa-structures 4.0.2__tar.gz → 4.0.4__tar.gz

{aa_structures-4.0.2 → aa_structures-4.0.4}/PKG-INFO

@@ -1,8 +1,8 @@
-Metadata-Version: 2.4
+Metadata-Version: 2.5
 Name: aa-structures
-Version: 4.0.2
+Version: 4.0.4
 Summary: An app for managing Eve Online structures with Alliance Auth.
-Author-email: Erik Kalkoken <kalkoken87@gmail.com>
+Author-email: Erik Kalkoken <erik.kalkoken@gmail.com>
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 Classifier: Environment :: Web Environment
@@ -35,6 +35,7 @@ Requires-Dist: pook ; extra == "test"
 Project-URL: Documentation, https://aa-structures.readthedocs.io
 Project-URL: Homepage, https://github.com/AllianceAuth-Apps/aa-structures
 Provides-Extra: test
+Import-Name: structures
 
 # Structures
 
@@ -53,7 +54,7 @@ An app for managing Eve Online structures with Alliance Auth.
 
 ## Overview
 
-This app is for managing Eve Online structures with [Alliance Auth](https://gitlab.com/allianceauth/allianceauth). It allows all member corporations to see a current list of all their structures in Auth. In addition it allows forwarding Eve Online notifications to Discord.
+Built for [Alliance Auth](https://gitlab.com/allianceauth/allianceauth), it allows all member corporations to see a current list of all their structures in Auth. In addition it allows forwarding Eve Online notifications to Discord.
 
 ## Features
 
@@ -69,10 +70,10 @@ Structures adds the following main features to Alliance Auth:
   - Sovereignty
   - Wars
   - Corporation membership changes
-- Automatically adds timers from relevant notifications to [Alliance Auth Structure Timers](https://allianceauth.readthedocs.io/en/latest/features/apps/timerboard.html) or [Structure Timers II](https://gitlab.com/ErikKalkoken/aa-structuretimers) app (if installed)
+- Automatically adds timers from relevant notifications to [Alliance Auth Structure Timers](https://allianceauth.readthedocs.io/en/latest/features/apps/timerboard.html) or [Structure Timers II](https://github.com/AllianceAuth-Apps/aa-structuretimers) app (if installed)
 - Fittings, contents of Upwell structures (e.g. fuel blocks and ammo) and current fuel usage
 - Additional structure notifications generated by the app:
-  - Configurable alerts to warn about fuel running at in structures and POSes, and which can replace the ESI notifications
+  - Configurable alerts to warn about fuel running low in structures and POSes, and which can replace the ESI notifications
   - Notifications to inform when structures have been refueled (BETA)
   - Configurable alerts to warn about jump fuel (liquid ozone) running low in jump gates
   - POS reinforced (BETA)
@@ -80,7 +81,7 @@ Structures adds the following main features to Alliance Auth:
 - Permissions define which structures are visible to a user based on organization membership
 - Self-defined tags help to better organize structures
 - Ability to increase notification response time and sync resilience with multiple sync characters per structure owner
-- Automatically sends alerts to users and admin when token become invalid or sync from ESI fails
+- Automatically sends alerts to users and admins when tokens become invalid or sync from ESI fails
 - Interface for 3rd party monitoring of the services status
 - Chinese :cn:, English :us:, German :de: and Russian :ru: localization
 
@@ -103,7 +104,7 @@ The tax rate and access configuration of customs offices is visible too:
 
 And you can see the configuration for starbases:
 
-![Poco details](https://imgpile.com/images/GCxMPr.png)
+![Starbase details](https://imgpile.com/images/GCxMPr.png)
 
 This is an example for a notification posted on Discord:
 

{aa_structures-4.0.2 → aa_structures-4.0.4}/README.md

@@ -15,7 +15,7 @@ An app for managing Eve Online structures with Alliance Auth.
 
 ## Overview
 
-This app is for managing Eve Online structures with [Alliance Auth](https://gitlab.com/allianceauth/allianceauth). It allows all member corporations to see a current list of all their structures in Auth. In addition it allows forwarding Eve Online notifications to Discord.
+Built for [Alliance Auth](https://gitlab.com/allianceauth/allianceauth), it allows all member corporations to see a current list of all their structures in Auth. In addition it allows forwarding Eve Online notifications to Discord.
 
 ## Features
 
@@ -31,10 +31,10 @@ Structures adds the following main features to Alliance Auth:
   - Sovereignty
   - Wars
   - Corporation membership changes
-- Automatically adds timers from relevant notifications to [Alliance Auth Structure Timers](https://allianceauth.readthedocs.io/en/latest/features/apps/timerboard.html) or [Structure Timers II](https://gitlab.com/ErikKalkoken/aa-structuretimers) app (if installed)
+- Automatically adds timers from relevant notifications to [Alliance Auth Structure Timers](https://allianceauth.readthedocs.io/en/latest/features/apps/timerboard.html) or [Structure Timers II](https://github.com/AllianceAuth-Apps/aa-structuretimers) app (if installed)
 - Fittings, contents of Upwell structures (e.g. fuel blocks and ammo) and current fuel usage
 - Additional structure notifications generated by the app:
-  - Configurable alerts to warn about fuel running at in structures and POSes, and which can replace the ESI notifications
+  - Configurable alerts to warn about fuel running low in structures and POSes, and which can replace the ESI notifications
   - Notifications to inform when structures have been refueled (BETA)
   - Configurable alerts to warn about jump fuel (liquid ozone) running low in jump gates
   - POS reinforced (BETA)
@@ -42,7 +42,7 @@ Structures adds the following main features to Alliance Auth:
 - Permissions define which structures are visible to a user based on organization membership
 - Self-defined tags help to better organize structures
 - Ability to increase notification response time and sync resilience with multiple sync characters per structure owner
-- Automatically sends alerts to users and admin when token become invalid or sync from ESI fails
+- Automatically sends alerts to users and admins when tokens become invalid or sync from ESI fails
 - Interface for 3rd party monitoring of the services status
 - Chinese :cn:, English :us:, German :de: and Russian :ru: localization
 
@@ -65,7 +65,7 @@ The tax rate and access configuration of customs offices is visible too:
 
 And you can see the configuration for starbases:
 
-![Poco details](https://imgpile.com/images/GCxMPr.png)
+![Starbase details](https://imgpile.com/images/GCxMPr.png)
 
 This is an example for a notification posted on Discord:
 

{aa_structures-4.0.2 → aa_structures-4.0.4}/pyproject.toml

@@ -8,7 +8,7 @@ dynamic = ["version", "description"]
 readme = "README.md"
 license = { file = "LICENSE" }
 requires-python = ">=3.10"
-authors = [{ name = "Erik Kalkoken", email = "kalkoken87@gmail.com" }]
+authors = [{ name = "Erik Kalkoken", email = "erik.kalkoken@gmail.com" }]
 classifiers = [
     "Environment :: Web Environment",
     "Framework :: Django",

{aa_structures-4.0.2 → aa_structures-4.0.4}/structures/__init__.py

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

{aa_structures-4.0.2 → aa_structures-4.0.4}/structures/admin.py

@@ -19,9 +19,9 @@ from allianceauth.eveonline.models import EveAllianceInfo, EveCorporationInfo
 from allianceauth.services.hooks import get_extension_logger
 from app_utils.django import admin_boolean_icon_html
 
-from . import app_settings, tasks
-from .core.notification_types import NotificationType
-from .models import (
+from structures import app_settings, tasks
+from structures.core.notification_types import NotificationType
+from structures.models import (
     FuelAlert,
     FuelAlertConfig,
     GeneratedNotification,
@@ -326,7 +326,6 @@ class NotificationBaseAdmin(admin.ModelAdmin):
             message = format_lazy("{first} {second}", first=first, second=second)
         else:
             message = first
-        message = format_lazy(first)
         self.message_user(request, message)
 
 

{aa_structures-4.0.2 → aa_structures-4.0.4}/structures/app_settings.py

@@ -3,10 +3,22 @@
 from app_utils.app_settings import clean_setting
 
 STRUCTURES_ADD_TIMERS = clean_setting("STRUCTURES_ADD_TIMERS", True)
-"""Whether to automatically add timers for certain notifications on the timerboard
-(will have no effect if aa-timerboard app is not installed).
-
-Will create timers from anchoring, lost shield and lost armor notifications.
+"""Whether to automatically add timers for supported notification types
+to Alliance Auth's Structure Timers or Erik's Structure Timers
+(apps have to be installed for this setting to work).
+
+Supported notification types are:
+
+- moon mining extraction canceled
+- moon mining extraction started
+- orbital reinforced
+- skyhook lost shield
+- sov structure reinforced
+- structure lost armor
+- structure lost shield
+- tower reinforced
+
+Moon mining notifications can be disabled with `STRUCTURES_MOON_EXTRACTION_TIMERS_ENABLED`.
 """
 
 STRUCTURES_ADMIN_NOTIFICATIONS_ENABLED = clean_setting(
@@ -77,7 +89,10 @@ Stale notification will no longer be sent automatically.
 STRUCTURES_MOON_EXTRACTION_TIMERS_ENABLED = clean_setting(
     "STRUCTURES_MOON_EXTRACTION_TIMERS_ENABLED", True
 )
-"""Whether to create / remove timers from moon extraction notifications."""
+"""Whether to include moon mining extraction notifications when adding timers.
+
+Requires the "add timers" feature to be enabled with `STRUCTURES_ADD_TIMERS`
+"""
 
 STRUCTURES_NOTIFICATION_MAX_RETRIES = clean_setting(
     "STRUCTURES_NOTIFICATION_MAX_RETRIES", 3
@@ -89,14 +104,14 @@ if an error occurred e.g. rate limiting.
 STRUCTURES_NOTIFICATION_SET_AVATAR = clean_setting(
     "STRUCTURES_NOTIFICATION_SET_AVATAR", True
 )
-"""Wether structures sets the name and avatar icon of a webhook.
+"""Whether structures sets the name and avatar icon of a webhook.
 When ``False`` the webhook will use it's own values as set on the platform.
 """
 
 STRUCTURES_NOTIFICATION_SHOW_MOON_ORE = clean_setting(
     "STRUCTURES_NOTIFICATION_SHOW_MOON_ORE", True
 )
-"""Wether ore details are shown on moon timers."""
+"""Whether ore details are shown on moon timers."""
 
 
 STRUCTURES_NOTIFICATION_SYNC_GRACE_MINUTES = clean_setting(
@@ -131,7 +146,9 @@ STRUCTURES_REPORT_NPC_ATTACKS = clean_setting("STRUCTURES_REPORT_NPC_ATTACKS", T
 STRUCTURES_SHOW_FUEL_EXPIRES_RELATIVE = clean_setting(
     "STRUCTURES_SHOW_FUEL_EXPIRES_RELATIVE", True
 )
-"""Whether fuel expires in structures browser is shown as absolute value."""
+"""Whether fuel expiration in the structures browser is shown as a relative value
+(e.g., time remaining) instead of an absolute date.
+"""
 
 STRUCTURES_SHOW_JUMP_GATES = clean_setting("STRUCTURES_SHOW_JUMP_GATES", True)
 """Whether to show the jump gates tab."""
@@ -175,7 +192,7 @@ STRUCTURES_NOTIFICATION_TURNAROUND_LONG = clean_setting(
     "STRUCTURES_NOTIFICATION_TURNAROUND_LONG", 50
 )
 
-# Turnaround duration with more than x seconds are regarded as outliers
+# Turnaround durations of more than x seconds are regarded as outliers
 # and will be ignored when calculating the averages
 STRUCTURES_NOTIFICATION_TURNAROUND_MAX_VALID = clean_setting(
     "STRUCTURES_NOTIFICATION_TURNAROUND_MAX_VALID", 3600

{aa_structures-4.0.2 → aa_structures-4.0.4}/structures/apps.py

@@ -1,6 +1,6 @@
 from django.apps import AppConfig
 
-from . import __version__
+from structures import __version__
 
 
 class StructuresConfig(AppConfig):
@@ -9,4 +9,4 @@ class StructuresConfig(AppConfig):
     verbose_name = f"Structures v{__version__}"
 
     def ready(self) -> None:
-        from . import checks  # noqa: F401 pylint: disable=unused-import
+        from structures import checks  # noqa: F401 pylint: disable=unused-import

{aa_structures-4.0.2 → aa_structures-4.0.4}/structures/auth_hooks.py

@@ -3,7 +3,7 @@ from django.utils.translation import gettext_lazy as _
 from allianceauth import hooks
 from allianceauth.services.hooks import MenuItemHook, UrlHook
 
-from . import __title__, urls
+from structures import __title__, urls
 
 
 class StructuresMenuItem(MenuItemHook):

{aa_structures-4.0.2 → aa_structures-4.0.4}/structures/core/notification_embeds/__init__.py

@@ -1,5 +1,5 @@
 """Generating notification embeds for Structures."""
 
-from .main import NotificationBaseEmbed
+from structures.core.notification_embeds.main import NotificationBaseEmbed
 
 __all__ = ["NotificationBaseEmbed"]

{aa_structures-4.0.2 → aa_structures-4.0.4}/structures/core/notification_embeds/billing_embeds.py

@@ -12,15 +12,14 @@ from app_utils.datetime import ldap_time_2_datetime
 from app_utils.helpers import humanize_number
 
 from structures.constants import EveTypeId
-from structures.helpers import get_or_create_eve_entity, get_or_create_eve_type
-from structures.models import Notification, Webhook
-
-from .helpers import (
+from structures.core.notification_embeds.helpers import (
     gen_eve_entity_link,
     gen_solar_system_text,
     target_datetime_formatted,
 )
-from .main import NotificationBaseEmbed
+from structures.core.notification_embeds.main import NotificationBaseEmbed
+from structures.helpers import get_or_create_eve_entity, get_or_create_eve_type
+from structures.models import Notification, Webhook
 
 
 class BillType(models.IntegerChoices):

{aa_structures-4.0.2 → aa_structures-4.0.4}/structures/core/notification_embeds/corporate_embeds.py

@@ -6,15 +6,14 @@ import dhooks_lite
 
 from django.utils.translation import gettext as _
 
-from structures.helpers import get_or_create_eve_entity
-from structures.models import Notification, Webhook
-
-from .helpers import (
+from structures.core.notification_embeds.helpers import (
     gen_corporation_link,
     gen_eve_entity_link,
     gen_eve_entity_link_from_id,
 )
-from .main import NotificationBaseEmbed
+from structures.core.notification_embeds.main import NotificationBaseEmbed
+from structures.helpers import get_or_create_eve_entity
+from structures.models import Notification, Webhook
 
 
 class NotificationCorpCharEmbed(NotificationBaseEmbed):
@@ -39,12 +38,11 @@ class NotificationCorpAppNewMsg(NotificationCorpCharEmbed):
         self._description = _(
             "New application from %(character_name)s to join %(corporation_name)s:\n"
             "> %(application_text)s"
-            % {
-                "character_name": self._character_link,
-                "corporation_name": self._corporation_link,
-                "application_text": self._application_text,
-            }
-        )
+        ) % {
+            "character_name": self._character_link,
+            "corporation_name": self._corporation_link,
+            "application_text": self._application_text,
+        }
         self._color = Webhook.Color.INFO
 
 
@@ -179,11 +177,10 @@ class NotificationCorpGoalClosed(NotificationCorpGoalEmbed):
         self._description = _(
             "Project **%(goal_name)s** has ben closed by %(closer)s "
             "and will not accept further contributions."
-            % {
-                "goal_name": self._goal_name,
-                "closer": gen_eve_entity_link(closer),
-            }
-        )
+        ) % {
+            "goal_name": self._goal_name,
+            "closer": gen_eve_entity_link(closer),
+        }
         self._color = Webhook.Color.INFO
 
 
@@ -194,11 +191,10 @@ class NotificationCorpGoalCompleted(NotificationCorpGoalEmbed):
         self._description = _(
             "Project **%(goal_name)s** created by %(creator)s "
             "has been successfully completed after reaching it's target."
-            % {
-                "goal_name": self._goal_name,
-                "creator": self._creator_link,
-            }
-        )
+        ) % {
+            "goal_name": self._goal_name,
+            "creator": self._creator_link,
+        }
         self._color = Webhook.Color.SUCCESS
 
 
@@ -209,9 +205,8 @@ class NotificationCorpGoalCreated(NotificationCorpGoalEmbed):
         self._description = _(
             "Project **%(goal_name)s** has been created by %(creator)s "
             "and is open for contributions."
-            % {
-                "goal_name": self._goal_name,
-                "creator": self._creator_link,
-            }
-        )
+        ) % {
+            "goal_name": self._goal_name,
+            "creator": self._creator_link,
+        }
         self._color = Webhook.Color.INFO

{aa_structures-4.0.2 → aa_structures-4.0.4}/structures/core/notification_embeds/main.py

@@ -14,12 +14,15 @@ from allianceauth.services.hooks import get_extension_logger
 from app_utils.urls import reverse_absolute, static_file_absolute_url
 
 from structures import __title__
+from structures.core.notification_embeds.helpers import (
+    gen_alliance_link,
+    gen_corporation_link,
+    target_datetime_formatted,
+)
 from structures.core.notification_types import NotificationType
 from structures.helpers import get_or_create_eve_entity, is_absolute_url
 from structures.models.notifications import Notification, NotificationBase, Webhook
 
-from .helpers import gen_alliance_link, gen_corporation_link, target_datetime_formatted
-
 logger = get_extension_logger(__name__)
 
 
@@ -183,13 +186,13 @@ class NotificationBaseEmbed:
     def create(notif: "NotificationBase") -> "NotificationBaseEmbed":
         """Creates a new instance of the respective subclass for given Notification."""
 
-        from .billing_embeds import (
+        from structures.core.notification_embeds.billing_embeds import (
             NotificationBillingBillOutOfMoneyMsg,
             NotificationBillingIHubBillAboutToExpire,
             NotificationBillingIHubDestroyedByBillFailure,
             NotificationCorpAllBillMsg,
         )
-        from .corporate_embeds import (
+        from structures.core.notification_embeds.corporate_embeds import (
             NotificationCharAppAcceptMsg,
             NotificationCharAppRejectMsg,
             NotificationCharAppWithdrawMsg,
@@ -201,25 +204,25 @@ class NotificationBaseEmbed:
             NotificationCorpGoalCompleted,
             NotificationCorpGoalCreated,
         )
-        from .moonmining_embeds import (
+        from structures.core.notification_embeds.moonmining_embeds import (
             NotificationMoonminningAutomaticFracture,
             NotificationMoonminningExtractionCanceled,
             NotificationMoonminningExtractionFinished,
             NotificationMoonminningExtractionStarted,
             NotificationMoonminningLaserFired,
         )
-        from .orbital_embeds import (
+        from structures.core.notification_embeds.orbital_embeds import (
             NotificationOrbitalAttacked,
             NotificationOrbitalReinforced,
         )
-        from .skyhook_embeds import (
+        from structures.core.notification_embeds.skyhook_embeds import (
             NotificationSkyhookDeployed,
             NotificationSkyhookDestroyed,
             NotificationSkyhookLostShield,
             NotificationSkyhookOnline,
             NotificationSkyhookUnderAttack,
         )
-        from .sov_embeds import (
+        from structures.core.notification_embeds.sov_embeds import (
             NotificationSovAllAnchoringMsg,
             NotificationSovAllClaimAcquiredMsg,
             NotificationSovAllClaimLostMsg,
@@ -228,7 +231,7 @@ class NotificationBaseEmbed:
             NotificationSovStructureDestroyed,
             NotificationSovStructureReinforced,
         )
-        from .structures_embeds import (
+        from structures.core.notification_embeds.structures_embeds import (
             NotificationStructureAnchoring,
             NotificationStructureDestroyed,
             NotificationStructureFuelAlert,
@@ -247,13 +250,13 @@ class NotificationBaseEmbed:
             NotificationStructureWentHighPower,
             NotificationStructureWentLowPower,
         )
-        from .tower_embeds import (
+        from structures.core.notification_embeds.tower_embeds import (
             NotificationTowerAlertMsg,
             NotificationTowerRefueledExtra,
             NotificationTowerReinforcedExtra,
             NotificationTowerResourceAlertMsg,
         )
-        from .war_embeds import (
+        from structures.core.notification_embeds.war_embeds import (
             NotificationAcceptedAlly,
             NotificationAllWarCorpJoinedAllianceMsg,
             NotificationAllWarSurrenderMsg,

{aa_structures-4.0.2 → aa_structures-4.0.4}/structures/core/notification_embeds/moonmining_embeds.py

@@ -10,15 +10,14 @@ from django.utils.translation import gettext as _
 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_eve_entity, get_or_create_eve_type
-from structures.models import Notification, Webhook
-
-from .helpers import (
+from structures.core.notification_embeds.helpers import (
     gen_corporation_link,
     gen_solar_system_text,
     target_datetime_formatted,
 )
-from .main import NotificationBaseEmbed
+from structures.core.notification_embeds.main import NotificationBaseEmbed
+from structures.helpers import get_or_create_eve_entity, get_or_create_eve_type
+from structures.models import Notification, Webhook
 
 
 class NotificationMoonminingEmbed(NotificationBaseEmbed):

{aa_structures-4.0.2 → aa_structures-4.0.4}/structures/core/notification_embeds/orbital_embeds.py

@@ -9,15 +9,14 @@ from django.utils.translation import gettext as _
 from app_utils.datetime import ldap_time_2_datetime
 
 from structures.constants import EveTypeId
-from structures.helpers import get_or_create_eve_type
-from structures.models import Notification, Webhook
-
-from .helpers import (
+from structures.core.notification_embeds.helpers import (
     gen_corporation_link,
     gen_solar_system_text,
     target_datetime_formatted,
 )
-from .main import NotificationBaseEmbed
+from structures.core.notification_embeds.main import NotificationBaseEmbed
+from structures.helpers import get_or_create_eve_type
+from structures.models import Notification, Webhook
 
 
 class NotificationOrbitalEmbed(NotificationBaseEmbed):

{aa_structures-4.0.2 → aa_structures-4.0.4}/structures/core/notification_embeds/skyhook_embeds.py

@@ -8,14 +8,13 @@ from django.utils.translation import gettext as _
 
 from app_utils.datetime import ldap_time_2_datetime
 
-from structures.models import Notification, Webhook
-
-from .helpers import (
+from structures.core.notification_embeds.helpers import (
     gen_corporation_link,
     gen_solar_system_text,
     target_datetime_formatted,
 )
-from .main import NotificationBaseEmbed
+from structures.core.notification_embeds.main import NotificationBaseEmbed
+from structures.models import Notification, Webhook
 
 
 class NotificationSkyhookEmbed(NotificationBaseEmbed):
@@ -78,12 +77,8 @@ class NotificationSkyhookUnderAttack(NotificationSkyhookEmbed):
     def __init__(self, n: Notification) -> None:
         super().__init__(n)
         self._title = _("Skyhook under attack")
-        self._description += _(
-            "is under attack by %(attacker)s.\n"
-            "%(damage_text)s"
-            % {
-                "attacker": self.gen_attacker_link(),
-                "damage_text": self.compile_damage_text("Percentage"),
-            }
-        )
+        self._description += _("is under attack by %(attacker)s.\n%(damage_text)s") % {
+            "attacker": self.gen_attacker_link(),
+            "damage_text": self.compile_damage_text("Percentage"),
+        }
         self._color = Webhook.Color.DANGER

{aa_structures-4.0.2 → aa_structures-4.0.4}/structures/core/notification_embeds/sov_embeds.py

@@ -11,21 +11,20 @@ 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,
-    get_or_create_eve_entity,
-    get_or_create_eve_type,
-)
-from structures.models import Notification, Webhook
-
-from .helpers import (
+from structures.core.notification_embeds.helpers import (
     gen_alliance_link,
     gen_corporation_link,
     gen_eve_entity_link,
     gen_solar_system_text,
     target_datetime_formatted,
 )
-from .main import NotificationBaseEmbed
+from structures.core.notification_embeds.main import NotificationBaseEmbed
+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
 
 
 class NotificationSovEmbed(NotificationBaseEmbed):

{aa_structures-4.0.2 → aa_structures-4.0.4}/structures/core/notification_embeds/structures_embeds.py

@@ -10,16 +10,15 @@ from django.utils.translation import gettext as _
 
 from app_utils.datetime import ldap_time_2_datetime, ldap_timedelta_2_timedelta
 
-from structures.helpers import get_or_create_eve_entity, get_or_create_eve_type
-from structures.models import Notification, Structure, Webhook
-
-from .helpers import (
+from structures.core.notification_embeds.helpers import (
     gen_corporation_link,
     gen_solar_system_text,
     target_datetime_formatted,
     timeuntil,
 )
-from .main import NotificationBaseEmbed
+from structures.core.notification_embeds.main import NotificationBaseEmbed
+from structures.helpers import get_or_create_eve_entity, get_or_create_eve_type
+from structures.models import Notification, Structure, Webhook
 
 
 class NotificationStructureEmbed(NotificationBaseEmbed):
@@ -96,7 +95,9 @@ class NotificationStructureJumpFuelAlert(NotificationStructureEmbed):
         super().__init__(notification)
         self._title = _("Jump gate low on Liquid Ozone")
         threshold_str = f"{self._data['threshold']:,}"
-        quantity_str = f"{self._structure.jump_fuel_quantity():,}"
+        quantity_str = (
+            f"{self._structure.jump_fuel_quantity():,}" if self._structure else "?"
+        )
         self._description += _(
             "is below %(threshold)s units on Liquid Ozone.\n"
             "Remaining units: %(remaining)s."
@@ -263,13 +264,19 @@ class NotificationStructureReinforceChange(NotificationBaseEmbed):
 
     def __init__(self, notification: Notification) -> None:
         super().__init__(notification)
+        structure_ids = [
+            structure_info[0] for structure_info in self._data["allStructureInfo"]
+        ]
+        structures_by_id = {
+            structure.id: structure
+            for structure in Structure.objects.select_related_defaults().filter(
+                id__in=structure_ids
+            )
+        }
         all_structure_info = []
         for structure_info in self._data["allStructureInfo"]:
-            try:
-                structure = Structure.objects.select_related_defaults().get(
-                    id=structure_info[0]
-                )
-            except Structure.DoesNotExist:
+            structure = structures_by_id.get(structure_info[0])
+            if structure is None:
                 all_structure_info.append(
                     self.StructureInfo(
                         name=structure_info[1],

{aa_structures-4.0.2 → aa_structures-4.0.4}/structures/core/notification_embeds/tower_embeds.py

@@ -9,15 +9,14 @@ import dhooks_lite
 from django.utils.translation import gettext as _
 
 from structures.core import starbases
-from structures.models import GeneratedNotification, Notification, Structure, Webhook
-
-from .helpers import (
+from structures.core.notification_embeds.helpers import (
     gen_corporation_link,
     gen_solar_system_text,
     target_datetime_formatted,
     timeuntil,
 )
-from .main import NotificationBaseEmbed
+from structures.core.notification_embeds.main import NotificationBaseEmbed
+from structures.models import GeneratedNotification, Notification, Structure, Webhook
 
 
 class NotificationTowerEmbed(NotificationBaseEmbed):

{aa_structures-4.0.2 → aa_structures-4.0.4}/structures/core/notification_embeds/war_embeds.py

@@ -11,12 +11,14 @@ from django.utils.translation import gettext as _
 from app_utils.datetime import ldap_time_2_datetime
 from app_utils.helpers import humanize_number
 
+from structures.core.notification_embeds.helpers import (
+    gen_eve_entity_link,
+    target_datetime_formatted,
+)
+from structures.core.notification_embeds.main import NotificationBaseEmbed
 from structures.helpers import get_or_create_eve_entity
 from structures.models import Notification, Webhook
 
-from .helpers import gen_eve_entity_link, target_datetime_formatted
-from .main import NotificationBaseEmbed
-
 
 class NotificationAcceptedAlly(NotificationBaseEmbed):
     def __init__(self, notification: Notification) -> None:
@@ -294,7 +296,7 @@ class NotificationCorpWarSurrenderMsg(NotificationWarBaseEmbed):
 class NotificationWarHQRemovedFromSpace(NotificationWarBaseEmbed):
     def __init__(self, notification: Notification) -> None:
         super().__init__(notification)
-        war_hq = self._data["warHQ"]
+        war_hq = strip_tags(self._data["warHQ"])
         time_declared = ldap_time_2_datetime(self._data["timeDeclared"])
         self._title = _("WarHQ %s lost") % war_hq
         self._description = _(