aa-structures 2.11.0__py3-none-any.whl → 2.13.0__py3-none-any.whl

structures/core/notification_types.py

@@ -23,6 +23,12 @@ class NotificationType(models.TextChoices):
     )
     STRUCTURE_LOST_ARMOR = "StructureLostArmor", _("Upwell structure lost armor")
     STRUCTURE_LOST_SHIELD = "StructureLostShields", _("Upwell structure lost shields")
+    STRUCTURE_LOW_REAGENTS_ALERT = "StructureLowReagentsAlert", _(
+        "Structure low reagents alert"
+    )
+    STRUCTURE_NO_REAGENTS_ALERT = "StructureNoReagentsAlert", _(
+        "Structure no reagents alert"
+    )
     STRUCTURE_ONLINE = "StructureOnline", _("Upwell structure went online")
     STRUCTURE_REFUELED_EXTRA = "StructureRefueledExtra", _("Upwell structure refueled")
     STRUCTURE_REINFORCEMENT_CHANGED = "StructuresReinforcementChanged", _(
@@ -42,15 +48,22 @@ class NotificationType(models.TextChoices):
         "Upwell structure went low power"
     )
 
+    # Skyhook structures
+    SKYHOOK_DEPLOYED = "SkyhookDeployed", _("Skyhook deployed")
+    SKYHOOK_DESTROYED = "SkyhookDestroyed", _("Skyhook destroyed")
+    SKYHOOK_LOST_SHIELDS = "SkyhookLostShields", _("Skyhook lost shields")
+    SKYHOOK_ONLINE = "SkyhookOnline", _("Skyhook online")
+    SKYHOOK_UNDER_ATTACK = "SkyhookUnderAttack", _("Skyhook under attack")
+
     # customs offices
     ORBITAL_ATTACKED = "OrbitalAttacked", _("Customs office attacked")
     ORBITAL_REINFORCED = "OrbitalReinforced", _("Customs office reinforced")
 
     # starbases
     TOWER_ALERT_MSG = "TowerAlertMsg", _("Starbase attacked")
-    TOWER_RESOURCE_ALERT_MSG = "TowerResourceAlertMsg", _("Starbase fuel alert")
     TOWER_REFUELED_EXTRA = "TowerRefueledExtra", _("Starbase refueled (BETA)")
     TOWER_REINFORCED_EXTRA = "TowerReinforcedExtra", _("Starbase reinforced (BETA)")
