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

structures/core/notification_embeds/war_embeds.py

@@ -7,36 +7,276 @@ import dhooks_lite
 
 from django.utils.html import strip_tags
 from django.utils.translation import gettext as _
-from eveuniverse.models import EveEntity
 
 from app_utils.datetime import ldap_time_2_datetime
+from app_utils.helpers import humanize_number
 
-from structures.helpers import get_or_create_esi_obj
+from structures.helpers import get_or_create_eve_entity
 from structures.models import Notification, Webhook
 
-from .helpers import (
-    gen_eve_entity_link,
-    gen_eve_entity_link_from_id,
-    target_datetime_formatted,
-)
+from .helpers import gen_eve_entity_link, target_datetime_formatted
 from .main import NotificationBaseEmbed
 
 
-class NotificationWarEmbed(NotificationBaseEmbed):
+class NotificationAcceptedAlly(NotificationBaseEmbed):
     def __init__(self, notification: Notification) -> None:
         super().__init__(notification)
-        self._declared_by = get_or_create_esi_obj(
-            EveEntity, id=self._parsed_text["declaredByID"]
+        self._title = _("Accepted Ally")
+        ally = get_or_create_eve_entity(id=self._data["allyID"])
+        enemy = get_or_create_eve_entity(id=self._data["enemyID"])
+        character = get_or_create_eve_entity(id=self._data["charID"])
+        isk_value = self._data["iskValue"]
+        time = ldap_time_2_datetime(self._data["time"])
+        self._description = _(
+            "%(ally)s has been accepted in a war against %(enemy)s. "
+            "The offer was accepted at %(time)s by %(character)s for %(isk_value)s ISK."
+        ) % {
+            "enemy": gen_eve_entity_link(enemy),
+            "ally": gen_eve_entity_link(ally),
+            "character": gen_eve_entity_link(character),
+            "isk_value": humanize_number(isk_value),
+            "time": target_datetime_formatted(time),
+        }
+        self._thumbnail = dhooks_lite.Thumbnail(
+            ally.icon_url(size=self.ICON_DEFAULT_SIZE)
+        )
+        self._color = Webhook.Color.WARNING
+
+
+class NotificationAllWarCorpJoinedAllianceMsg(NotificationBaseEmbed):
+    def __init__(self, notification: Notification) -> None:
+        super().__init__(notification)
+        self._title = _("Corporation you are at war with is joining an alliance")
+        alliance = get_or_create_eve_entity(id=self._data["allianceID"])
+        corporation = get_or_create_eve_entity(id=self._data["corpID"])
+        self._description = _(
+            "%(corporation)s is joining %(alliance)s alliance. "
+            "Since you are at war with %(corporation)s, "
+            "in 24 hours you will also be at war with %(alliance)s."
+        ) % {
+            "alliance": gen_eve_entity_link(alliance),
+            "corporation": gen_eve_entity_link(corporation),
+        }
+        self._thumbnail = dhooks_lite.Thumbnail(
+            corporation.icon_url(size=self.ICON_DEFAULT_SIZE)
+        )
+        self._color = Webhook.Color.INFO
+
+
+class NotificationAllyJoinedWarMsg(NotificationBaseEmbed):
+    def __init__(self, notification: Notification) -> None:
+        super().__init__(notification)
+        self._title = _("Ally Has Joined a War")
+        aggressor = get_or_create_eve_entity(id=self._data["aggressorID"])
+        ally = get_or_create_eve_entity(id=self._data["allyID"])
+        defender = get_or_create_eve_entity(id=self._data["defenderID"])
+        start_time = ldap_time_2_datetime(self._data["startTime"])
+        self._description = _(
+            "%(ally)s has joined %(defender)s in a war against %(aggressor)s. "
+            "Their participation in the war will start at %(start_time)s."
+        ) % {
+            "aggressor": gen_eve_entity_link(aggressor),
+            "ally": gen_eve_entity_link(ally),
+            "defender": gen_eve_entity_link(defender),
+            "start_time": target_datetime_formatted(start_time),
+        }
+        self._thumbnail = dhooks_lite.Thumbnail(
+            ally.icon_url(size=self.ICON_DEFAULT_SIZE)
+        )
+        self._color = Webhook.Color.WARNING
+
+
+class NotificationDeclareWar(NotificationBaseEmbed):
+    def __init__(self, notification: Notification) -> None:
+        super().__init__(notification)
+        entity = get_or_create_eve_entity(id=self._data["entityID"])
+        defender = get_or_create_eve_entity(id=self._data["defenderID"])
+        self._title = _("%(entity)s Declares War Against %(defender)s") % {
+            "entity": entity.name,
+            "defender": defender.name,
+        }
+        self._description = _(
+            "%(entity)s has declared war on %(defender)s. "
+            "Within 24 hours fighting can legally occur between those involved."
+        ) % {
+            "entity": gen_eve_entity_link(entity),
+            "defender": gen_eve_entity_link(defender),
+        }
+        self._thumbnail = dhooks_lite.Thumbnail(
+            entity.icon_url(size=self.ICON_DEFAULT_SIZE)
+        )
+        self._color = Webhook.Color.DANGER
+
+
+class NotificationMercOfferedNegotiationMsg(NotificationBaseEmbed):
+    def __init__(self, notification: Notification) -> None:
+        super().__init__(notification)
+        aggressor = get_or_create_eve_entity(id=self._data["aggressorID"])
+        defender = get_or_create_eve_entity(id=self._data["defenderID"])
+        mercenary = get_or_create_eve_entity(id=self._data["mercID"])
+        isk_value = self._data["iskValue"]
+        self._title = (
+            _("%s has offered its services in one of your wars") % mercenary.name
+        )
+        self._description = _(
+            "%(mercenary)s has offered %(defender)s it's services in it's war against %(aggressor)s for %(isk_value)s. "
+        ) % {
+            "aggressor": gen_eve_entity_link(aggressor),
+            "defender": gen_eve_entity_link(defender),
+            "mercenary": gen_eve_entity_link(mercenary),
+            "isk_value": humanize_number(isk_value),
+        }
+        self._thumbnail = dhooks_lite.Thumbnail(
+            mercenary.icon_url(size=self.ICON_DEFAULT_SIZE)
         )
-        self._against = get_or_create_esi_obj(
-            EveEntity, id=self._parsed_text["againstID"]
+        self._color = Webhook.Color.INFO
+
+
+class NotificationMercOfferRetractedMsg(NotificationBaseEmbed):
+    def __init__(self, notification: Notification) -> None:
+        super().__init__(notification)
+        self._title = _("Mercenary offered services")
+        aggressor = get_or_create_eve_entity(id=self._data["aggressorID"])
+        defender = get_or_create_eve_entity(id=self._data["defenderID"])
+        mercenary = get_or_create_eve_entity(id=self._data["mercID"])
+        self._description = _(
+            "%(mercenary)s has retracted it's offer to support %(defender)s in a war against %(aggressor)s."
+        ) % {
+            "aggressor": gen_eve_entity_link(aggressor),
+            "defender": gen_eve_entity_link(defender),
+            "mercenary": gen_eve_entity_link(mercenary),
+        }
+        self._thumbnail = dhooks_lite.Thumbnail(
+            mercenary.icon_url(size=self.ICON_DEFAULT_SIZE)
         )
+        self._color = Webhook.Color.INFO
+
+
+class NotificationOfferedToAlly(NotificationBaseEmbed):
+    def __init__(self, notification: Notification) -> None:
+        super().__init__(notification)
+        aggressor = get_or_create_eve_entity(id=self._data["aggressorID"])
+        defender = get_or_create_eve_entity(id=self._data["defenderID"])
+        character = get_or_create_eve_entity(id=self._data["mercID"])
+        isk_value = self._data["iskValue"]
+        self._title = _("You have offered to ally with %s ") % defender.name
+        self._description = _(
+            "%(character)s has offered to ally to %(defender)s in their war "
+            "against %(aggressor)s. The offer asked for %(isk_value)s ISK as payment."
+        ) % {
+            "aggressor": gen_eve_entity_link(aggressor),
+            "defender": gen_eve_entity_link(defender),
+            "character": gen_eve_entity_link(character),
+            "isk_value": humanize_number(isk_value),
+        }
+        self._thumbnail = dhooks_lite.Thumbnail(
+            character.icon_url(size=self.ICON_DEFAULT_SIZE)
+        )
+        self._color = Webhook.Color.INFO
+
+
+class NotificationOfferedSurrender(NotificationBaseEmbed):
+    def __init__(self, notification: Notification) -> None:
+        super().__init__(notification)
+        character = get_or_create_eve_entity(id=self._data["charID"])
+        entity = get_or_create_eve_entity(id=self._data["entityID"])
+        offered = get_or_create_eve_entity(id=self._data["offeredID"])
+        isk_value = self._data["iskValue"]
+        self._title = _("%s offered to surrender") % entity.name
+        self._description = _(
+            "%(character)s has offered to surrender to %(offered)s, "
+            "offering %(isk_value)s ISK. If accepted, the war will end in 24 hours "
+            "and neither organization will be able to declare new wars against "
+            "the other for the next 2 weeks."
+        ) % {
+            "character": gen_eve_entity_link(character),
+            "offered": gen_eve_entity_link(offered),
+            "isk_value": humanize_number(isk_value),
+        }
+        self._color = Webhook.Color.WARNING
+
+
+class NotificationWarCorporationBecameEligible(NotificationBaseEmbed):
+    def __init__(self, notification: Notification) -> None:
+        super().__init__(notification)
+        self._title = _(
+            "Corporation or alliance is now eligible for formal war declarations"
+        )
+        self._description = _(
+            "Your corporation or alliance is **now eligible** to participate in "
+            "formal war declarations. This could be because your corporation "
+            "and/or one of the corporations in your alliance owns a structure "
+            "deployed in space."
+        )
+        self._color = Webhook.Color.WARNING
+
+
+class NotificationWarCorporationNoLongerEligible(NotificationBaseEmbed):
+    def __init__(self, notification: Notification) -> None:
+        super().__init__(notification)
+        self._title = _(
+            "Corporation or alliance is no longer eligible for formal war declarations"
+        )
+        self._description = _(
+            "Your corporation or alliance is **no longer eligible** to participate "
+            "in formal war declarations.\n"
+            "Neither your corporation nor any of the corporations "
+            "in your alliance own a structure deployed in space at this time. "
+            "If your corporation or alliance is currently involved in a formal war, "
+            "that war will end in 24 hours."
+        )
+        self._color = Webhook.Color.INFO
+
+
+class NotificationWarSurrenderOfferMsg(NotificationBaseEmbed):
+    def __init__(self, notification: Notification) -> None:
+        super().__init__(notification)
+        owner_1 = get_or_create_eve_entity(id=self._data.get("ownerID1"))
+        owner_2 = get_or_create_eve_entity(id=self._data.get("ownerID2"))
+        isk_value = self._data.get("iskValue", 0)
+        self._title = _("%s has offered a surrender") % owner_1.name
+        self._description = _(
+            "%(owner_1)s has offered to end the war with %(owner_2)s in the exchange "
+            "for %(isk_value)s ISK. "
+            "If accepted, the war will end in 24 hours and your organizations will "
+            "be unable to declare new wars against each other for the next 2 weeks."
+        ) % {
+            "owner_1": gen_eve_entity_link(owner_1),
+            "owner_2": gen_eve_entity_link(owner_2),
+            "isk_value": humanize_number(isk_value),
+        }
+        self._color = Webhook.Color.INFO
+
+
+#################################
+# War notifs with common elements
+#################################
+
+
+class NotificationWarBaseEmbed(NotificationBaseEmbed):
+    def __init__(self, notification: Notification) -> None:
+        super().__init__(notification)
+        self._declared_by = get_or_create_eve_entity(id=self._data["declaredByID"])
+        self._against = get_or_create_eve_entity(id=self._data["againstID"])
         self._thumbnail = dhooks_lite.Thumbnail(
             self._declared_by.icon_url(size=self.ICON_DEFAULT_SIZE)
         )
 
 
-class NotificationCorpWarSurrenderMsg(NotificationWarEmbed):
+class NotificationAllWarSurrenderMsg(NotificationWarBaseEmbed):
+    def __init__(self, notification: Notification) -> None:
+        super().__init__(notification)
+        self._title = _("%s has surrendered") % self._declared_by.name
+        self._description = _(
+            "%(declared_by)s has surrendered in the war against  %(against)s."
+        ) % {
+            "declared_by": gen_eve_entity_link(self._declared_by),
+            "against": gen_eve_entity_link(self._against),
+        }
+        self._color = Webhook.Color.WARNING
+
+
+class NotificationCorpWarSurrenderMsg(NotificationWarBaseEmbed):
     def __init__(self, notification: Notification) -> None:
         super().__init__(notification)
         self._title = _("One party has surrendered")
@@ -51,10 +291,30 @@ class NotificationCorpWarSurrenderMsg(NotificationWarEmbed):
         self._color = Webhook.Color.WARNING
 
 
-class NotificationWarAdopted(NotificationWarEmbed):
+class NotificationWarHQRemovedFromSpace(NotificationWarBaseEmbed):
+    def __init__(self, notification: Notification) -> None:
+        super().__init__(notification)
+        war_hq = self._data["warHQ"]
+        time_declared = ldap_time_2_datetime(self._data["timeDeclared"])
+        self._title = _("WarHQ %s lost") % war_hq
+        self._description = _(
+            "The war HQ %(war_hq)s is no more. "
+            "As a consequence, the war declared by %(declared_by)s "
+            "against %(against)s on %(time_declared)s "
+            "has been declared invalid by CONCORD and has entered its cooldown period."
+        ) % {
+            "war_hq": war_hq,
+            "declared_by": self._declared_by,
+            "against": self._against,
+            "time_declared": time_declared,
+        }
+        self._color = Webhook.Color.WARNING
+
+
+class NotificationWarAdopted(NotificationWarBaseEmbed):
     def __init__(self, notification: Notification) -> None:
         super().__init__(notification)
-        alliance = get_or_create_esi_obj(EveEntity, id=self._parsed_text["allianceID"])
+        alliance = get_or_create_eve_entity(id=self._data["allianceID"])
         self._title = _("War update: %(against)s has left %(alliance)s") % {
             "against": self._against.name,
             "alliance": alliance.name,
@@ -72,7 +332,7 @@ class NotificationWarAdopted(NotificationWarEmbed):
         self._color = Webhook.Color.WARNING
 
 
-class NotificationWarDeclared(NotificationWarEmbed):
+class NotificationWarDeclared(NotificationWarBaseEmbed):
     def __init__(self, notification: Notification) -> None:
         super().__init__(notification)
         self._title = _("%(declared_by)s Declares War Against %(against)s") % {
@@ -87,18 +347,18 @@ class NotificationWarDeclared(NotificationWarEmbed):
         ) % {
             "declared_by": gen_eve_entity_link(self._declared_by),
             "against": gen_eve_entity_link(self._against),
-            "war_hq": Webhook.text_bold(strip_tags(self._parsed_text["warHQ"])),
-            "delay_hours": Webhook.text_bold(self._parsed_text["delayHours"]),
+            "war_hq": Webhook.text_bold(strip_tags(self._data["warHQ"])),
+            "delay_hours": Webhook.text_bold(self._data["delayHours"]),
         }
         self._color = Webhook.Color.DANGER
 
 
-class NotificationWarInherited(NotificationWarEmbed):
+class NotificationWarInherited(NotificationWarBaseEmbed):
     def __init__(self, notification: Notification) -> None:
         super().__init__(notification)
-        alliance = get_or_create_esi_obj(EveEntity, id=self._parsed_text["allianceID"])
-        opponent = get_or_create_esi_obj(EveEntity, id=self._parsed_text["opponentID"])
-        quitter = get_or_create_esi_obj(EveEntity, id=self._parsed_text["quitterID"])
+        alliance = get_or_create_eve_entity(id=self._data["allianceID"])
+        opponent = get_or_create_eve_entity(id=self._data["opponentID"])
+        quitter = get_or_create_eve_entity(id=self._data["quitterID"])
         self._title = _("%(alliance)s inherits war against %(opponent)s") % {
             "alliance": alliance.name,
             "opponent": opponent.name,
@@ -116,16 +376,17 @@ class NotificationWarInherited(NotificationWarEmbed):
         self._color = Webhook.Color.DANGER
 
 
-class NotificationWarRetractedByConcord(NotificationWarEmbed):
+class NotificationWarInvalid(NotificationWarBaseEmbed):
     def __init__(self, notification: Notification) -> None:
         super().__init__(notification)
+        war_ends = ldap_time_2_datetime(self._data["endDate"])
         self._title = _("CONCORD invalidates war")
-        war_ends = ldap_time_2_datetime(self._parsed_text["endDate"])
         self._description = _(
             "The war between %(declared_by)s and %(against)s "
-            "has been retracted by CONCORD.\n"
-            "After %(end_date)s CONCORD will again respond to any hostilities "
-            "between those involved with full force."
+            "has been retracted by CONCORD, "
+            "because at least one of the involved parties "
+            "has become ineligible for war declarations."
+            "Fighting must cease on %(end_date)s."
         ) % {
             "declared_by": gen_eve_entity_link(self._declared_by),
             "against": gen_eve_entity_link(self._against),
@@ -134,74 +395,19 @@ class NotificationWarRetractedByConcord(NotificationWarEmbed):
         self._color = Webhook.Color.WARNING
 
 
-class NotificationWarCorporationBecameEligible(NotificationBaseEmbed):
+class NotificationWarRetractedByConcord(NotificationWarBaseEmbed):
     def __init__(self, notification: Notification) -> None:
         super().__init__(notification)
-        self._title = _(
-            "Corporation or alliance is now eligible for formal war declarations"
-        )
+        self._title = _("CONCORD retracts war")
+        war_ends = ldap_time_2_datetime(self._data["endDate"])
         self._description = _(
-            "Your corporation or alliance is **now eligible** to participate in "
-            "formal war declarations. This could be because your corporation "
-            "and/or one of the corporations in your alliance owns a structure "
-            "deployed in space."
-        )
-        self._color = Webhook.Color.WARNING
-
-
-class NotificationWarCorporationNoLongerEligible(NotificationBaseEmbed):
-    def __init__(self, notification: Notification) -> None:
-        super().__init__(notification)
-        self._title = _(
-            "Corporation or alliance is no longer eligible for formal war declarations"
-        )
-        self._description = _(
-            "Your corporation or alliance is **no longer eligible** to participate "
-            "in formal war declarations.\n"
-            "Neither your corporation nor any of the corporations "
-            "in your alliance own a structure deployed in space at this time. "
-            "If your corporation or alliance is currently involved in a formal war, "
-            "that war will end in 24 hours."
-        )
-        self._color = Webhook.Color.INFO
-
-
-class NotificationWarSurrenderOfferMsg(NotificationBaseEmbed):
-    def __init__(self, notification: Notification) -> None:
-        super().__init__(notification)
-        isk_value = self._parsed_text.get("iskValue", 0)
-        owner_1 = get_or_create_esi_obj(EveEntity, id=self._parsed_text.get("ownerID1"))
-        owner_1_link = gen_eve_entity_link(owner_1)
-        owner_2_link = gen_eve_entity_link_from_id(self._parsed_text.get("ownerID2"))
-        self._title = _("%s has offered a surrender") % (owner_1,)
-        self._description = _(
-            "%s has offered to end the war with %s in the exchange for %s ISK. "
-            "If accepted, the war will end in 24 hours and your organizations will "
-            "be unable to declare new wars against each other for the next 2 weeks."
-        ) % (owner_1_link, owner_2_link, f"{isk_value:,.2f}")
-        self._color = Webhook.Color.INFO
-
-
-class NotificationAllyJoinedWarMsg(NotificationBaseEmbed):
-    def __init__(self, notification: Notification) -> None:
-        super().__init__(notification)
-        self._title = _("Ally Has Joined a War")
-        aggressor = get_or_create_esi_obj(
-            EveEntity, id=self._parsed_text["aggressorID"]
-        )
-        ally = get_or_create_esi_obj(EveEntity, id=self._parsed_text["allyID"])
-        defender = get_or_create_esi_obj(EveEntity, id=self._parsed_text["defenderID"])
-        start_time = ldap_time_2_datetime(self._parsed_text["startTime"])
-        self._description = _(
-            "%(ally)s has joined %(defender)s in a war against %(aggressor)s. "
-            "Their participation in the war will start at %(start_time)s."
+            "The war between %(declared_by)s and %(against)s "
+            "has been retracted by CONCORD.\n"
+            "After %(end_date)s CONCORD will again respond to any hostilities "
+            "between those involved with full force."
         ) % {
-            "aggressor": gen_eve_entity_link(aggressor),
-            "ally": gen_eve_entity_link(ally),
-            "defender": gen_eve_entity_link(defender),
-            "start_time": target_datetime_formatted(start_time),
+            "declared_by": gen_eve_entity_link(self._declared_by),
+            "against": gen_eve_entity_link(self._against),
+            "end_date": target_datetime_formatted(war_ends),
         }
-        self._thumbnail = dhooks_lite.Thumbnail(
-            ally.icon_url(size=self.ICON_DEFAULT_SIZE)
-        )
         self._color = Webhook.Color.WARNING

structures/core/notification_types.py

@@ -12,35 +12,34 @@ class NotificationType(models.TextChoices):
     """Definition of all supported notification types."""
 
     # upwell structures
+    OWNERSHIP_TRANSFERRED = "OwnershipTransferred", _(
+        "Upwell structure ownership transferred"
+    )
     STRUCTURE_ANCHORING = "StructureAnchoring", _("Upwell structure anchoring")
+    STRUCTURE_DESTROYED = "StructureDestroyed", _("Upwell structure destroyed")
+    STRUCTURE_FUEL_ALERT = "StructureFuelAlert", _("Upwell structure fuel alert")
+    STRUCTURE_JUMP_FUEL_ALERT = "StructureJumpFuelAlert", _(
+        "Upwell structure jump fuel alert"
+    )
+    STRUCTURE_LOST_ARMOR = "StructureLostArmor", _("Upwell structure lost armor")
+    STRUCTURE_LOST_SHIELD = "StructureLostShields", _("Upwell structure lost shields")
     STRUCTURE_ONLINE = "StructureOnline", _("Upwell structure went online")
+    STRUCTURE_REFUELED_EXTRA = "StructureRefueledExtra", _("Upwell structure refueled")
+    STRUCTURE_REINFORCEMENT_CHANGED = "StructuresReinforcementChanged", _(
+        "Upwell structure reinforcement time changed"
+    )
     STRUCTURE_SERVICES_OFFLINE = "StructureServicesOffline", _(
         "Upwell structure services went offline"
     )
-    STRUCTURE_WENT_HIGH_POWER = "StructureWentHighPower", _(
-        "Upwell structure went high power"
-    )
-    STRUCTURE_WENT_LOW_POWER = "StructureWentLowPower", _(
-        "Upwell structure went low power"
-    )
     STRUCTURE_UNANCHORING = "StructureUnanchoring", _("Upwell structure unanchoring")
-    STRUCTURE_FUEL_ALERT = "StructureFuelAlert", _("Upwell structure fuel alert")
-    STRUCTURE_REFUELED_EXTRA = "StructureRefueledExtra", _("Upwell structure refueled")
-    STRUCTURE_JUMP_FUEL_ALERT = "StructureJumpFuelAlert", _(
-        "Upwell structure jump fuel alert"
-    )
     STRUCTURE_UNDER_ATTACK = "StructureUnderAttack", _(
         "Upwell structure is under attack"
     )
-    STRUCTURE_LOST_SHIELD = "StructureLostShields", _("Upwell structure lost shields")
-    STRUCTURE_LOST_ARMOR = "StructureLostArmor", _("Upwell structure lost armor")
-    STRUCTURE_DESTROYED = "StructureDestroyed", _("Upwell structure destroyed")
-
-    STRUCTURE_REINFORCEMENT_CHANGED = "StructuresReinforcementChanged", _(
-        "Upwell structure reinforcement time changed"
+    STRUCTURE_WENT_HIGH_POWER = "StructureWentHighPower", _(
+        "Upwell structure went high power"
     )
-    OWNERSHIP_TRANSFERRED = "OwnershipTransferred", _(
-        "Upwell structure ownership transferred"
+    STRUCTURE_WENT_LOW_POWER = "StructureWentLowPower", _(
+        "Upwell structure went low power"
     )
 
     # customs offices
@@ -54,43 +53,49 @@ class NotificationType(models.TextChoices):
     TOWER_REINFORCED_EXTRA = "TowerReinforcedExtra", _("Starbase reinforced (BETA)")
 
     # moon mining
-    MOONMINING_EXTRACTION_STARTED = "MoonminingExtractionStarted", _(
-        "Moon mining extraction started"
+    MOONMINING_AUTOMATIC_FRACTURE = "MoonminingAutomaticFracture", _(
+        "Moon mining automatic fracture triggered"
     )
-    MOONMINING_LASER_FIRED = "MoonminingLaserFired", _("Moonmining laser fired")
     MOONMINING_EXTRACTION_CANCELLED = "MoonminingExtractionCancelled", _(
         "Moon mining extraction cancelled"
     )
     MOONMINING_EXTRACTION_FINISHED = "MoonminingExtractionFinished", _(
         "Moon mining extraction finished"
     )
-    MOONMINING_AUTOMATIC_FRACTURE = "MoonminingAutomaticFracture", _(
-        "Moon mining automatic fracture triggered"
+    MOONMINING_EXTRACTION_STARTED = "MoonminingExtractionStarted", _(
+        "Moon mining extraction started"
     )
+    MOONMINING_LASER_FIRED = "MoonminingLaserFired", _("Moonmining laser fired")
 
     # sov
-    SOV_STRUCTURE_REINFORCED = "SovStructureReinforced", _(
-        "Sovereignty structure reinforced"
+    SOV_ALL_CLAIM_ACQUIRED_MSG = "SovAllClaimAquiredMsg", _(
+        "Sovereignty claim acknowledgment"  # SovAllClaimAquiredMsg [sic!]
     )
-    SOV_STRUCTURE_DESTROYED = "SovStructureDestroyed", _(
-        "Sovereignty structure destroyed"
+    SOV_ALL_CLAIM_LOST_MSG = "SovAllClaimLostMsg", _("Sovereignty lost")
+    SOV_ALL_ANCHORING_MSG = "AllAnchoringMsg", _(
+        "Structure anchoring in alliance space"
     )
     SOV_ENTOSIS_CAPTURE_STARTED = "EntosisCaptureStarted", _(
         "Sovereignty entosis capture started"
     )
-    SOV_COMMAND_NODE_EVENT_STARTED = "SovCommandNodeEventStarted", _(
-        "Sovereignty command node event started"
+    SOV_STRUCTURE_DESTROYED = "SovStructureDestroyed", _(
+        "Sovereignty structure destroyed"
     )
-    SOV_ALL_CLAIM_ACQUIRED_MSG = "SovAllClaimAquiredMsg", _(
-        "Sovereignty claim acknowledgment"  # SovAllClaimAquiredMsg [sic!]
+    SOV_STRUCTURE_REINFORCED = "SovStructureReinforced", _(
+        "Sovereignty structure reinforced"
     )
-    SOV_ALL_CLAIM_LOST_MSG = "SovAllClaimLostMsg", _("Sovereignty lost")
-    SOV_ALL_ANCHORING_MSG = "AllAnchoringMsg", _(
-        "Structure anchoring in alliance space"
+    SOV_COMMAND_NODE_EVENT_STARTED = "SovCommandNodeEventStarted", _(
+        "Sovereignty command node event started"
     )
 
     # wars
-    WAR_WAR_DECLARED = "WarDeclared", _("War declared")
+    WAR_ACCEPTED_ALLY = "AcceptedAlly", _("War accepted ally")
+    WAR_ALL_WAR_CORP_JOINED_ALLIANCE_MSG = "AllWarCorpJoinedAllianceMsg", _(
+        "Alliance war corporation joined alliance message"
+    )
+    WAR_ALL_WAR_SURRENDER_MSG = "AllWarSurrenderMsg", _(
+        "Alliance war surrender message"
+    )
     WAR_ALLY_JOINED_WAR_AGGRESSOR_MSG = "AllyJoinedWarAggressorMsg", _(
         "War ally joined aggressor"
     )
@@ -98,33 +103,47 @@ class NotificationType(models.TextChoices):
     WAR_ALLY_JOINED_WAR_DEFENDER_MSG = "AllyJoinedWarDefenderMsg", _(
         "War ally joined defender"
     )
-    WAR_WAR_ADOPTED = "WarAdopted", _("War adopted")
-    WAR_WAR_INHERITED = "WarInherited", _("War inherited")
     WAR_CORP_WAR_SURRENDER_MSG = "CorpWarSurrenderMsg", _("War party surrendered")
-    WAR_WAR_RETRACTED_BY_CONCORD = "WarRetractedByConcord", _(
-        "War retracted by Concord"
-    )
     WAR_CORPORATION_BECAME_ELIGIBLE = "CorpBecameWarEligible", _(
         "War corporation became eligible"
     )
     WAR_CORPORATION_NO_LONGER_ELIGIBLE = "CorpNoLongerWarEligible", _(
         "War corporation no longer eligible"
     )
+    WAR_DECLARE_WAR = "DeclareWar", _("War declared")
+    WAR_HQ_REMOVED_FROM_SPACE = "WarHQRemovedFromSpace", _("War HQ removed from space")
+    WAR_INVALID = "WarInvalid", _("War invalid")
+    WAR_MERC_OFFERED_NEGOTIATION_MSG = "MercOfferedNegotiationMsg", _(
+        "War mercenary offered negotiation message"
+    )
+    WAR_MERC_OFFER_RETRACTED_MSG = "MercOfferRetractedMsg", _(
+        "War mercenary offer retracted message"
+    )
+    WAR_OFFERED_SURRENDER = "OfferedSurrender", _("War offered surrender")
+    WAR_OFFERED_TO_ALLY = "OfferedToAlly", _("War offered to become ally")
+    WAR_WAR_ADOPTED = "WarAdopted", _("War adopted")
+    WAR_WAR_DECLARED = "WarDeclared", _("War declared")
+    WAR_WAR_INHERITED = "WarInherited", _("War inherited")
+    WAR_WAR_RETRACTED_BY_CONCORD = "WarRetractedByConcord", _(
+        "War retracted by Concord"
+    )
     WAR_WAR_SURRENDER_OFFER_MSG = "WarSurrenderOfferMsg", _("War surrender offered")
 
     # corporation membership
-    CORP_APP_NEW_MSG = "CorpAppNewMsg", _("Character submitted application")
+    CHAR_APP_ACCEPT_MSG = "CharAppAcceptMsg", _("Character joins corporation")
     CORP_APP_INVITED_MSG = "CorpAppInvitedMsg", _(
         "Character invited to join corporation"
     )
+    CORP_APP_NEW_MSG = "CorpAppNewMsg", _("Character submitted application")
+    CORP_APP_REJECT_MSG = "CharAppRejectMsg", _("Corp application rejected message")
     CORP_APP_REJECT_CUSTOM_MSG = "CorpAppRejectCustomMsg", _(
-        "Corp application rejected"
+        "Corp application rejected custom message"
     )
     CHAR_APP_WITHDRAW_MSG = "CharAppWithdrawMsg", _("Character withdrew application")
-    CHAR_APP_ACCEPT_MSG = "CharAppAcceptMsg", _("Character joins corporation")
     CHAR_LEFT_CORP_MSG = "CharLeftCorpMsg", _("Character leaves corporation")
 
     # billing
+    BILLING_CORP_ALL_BILL_MSG = "CorpAllBillMsg", _("Corp alliance billing message")
     BILLING_BILL_OUT_OF_MONEY_MSG = "BillOutOfMoneyMsg", _("Bill out of money")
     BILLING_I_HUB_BILL_ABOUT_TO_EXPIRE = (
         "InfrastructureHubBillAboutToExpire",

structures/forms.py

@@ -1,6 +1,5 @@
 """Forms for Structures."""
 
-
 from django import forms
 
 from .models import StructureTag