+    TOWER_RESOURCE_ALERT_MSG = "TowerResourceAlertMsg", _("Starbase fuel alert")
 
     # moon mining
     MOONMINING_AUTOMATIC_FRACTURE = "MoonminingAutomaticFracture", _(
@@ -121,7 +134,7 @@ class NotificationType(models.TextChoices):
     )
     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_ADOPTED = "WarAdopted", _("War adopted")  # FIXME: Should be "WarAdopted "
     WAR_WAR_DECLARED = "WarDeclared", _("War declared")
     WAR_WAR_INHERITED = "WarInherited", _("War inherited")
     WAR_WAR_RETRACTED_BY_CONCORD = "WarRetractedByConcord", _(
@@ -143,8 +156,8 @@ class NotificationType(models.TextChoices):
     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_CORP_ALL_BILL_MSG = "CorpAllBillMsg", _("Corp alliance billing message")
     BILLING_I_HUB_BILL_ABOUT_TO_EXPIRE = (
         "InfrastructureHubBillAboutToExpire",
         _("I-HUB bill about to expire"),
@@ -173,34 +186,40 @@ class NotificationType(models.TextChoices):
     def webhook_defaults(cls) -> List["NotificationType"]:
         """List of default notifications for new webhooks."""
         return [
+            cls.ORBITAL_ATTACKED,
+            cls.ORBITAL_REINFORCED,
+            cls.SKYHOOK_DESTROYED,
+            cls.SKYHOOK_LOST_SHIELDS,
+            cls.SKYHOOK_ONLINE,
+            cls.SKYHOOK_UNDER_ATTACK,
+            cls.SOV_STRUCTURE_DESTROYED,
+            cls.SOV_STRUCTURE_REINFORCED,
             cls.STRUCTURE_ANCHORING,
             cls.STRUCTURE_DESTROYED,
             cls.STRUCTURE_FUEL_ALERT,
             cls.STRUCTURE_LOST_ARMOR,
             cls.STRUCTURE_LOST_SHIELD,
+            cls.STRUCTURE_LOW_REAGENTS_ALERT,
+            cls.STRUCTURE_NO_REAGENTS_ALERT,
             cls.STRUCTURE_ONLINE,
             cls.STRUCTURE_SERVICES_OFFLINE,
             cls.STRUCTURE_UNDER_ATTACK,
             cls.STRUCTURE_WENT_HIGH_POWER,
             cls.STRUCTURE_WENT_LOW_POWER,
-            cls.ORBITAL_ATTACKED,
-            cls.ORBITAL_REINFORCED,
             cls.TOWER_ALERT_MSG,
             cls.TOWER_RESOURCE_ALERT_MSG,
-            cls.SOV_STRUCTURE_REINFORCED,
-            cls.SOV_STRUCTURE_DESTROYED,
         ]
 
     @classmethod
     def relevant_for_timerboard(cls) -> Set["NotificationType"]:
         """Notification types that can create timers."""
         return {
-            cls.STRUCTURE_LOST_SHIELD,
-            cls.STRUCTURE_LOST_ARMOR,
-            cls.ORBITAL_REINFORCED,
-            cls.MOONMINING_EXTRACTION_STARTED,
             cls.MOONMINING_EXTRACTION_CANCELLED,
+            cls.MOONMINING_EXTRACTION_STARTED,
+            cls.ORBITAL_REINFORCED,
             cls.SOV_STRUCTURE_REINFORCED,
+            cls.STRUCTURE_LOST_ARMOR,
+            cls.STRUCTURE_LOST_SHIELD,
             cls.TOWER_REINFORCED_EXTRA,
         }
 
@@ -210,15 +229,15 @@ class NotificationType(models.TextChoices):
         return {
             # billing
             cls.BILLING_BILL_OUT_OF_MONEY_MSG,
-            cls.BILLING_I_HUB_DESTROYED_BY_BILL_FAILURE,
             cls.BILLING_I_HUB_BILL_ABOUT_TO_EXPIRE,
+            cls.BILLING_I_HUB_DESTROYED_BY_BILL_FAILURE,
             # sov
-            cls.SOV_ENTOSIS_CAPTURE_STARTED,
-            cls.SOV_COMMAND_NODE_EVENT_STARTED,
             cls.SOV_ALL_CLAIM_ACQUIRED_MSG,
-            cls.SOV_STRUCTURE_REINFORCED,
-            cls.SOV_STRUCTURE_DESTROYED,
             cls.SOV_ALL_CLAIM_LOST_MSG,
+            cls.SOV_COMMAND_NODE_EVENT_STARTED,
+            cls.SOV_ENTOSIS_CAPTURE_STARTED,
+            cls.SOV_STRUCTURE_DESTROYED,
+            cls.SOV_STRUCTURE_REINFORCED,
             # cls.SOV_ALL_ANCHORING_MSG, # This notif is not broadcasted to all corporations
             # wars
             cls.WAR_ALLY_JOINED_WAR_AGGRESSOR_MSG,
@@ -238,43 +257,45 @@ class NotificationType(models.TextChoices):
     def relevant_for_moonmining(cls) -> Set["NotificationType"]:
         """Notification types about moon mining."""
         return {
-            cls.MOONMINING_EXTRACTION_STARTED,
+            cls.MOONMINING_AUTOMATIC_FRACTURE,
             cls.MOONMINING_EXTRACTION_CANCELLED,
-            cls.MOONMINING_LASER_FIRED,
             cls.MOONMINING_EXTRACTION_FINISHED,
-            cls.MOONMINING_AUTOMATIC_FRACTURE,
+            cls.MOONMINING_EXTRACTION_STARTED,
+            cls.MOONMINING_LASER_FIRED,
         }
 
     @classmethod
     def structure_related(cls) -> Set["NotificationType"]:
         """Notification types that are related to a structure."""
         return {
-            cls.STRUCTURE_ONLINE,
+            cls.MOONMINING_AUTOMATIC_FRACTURE,
+            cls.MOONMINING_EXTRACTION_CANCELLED,
+            cls.MOONMINING_EXTRACTION_FINISHED,
+            cls.MOONMINING_EXTRACTION_STARTED,
+            cls.MOONMINING_LASER_FIRED,
+            cls.ORBITAL_ATTACKED,
+            cls.ORBITAL_REINFORCED,
+            cls.OWNERSHIP_TRANSFERRED,
+            cls.STRUCTURE_ANCHORING,
+            cls.STRUCTURE_DESTROYED,
             cls.STRUCTURE_FUEL_ALERT,
             cls.STRUCTURE_JUMP_FUEL_ALERT,
+            cls.STRUCTURE_LOST_ARMOR,
+            cls.STRUCTURE_LOST_SHIELD,
+            cls.STRUCTURE_LOW_REAGENTS_ALERT,
+            cls.STRUCTURE_NO_REAGENTS_ALERT,
+            cls.STRUCTURE_ONLINE,
             cls.STRUCTURE_REFUELED_EXTRA,
+            cls.STRUCTURE_REINFORCEMENT_CHANGED,
             cls.STRUCTURE_SERVICES_OFFLINE,
-            cls.STRUCTURE_WENT_LOW_POWER,
-            cls.STRUCTURE_WENT_HIGH_POWER,
             cls.STRUCTURE_UNANCHORING,
             cls.STRUCTURE_UNDER_ATTACK,
-            cls.STRUCTURE_LOST_SHIELD,
-            cls.STRUCTURE_LOST_ARMOR,
-            cls.STRUCTURE_DESTROYED,
-            cls.OWNERSHIP_TRANSFERRED,
-            cls.STRUCTURE_ANCHORING,
-            cls.MOONMINING_EXTRACTION_STARTED,
-            cls.MOONMINING_EXTRACTION_FINISHED,
-            cls.MOONMINING_AUTOMATIC_FRACTURE,
-            cls.MOONMINING_EXTRACTION_CANCELLED,
-            cls.MOONMINING_LASER_FIRED,
-            cls.STRUCTURE_REINFORCEMENT_CHANGED,
-            cls.ORBITAL_ATTACKED,
-            cls.ORBITAL_REINFORCED,
+            cls.STRUCTURE_WENT_HIGH_POWER,
+            cls.STRUCTURE_WENT_LOW_POWER,
             cls.TOWER_ALERT_MSG,
-            cls.TOWER_RESOURCE_ALERT_MSG,
             cls.TOWER_REFUELED_EXTRA,
             cls.TOWER_REINFORCED_EXTRA,
+            cls.TOWER_RESOURCE_ALERT_MSG,
         }
 
     @classmethod

structures/managers.py

@@ -237,7 +237,7 @@ class StructureQuerySet(models.QuerySet):
 
     def select_related_defaults(self) -> models.QuerySet:
         """returns a QuerySet with the default select_related"""
-        return self.select_related(
+        return self.select_related(  # pylint: disable=E1102
             "owner",
             "owner__corporation",
             "owner__corporation__alliance",
@@ -383,7 +383,9 @@ class StructureManagerBase(models.Manager):
     def update_or_create_from_dict(self, structure: dict, owner) -> Tuple[Any, bool]:
         """update or create structure from given dict"""
 
-        eve_type, _ = EveType.objects.get_or_create_esi(id=structure["type_id"])
+        eve_type: EveType = EveType.objects.get_or_create_esi(id=structure["type_id"])[
+            0
+        ]
         eve_solar_system, _ = EveSolarSystem.objects.get_or_create_esi(
             id=structure["system_id"]
         )
@@ -423,10 +425,11 @@ class StructureManagerBase(models.Manager):
         if old_obj:
             obj.handle_fuel_notifications(old_obj)
 
-        # Make sure we have dogmas loaded for this type for fittings
-        EveType.objects.get_or_create_esi(
-            id=structure["type_id"], enabled_sections=[EveType.Section.DOGMAS]
-        )
+        # Make sure we have dogmas loaded with all upwell structures for fittings
+        if eve_type.eve_group.eve_category_id == EveCategoryId.STRUCTURE:
+            EveType.objects.get_or_create_esi(
+                id=structure["type_id"], enabled_sections=[EveType.Section.DOGMAS]
+            )
 
         self._save_related_structure_services(structure, obj)
 

structures/migrations/0007_add_notificationtypes_skyhook_metenox.py

@@ -0,0 +1,149 @@
+# Generated by Django 4.0.10 on 2024-08-19 14:25
+
+import multiselectfield.db.fields
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("structures", "0006_add_ownercharacter_disabled"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="webhook",
+            name="notification_types",
+            field=multiselectfield.db.fields.MultiSelectField(
+                choices=[
+                    ("OwnershipTransferred", "Upwell structure ownership transferred"),
+                    ("StructureAnchoring", "Upwell structure anchoring"),
+                    ("StructureDestroyed", "Upwell structure destroyed"),
+                    ("StructureFuelAlert", "Upwell structure fuel alert"),
+                    ("StructureJumpFuelAlert", "Upwell structure jump fuel alert"),
+                    ("StructureLostArmor", "Upwell structure lost armor"),
+                    ("StructureLostShields", "Upwell structure lost shields"),
+                    ("StructureLowReagentsAlert", "Structure low reagents alert"),
+                    ("StructureNoReagentsAlert", "Structure no reagents alert"),
+                    ("StructureOnline", "Upwell structure went online"),
+                    ("StructureRefueledExtra", "Upwell structure refueled"),
+                    (
+                        "StructuresReinforcementChanged",
+                        "Upwell structure reinforcement time changed",
+                    ),
+                    (
+                        "StructureServicesOffline",
+                        "Upwell structure services went offline",
+                    ),
+                    ("StructureUnanchoring", "Upwell structure unanchoring"),
+                    ("StructureUnderAttack", "Upwell structure is under attack"),
+                    ("StructureWentHighPower", "Upwell structure went high power"),
+                    ("StructureWentLowPower", "Upwell structure went low power"),
+                    ("SkyhookDeployed", "Skyhook deployed"),
+                    ("SkyhookDestroyed", "Skyhook destroyed"),
+                    ("SkyhookLostShields", "Skyhook lost shields"),
+                    ("SkyhookOnline", "Skyhook online"),
+                    ("SkyhookUnderAttack", "Skyhook under attack"),
+                    ("OrbitalAttacked", "Customs office attacked"),
+                    ("OrbitalReinforced", "Customs office reinforced"),
+                    ("TowerAlertMsg", "Starbase attacked"),
+                    ("TowerRefueledExtra", "Starbase refueled (BETA)"),
+                    ("TowerReinforcedExtra", "Starbase reinforced (BETA)"),
+                    ("TowerResourceAlertMsg", "Starbase fuel alert"),
+                    (
+                        "MoonminingAutomaticFracture",
+                        "Moon mining automatic fracture triggered",
+                    ),
+                    (
+                        "MoonminingExtractionCancelled",
+                        "Moon mining extraction cancelled",
+                    ),
+                    ("MoonminingExtractionFinished", "Moon mining extraction finished"),
+                    ("MoonminingExtractionStarted", "Moon mining extraction started"),
+                    ("MoonminingLaserFired", "Moonmining laser fired"),
+                    ("SovAllClaimAquiredMsg", "Sovereignty claim acknowledgment"),
+                    ("SovAllClaimLostMsg", "Sovereignty lost"),
+                    ("AllAnchoringMsg", "Structure anchoring in alliance space"),
+                    ("EntosisCaptureStarted", "Sovereignty entosis capture started"),
+                    ("SovStructureDestroyed", "Sovereignty structure destroyed"),
+                    ("SovStructureReinforced", "Sovereignty structure reinforced"),
+                    (
+                        "SovCommandNodeEventStarted",
+                        "Sovereignty command node event started",
+                    ),
+                    ("AcceptedAlly", "War accepted ally"),
+                    (
+                        "AllWarCorpJoinedAllianceMsg",
+                        "Alliance war corporation joined alliance message",
+                    ),
+                    ("AllWarSurrenderMsg", "Alliance war surrender message"),
+                    ("AllyJoinedWarAggressorMsg", "War ally joined aggressor"),
+                    ("AllyJoinedWarAllyMsg", "War ally joined ally"),
+                    ("AllyJoinedWarDefenderMsg", "War ally joined defender"),
+                    ("CorpWarSurrenderMsg", "War party surrendered"),
+                    ("CorpBecameWarEligible", "War corporation became eligible"),
+                    ("CorpNoLongerWarEligible", "War corporation no longer eligible"),
+                    ("DeclareWar", "War declared"),
+                    ("WarHQRemovedFromSpace", "War HQ removed from space"),
+                    ("WarInvalid", "War invalid"),
+                    (
+                        "MercOfferedNegotiationMsg",
+                        "War mercenary offered negotiation message",
+                    ),
+                    ("MercOfferRetractedMsg", "War mercenary offer retracted message"),
+                    ("OfferedSurrender", "War offered surrender"),
+                    ("OfferedToAlly", "War offered to become ally"),
+                    ("WarAdopted ", "War adopted"),
+                    ("WarDeclared", "War declared"),
+                    ("WarInherited", "War inherited"),
+                    ("WarRetractedByConcord", "War retracted by Concord"),
+                    ("WarSurrenderOfferMsg", "War surrender offered"),
+                    ("CharAppAcceptMsg", "Character joins corporation"),
+                    ("CorpAppInvitedMsg", "Character invited to join corporation"),
+                    ("CorpAppNewMsg", "Character submitted application"),
+                    ("CharAppRejectMsg", "Corp application rejected message"),
+                    (
+                        "CorpAppRejectCustomMsg",
+                        "Corp application rejected custom message",
+                    ),
+                    ("CharAppWithdrawMsg", "Character withdrew application"),
+                    ("CharLeftCorpMsg", "Character leaves corporation"),
+                    ("BillOutOfMoneyMsg", "Bill out of money"),
+                    ("CorpAllBillMsg", "Corp alliance billing message"),
+                    (
+                        "InfrastructureHubBillAboutToExpire",
+                        "I-HUB bill about to expire",
+                    ),
+                    ("IHubDestroyedByBillFailure", "I_HUB destroyed by bill failure"),
+                ],
+                default=[
+                    "OrbitalAttacked",
+                    "OrbitalReinforced",
+                    "SkyhookDestroyed",
+                    "SkyhookLostShields",
+                    "SkyhookOnline",
+                    "SkyhookUnderAttack",
+                    "SovStructureDestroyed",
+                    "SovStructureReinforced",
+                    "StructureAnchoring",
+                    "StructureDestroyed",
+                    "StructureFuelAlert",
+                    "StructureLostArmor",
+                    "StructureLostShields",
+                    "StructureLowReagentsAlert",
+                    "StructureNoReagentsAlert",
+                    "StructureOnline",
+                    "StructureServicesOffline",
+                    "StructureUnderAttack",
+                    "StructureWentHighPower",
+                    "StructureWentLowPower",
+                    "TowerAlertMsg",
+                    "TowerResourceAlertMsg",
+                ],
+                help_text="Select which type of notifications should be forwarded to this webhook",
+                max_length=1475,
+                verbose_name="notification types",
+            ),
+        ),
+    ]

structures/migrations/0008_add_notificationtypes_skyhook_metenox.py

@@ -0,0 +1,149 @@
+# Generated by Django 4.0.10 on 2024-08-19 18:59
+
+import multiselectfield.db.fields
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("structures", "0007_add_notificationtypes_skyhook_metenox"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="webhook",
+            name="notification_types",
+            field=multiselectfield.db.fields.MultiSelectField(
+                choices=[
+                    ("OwnershipTransferred", "Upwell structure ownership transferred"),
+                    ("StructureAnchoring", "Upwell structure anchoring"),
+                    ("StructureDestroyed", "Upwell structure destroyed"),
+                    ("StructureFuelAlert", "Upwell structure fuel alert"),
+                    ("StructureJumpFuelAlert", "Upwell structure jump fuel alert"),
+                    ("StructureLostArmor", "Upwell structure lost armor"),
+                    ("StructureLostShields", "Upwell structure lost shields"),
+                    ("StructureLowReagentsAlert", "Structure low reagents alert"),
+                    ("StructureNoReagentsAlert", "Structure no reagents alert"),
+                    ("StructureOnline", "Upwell structure went online"),
+                    ("StructureRefueledExtra", "Upwell structure refueled"),
+                    (
+                        "StructuresReinforcementChanged",
+                        "Upwell structure reinforcement time changed",
+                    ),
+                    (
+                        "StructureServicesOffline",
+                        "Upwell structure services went offline",
+                    ),
+                    ("StructureUnanchoring", "Upwell structure unanchoring"),
+                    ("StructureUnderAttack", "Upwell structure is under attack"),
+                    ("StructureWentHighPower", "Upwell structure went high power"),
+                    ("StructureWentLowPower", "Upwell structure went low power"),
+                    ("SkyhookDeployed", "Skyhook deployed"),
+                    ("SkyhookDestroyed", "Skyhook destroyed"),
+                    ("SkyhookLostShields", "Skyhook lost shields"),
+                    ("SkyhookOnline", "Skyhook online"),
+                    ("SkyhookUnderAttack", "Skyhook under attack"),
+                    ("OrbitalAttacked", "Customs office attacked"),
+                    ("OrbitalReinforced", "Customs office reinforced"),
+                    ("TowerAlertMsg", "Starbase attacked"),
+                    ("TowerRefueledExtra", "Starbase refueled (BETA)"),
+                    ("TowerReinforcedExtra", "Starbase reinforced (BETA)"),
+                    ("TowerResourceAlertMsg", "Starbase fuel alert"),
+                    (
+                        "MoonminingAutomaticFracture",
+                        "Moon mining automatic fracture triggered",
+                    ),
+                    (
+                        "MoonminingExtractionCancelled",
+                        "Moon mining extraction cancelled",
+                    ),
+                    ("MoonminingExtractionFinished", "Moon mining extraction finished"),
+                    ("MoonminingExtractionStarted", "Moon mining extraction started"),
+                    ("MoonminingLaserFired", "Moonmining laser fired"),
+                    ("SovAllClaimAquiredMsg", "Sovereignty claim acknowledgment"),
+                    ("SovAllClaimLostMsg", "Sovereignty lost"),
+                    ("AllAnchoringMsg", "Structure anchoring in alliance space"),
+                    ("EntosisCaptureStarted", "Sovereignty entosis capture started"),
+                    ("SovStructureDestroyed", "Sovereignty structure destroyed"),
+                    ("SovStructureReinforced", "Sovereignty structure reinforced"),
+                    (
+                        "SovCommandNodeEventStarted",
+                        "Sovereignty command node event started",
+                    ),
+                    ("AcceptedAlly", "War accepted ally"),
+                    (
+                        "AllWarCorpJoinedAllianceMsg",
+                        "Alliance war corporation joined alliance message",
+                    ),
+                    ("AllWarSurrenderMsg", "Alliance war surrender message"),
+                    ("AllyJoinedWarAggressorMsg", "War ally joined aggressor"),
+                    ("AllyJoinedWarAllyMsg", "War ally joined ally"),
+                    ("AllyJoinedWarDefenderMsg", "War ally joined defender"),
+                    ("CorpWarSurrenderMsg", "War party surrendered"),
+                    ("CorpBecameWarEligible", "War corporation became eligible"),
+                    ("CorpNoLongerWarEligible", "War corporation no longer eligible"),
+                    ("DeclareWar", "War declared"),
+                    ("WarHQRemovedFromSpace", "War HQ removed from space"),
+                    ("WarInvalid", "War invalid"),
+                    (
+                        "MercOfferedNegotiationMsg",
+                        "War mercenary offered negotiation message",
+                    ),
+                    ("MercOfferRetractedMsg", "War mercenary offer retracted message"),
+                    ("OfferedSurrender", "War offered surrender"),
+                    ("OfferedToAlly", "War offered to become ally"),
+                    ("WarAdopted", "War adopted"),
+                    ("WarDeclared", "War declared"),
+                    ("WarInherited", "War inherited"),
+                    ("WarRetractedByConcord", "War retracted by Concord"),
+                    ("WarSurrenderOfferMsg", "War surrender offered"),
+                    ("CharAppAcceptMsg", "Character joins corporation"),
+                    ("CorpAppInvitedMsg", "Character invited to join corporation"),
+                    ("CorpAppNewMsg", "Character submitted application"),
+                    ("CharAppRejectMsg", "Corp application rejected message"),
+                    (
+                        "CorpAppRejectCustomMsg",
+                        "Corp application rejected custom message",
+                    ),
+                    ("CharAppWithdrawMsg", "Character withdrew application"),
+                    ("CharLeftCorpMsg", "Character leaves corporation"),
+                    ("BillOutOfMoneyMsg", "Bill out of money"),
+                    ("CorpAllBillMsg", "Corp alliance billing message"),
+                    (
+                        "InfrastructureHubBillAboutToExpire",
+                        "I-HUB bill about to expire",
+                    ),
+                    ("IHubDestroyedByBillFailure", "I_HUB destroyed by bill failure"),
+                ],
+                default=[
+                    "OrbitalAttacked",
+                    "OrbitalReinforced",
+                    "SkyhookDestroyed",
+                    "SkyhookLostShields",
+                    "SkyhookOnline",
+                    "SkyhookUnderAttack",
+                    "SovStructureDestroyed",
+                    "SovStructureReinforced",
+                    "StructureAnchoring",
+                    "StructureDestroyed",
+                    "StructureFuelAlert",
+                    "StructureLostArmor",
+                    "StructureLostShields",
+                    "StructureLowReagentsAlert",
+                    "StructureNoReagentsAlert",
+                    "StructureOnline",
+                    "StructureServicesOffline",
+                    "StructureUnderAttack",
+                    "StructureWentHighPower",
+                    "StructureWentLowPower",
+                    "TowerAlertMsg",
+                    "TowerResourceAlertMsg",
+                ],
+                help_text="Select which type of notifications should be forwarded to this webhook",
+                max_length=1474,
+                verbose_name="notification types",
+            ),
+        ),
+    ]

structures/models/notifications.py

@@ -410,11 +410,15 @@ class NotificationBase(models.Model):
         try:
             embed, ping_type = self._generate_embed(webhook.language_code)
         except OSError as ex:
-            logger.warning("%s: Failed to generate embed: %s", self, ex, exc_info=True)
+            logger.error("%s: Failed to generate embed: %s", self, ex, exc_info=True)
             return False
 
         content = self._create_content_with_pings(webhook, ping_type)
         content += self._add_discord_group_pings(webhook)
+        max_content = dhooks_lite.Webhook.MAX_CHARACTERS
+        if content and len(content) > max_content:
+            logger.error("%s: Content of notification is too long: %s", self, content)
+            return False
 
         username, avatar_url = self._gen_avatar()
         new_queue_size = webhook.send_message(

structures/tests/core/notification_embeds/test_main.py

@@ -240,6 +240,26 @@ class TestNotificationEmbedsGenerate(TestCase):
         self.assertEqual(discord_embed.footer.text, "Structures")
         self.assertIn("structures_logo.png", discord_embed.footer.icon_url)
 
+    def test_should_not_break_with_too_large_description(self):
+        # given
+        notification = Notification.objects.get(notification_id=1000000403)
+        notification_embed = NotificationBaseEmbed.create(notification)
+        notification_embed._description = "x" * 2049
+        # when
+        discord_embed = notification_embed.generate_embed()
+        # then
+        self.assertIsInstance(discord_embed, dhooks_lite.Embed)
+
+    def test_should_not_break_with_too_large_title(self):
+        # given
+        notification = Notification.objects.get(notification_id=1000000403)
+        notification_embed = NotificationBaseEmbed.create(notification)
+        notification_embed._title = "x" * 257
+        # when
+        discord_embed = notification_embed.generate_embed()
+        # then
+        self.assertIsInstance(discord_embed, dhooks_lite.Embed)
+
 
 class TestNotificationEmbedsClasses(NoSocketsTestCase):
     @classmethod

structures/tests/core/test_notification_types.py

@@ -118,6 +118,11 @@ class TestNotificationType(TestCase):
             "CorpWarInvalidatedMsg",
             "CorpWarRetractedMsg",
             "CorpWarSurrenderMsg",
+            "CorporationGoalClosed",
+            "CorporationGoalCompleted",
+            "CorporationGoalCreated",
+            "CorporationGoalNameChange",
+            "CorporationLeft",
             "CustomsMsg",
             "DeclareWar",
             "DistrictAttacked",
@@ -172,6 +177,7 @@ class TestNotificationType(TestCase):
             "KillRightUnavailable",
             "KillRightUnavailableOpen",
             "KillRightUsed",
+            "LPAutoRedeemed",
             "LocateCharMsg",
             "MadeWarMutual",
             "MercOfferRetractedMsg",
@@ -205,7 +211,14 @@ class TestNotificationType(TestCase):
             "ReimbursementMsg",
             "ResearchMissionAvailableMsg",
             "RetractsWar",
+            "SPAutoRedeemed",
             "SeasonalChallengeCompleted",
+            "SkinSequencingCompleted",
+            "SkyhookDeployed",
+            "SkyhookDestroyed",
+            "SkyhookLostShields",
+            "SkyhookOnline",
+            "SkyhookUnderAttack",
             "SovAllClaimAquiredMsg",
             "SovAllClaimLostMsg",
             "SovCommandNodeEventStarted",
@@ -237,7 +250,10 @@ class TestNotificationType(TestCase):
             "StructureItemsMovedToSafety",
             "StructureLostArmor",
             "StructureLostShields",
+            "StructureLowReagentsAlert",
+            "StructureNoReagentsAlert",
             "StructureOnline",
+            "StructurePaintPurchased",
             "StructureServicesOffline",
             "StructureUnanchoring",
             "StructureUnderAttack",

structures/tests/models/test_notifications_discord.py

@@ -33,6 +33,7 @@ if "discord" in app_labels():
             super().setUpClass()
             load_eveuniverse()
             load_eve_entities()
+
             cls.group_1 = Group.objects.create(name="Dummy Group 1")
             cls.group_2 = Group.objects.create(name="Dummy Group 2")
             cls.owner = OwnerFactory()
@@ -140,3 +141,23 @@ if "discord" in app_labels():
             self.assertTrue(mock_import_discord.called)
             _, kwargs = mock_send_message.call_args
             self.assertFalse(re.search(r"(<@&\d+>)", kwargs["content"]))
+
+        def test_should_abort_when_content_is_too_large(
+            self, mock_send_message, mock_import_discord
+        ):
+            # given
+            mock_send_message.return_value = 1
+            mock_import_discord.return_value.objects.group_to_role.side_effect = (
+                self._my_group_to_role
+            )
+            webhook = WebhookFactory()
+            for i in range(286):
+                group = Group.objects.create(name=f"Group {i+1}")
+                webhook.ping_groups.add(group)
+            obj = clone_notification(
+                Notification.objects.get(notification_id=1000000509)
+            )
+            # when
+            result = obj.send_to_webhook(webhook)
+            # then
+            self.assertFalse(result)