aa-structures 2.8.0__tar.gz → 2.9.1__tar.gz

{aa_structures-2.8.0 → aa_structures-2.9.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: aa-structures
-Version: 2.8.0
+Version: 2.9.1
 Summary: App for managing Eve Online structures with Alliance Auth.
 Author-email: Erik Kalkoken <kalkoken87@gmail.com>
 Requires-Python: >=3.8
@@ -106,7 +106,7 @@ This is an example for a notification posted on Discord:
 
 ![Notification example](https://i.imgur.com/oqBqeFy.png)
 
-## Installation
+## Documentation
 
 Please see the [operation manual](https://aa-structures.readthedocs.io/en/latest/operations.html#installation) for the installation guide.
 

{aa_structures-2.8.0 → aa_structures-2.9.1}/README.md

@@ -70,6 +70,6 @@ This is an example for a notification posted on Discord:
 
 ![Notification example](https://i.imgur.com/oqBqeFy.png)
 
-## Installation
+## Documentation
 
 Please see the [operation manual](https://aa-structures.readthedocs.io/en/latest/operations.html#installation) for the installation guide.

{aa_structures-2.8.0 → aa_structures-2.9.1}/structures/__init__.py

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

{aa_structures-2.8.0 → aa_structures-2.9.1}/structures/admin.py

@@ -1040,9 +1040,9 @@ class WebhookAdmin(admin.ModelAdmin):
 
     def get_form(self, *args, **kwargs):
         form = super().get_form(*args, **kwargs)
-        form.base_fields[
-            "notification_types"
-        ].choices = NotificationType.choices_enabled()
+        form.base_fields["notification_types"].choices = sorted(
+            NotificationType.choices_enabled(), key=lambda k: k[1]
+        )
         return form
 
     def get_queryset(self, request):

{aa_structures-2.8.0 → aa_structures-2.9.1}/structures/app_settings.py

@@ -2,119 +2,157 @@
 
 from app_utils.app_settings import clean_setting
 
-# Whether to automatically add timers for certain notifications
-# on the timerboard (will have no effect if aa-timerboard app is not installed)
 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 admins will get notifications about import events like
-# when someone adds a structure owner
 STRUCTURES_ADMIN_NOTIFICATIONS_ENABLED = clean_setting(
     "STRUCTURES_ADMIN_NOTIFICATIONS_ENABLED", True
 )
+"""Whether admins will get notifications about import events
+like when someone adds a structure owner and when services for an owner are down.
+"""
 
-# Sets the default language to be used in case no language can be determined
-# e.g. this language will be used when creating timers
-# Please use the language codes as defined in the base.py settings file
 STRUCTURES_DEFAULT_LANGUAGE = clean_setting("STRUCTURES_DEFAULT_LANGUAGE", "en")
+"""Sets the default language to be used in case no language can be determined
+e.g. this language will be used when creating timers
+Please use the language codes as defined in the base.py settings file.
+"""
 
-# whether the structure list has default tags filter enabled by default
 STRUCTURES_DEFAULT_TAGS_FILTER_ENABLED = clean_setting(
     "STRUCTURES_DEFAULT_TAGS_FILTER_ENABLED", False
 )
+"""Whether the structure list has default tags filter enabled by default."""
 
-# Enables features for developers
-# e.g. write access to all models in admin and writing raw data received from ESI
-# UNDOCUMENTED SETTING
 STRUCTURES_DEVELOPER_MODE = clean_setting("STRUCTURES_DEVELOPER_MODE", False)
+"""Enables features for developers e.g. write access to all models in admin
+and writing raw data received from ESI.
+
+:meta private:
+"""
+
+STRUCTURES_DEFAULT_PAGE_LENGTH = clean_setting("STRUCTURES_DEFAULT_PAGE_LENGTH", 10)
+"""Default page size for structure list.
+Must be an integer value from the current options as seen in the app.
+"""
 
-# Whether the customs offices feature is active
 STRUCTURES_FEATURE_CUSTOMS_OFFICES = clean_setting(
     "STRUCTURES_FEATURE_CUSTOMS_OFFICES", True
 )
+"""Enable / disable custom offices feature."""
+
+STRUCTURES_FEATURE_REFUELED_NOTIFICATIONS = clean_setting(
+    "STRUCTURES_FEATURE_REFUELED_NOTIFICATIONS", True
+)
+"""Enable / disable refueled notifications feature."""
 
-# Whether the starbases / POSes feature is active
 STRUCTURES_FEATURE_STARBASES = clean_setting("STRUCTURES_FEATURE_STARBASES", True)
+"""Enable / disable starbases feature."""
+
+STRUCTURES_ESI_DIRECTOR_ERROR_MAX_RETRIES = clean_setting(
+    "STRUCTURES_ESI_DIRECTOR_ERROR_MAX_RETRIES", 3
+)
+"""Max retries before a character is deleted when ESI claims the character
+is not a director (Since this sometimes is reported wrongly by ESI).
+"""
+
+STRUCTURES_ESI_TIMEOUT_ENABLED = clean_setting("STRUCTURES_ESI_TIMEOUT_ENABLED", True)
+"""Whether ESI timeout is enabled."""
 
 
-# defines after how many hours a notification becomes stale
-# stale notification will no longer be sent automatically
 STRUCTURES_HOURS_UNTIL_STALE_NOTIFICATION = clean_setting(
     "STRUCTURES_HOURS_UNTIL_STALE_NOTIFICATION", 24
 )
+"""Defines after how many hours a notification becomes stale.
+Stale notification will no longer be sent automatically.
+"""
 
-# whether to create / remove timers from moon extraction notifications
 STRUCTURES_MOON_EXTRACTION_TIMERS_ENABLED = clean_setting(
     "STRUCTURES_MOON_EXTRACTION_TIMERS_ENABLED", True
 )
+"""Whether to create / remove timers from moon extraction notifications."""
 
-# Max number of retries for sending a notification if an error occurred
-# e.g. rate limiting
 STRUCTURES_NOTIFICATION_MAX_RETRIES = clean_setting(
     "STRUCTURES_NOTIFICATION_MAX_RETRIES", 3
 )
+"""Max number of retries for sending a notification
+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.
+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."""
+
 
-# Max time in minutes since last successful notification sync
-# before service is reported as down
 STRUCTURES_NOTIFICATION_SYNC_GRACE_MINUTES = clean_setting(
     "STRUCTURES_NOTIFICATION_SYNC_GRACE_MINUTES", 40
 )
+"""Max time in minutes since last successful notification sync
+before service is reported as down.
+"""
 
-# Default wait time in seconds before retrying to send a notification
-# to Discord after an error occurred
 STRUCTURES_NOTIFICATION_WAIT_SEC = clean_setting("STRUCTURES_NOTIFICATION_WAIT_SEC", 5)
+"""Default wait time in seconds before retrying to send a notification
+to Discord after an error occurred.
+"""
 
-# Enables archiving of all notifications received from ESI to files
-# notifications will by stored into one continuous file per corporations
-# UNDOCUMENTED SETTING
 STRUCTURES_NOTIFICATIONS_ARCHIVING_ENABLED = clean_setting(
     "STRUCTURES_NOTIFICATIONS_ARCHIVING_ENABLED", False
 )
+"""Enables archiving of all notifications received from ESI to files
+notifications will by stored into one continuous file per corporations.
 
-# Wether structures sets the name and avatar icon of a webhook
-# else the webhook will show it's default names as set when defining the webhook
-STRUCTURES_NOTIFICATION_SET_AVATAR = clean_setting(
-    "STRUCTURES_NOTIFICATION_SET_AVATAR", True
-)
+:meta private:
+"""
 
-# Wether ore details are shown on moon timers
-STRUCTURES_NOTIFICATION_SHOW_MOON_ORE = clean_setting(
-    "STRUCTURES_NOTIFICATION_SHOW_MOON_ORE", True
-)
+STRUCTURES_PAGING_ENABLED = clean_setting("STRUCTURES_PAGING_ENABLED", True)
+"""Whether paging is enabled for the structure list"""
 
-# how to handle notification about NPC attacks
 STRUCTURES_REPORT_NPC_ATTACKS = clean_setting("STRUCTURES_REPORT_NPC_ATTACKS", True)
+"""Enable / disable sending notifications for attacks by NPCs
+(structure reinforcements are still reported).
+"""
 
-# whether fuel expires in structures browser is shown as absolute value
 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 to show the jump gates tab
 STRUCTURES_SHOW_JUMP_GATES = clean_setting("STRUCTURES_SHOW_JUMP_GATES", True)
+"""Whether to show the jump gates tab."""
 
-# Max time in minutes since last successful structures sync
-# before service is reported as down
 STRUCTURES_STRUCTURE_SYNC_GRACE_MINUTES = clean_setting(
     "STRUCTURES_STRUCTURE_SYNC_GRACE_MINUTES", 120
 )
+"""Max time in minutes since last successful structures sync
+before service is reported as down.
+"""
 
-# Hard timeout for tasks in seconds to reduce task accumulation during outages
 STRUCTURES_TASKS_TIME_LIMIT = clean_setting("STRUCTURES_TASKS_TIME_LIMIT", 7200)
+"""Hard timeout for tasks in seconds to reduce task accumulation during outages."""
 
-# whether created timers are corp restricted on the timerboard
 STRUCTURES_TIMERS_ARE_CORP_RESTRICTED = clean_setting(
     "STRUCTURES_TIMERS_ARE_CORP_RESTRICTED", False
 )
+"""Whether created timers are corp restricted on the timerboard."""
 
-# whether ESI timeout is enabled
-STRUCTURES_ESI_TIMEOUT_ENABLED = clean_setting("STRUCTURES_ESI_TIMEOUT_ENABLED", True)
-
-# Default page size for structure list.
-# Must be an integer value from the current options as seen in the app.
-STRUCTURES_DEFAULT_PAGE_LENGTH = clean_setting("STRUCTURES_DEFAULT_PAGE_LENGTH", 10)
-
-# Wether paging is enabled for the structure list
-STRUCTURES_PAGING_ENABLED = clean_setting("STRUCTURES_PAGING_ENABLED", True)
+STRUCTURES_NOTIFICATION_DISABLE_ESI_FUEL_ALERTS = clean_setting(
+    "STRUCTURES_NOTIFICATION_DISABLE_ESI_FUEL_ALERTS", False
+)
+"""This allows you to turn off ESI fuel alert notifications
+to use the Structure's generated fuel notifications exclusively.
+"""
 
 # INTERNAL SETTINGS
 
@@ -143,22 +181,3 @@ STRUCTURES_NOTIFICATION_TURNAROUND_MAX_VALID = clean_setting(
 STRUCTURES_NOTIFY_THROTTLED_TIMEOUT = clean_setting(
     "STRUCTURES_NOTIFY_THROTTLED_TIMEOUT", 86400
 )
-
-# This allows you to turn off ESI fuel alert notifications
-# to use the Structure's generated fuel notifications exclusively.
-STRUCTURES_NOTIFICATION_DISABLE_ESI_FUEL_ALERTS = clean_setting(
-    "STRUCTURES_NOTIFICATION_DISABLE_ESI_FUEL_ALERTS", False
-)
-
-# Feature flag to enable refueled notifications
-STRUCTURES_FEATURE_REFUELED_NOTIFICATIONS = clean_setting(
-    "STRUCTURES_FEATURE_REFUELED_NOTIFICATIONS", True
-)
-
-
-STRUCTURES_ESI_DIRECTOR_ERROR_MAX_RETRIES = clean_setting(
-    "STRUCTURES_ESI_DIRECTOR_ERROR_MAX_RETRIES", 3
-)
-"""Max retries before a character is deleted when ESI claims the character
-is not a director (Since this sometimes is reported wrongly by ESI).
-"""

{aa_structures-2.8.0 → aa_structures-2.9.1}/structures/core/notification_embeds/billing_embeds.py

@@ -7,15 +7,19 @@ import dhooks_lite
 
 from django.db import models
 from django.utils.translation import gettext as _
-from eveuniverse.models import EveType
 
 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_esi_obj
+from structures.helpers import get_or_create_eve_entity, get_or_create_eve_type
 from structures.models import Notification, Webhook
 
-from .helpers import gen_solar_system_text, target_datetime_formatted
+from .helpers import (
+    gen_eve_entity_link,
+    gen_solar_system_text,
+    target_datetime_formatted,
+)
 from .main import NotificationBaseEmbed
 
 
@@ -37,9 +41,9 @@ class BillType(models.IntegerChoices):
 class NotificationBillingBillOutOfMoneyMsg(NotificationBaseEmbed):
     def __init__(self, notification: Notification) -> None:
         super().__init__(notification)
-        bill_type_id = self._parsed_text["billTypeID"]
+        bill_type_id = self._data["billTypeID"]
         bill_type_str = BillType.to_enum(bill_type_id).label
-        due_date = ldap_time_2_datetime(self._parsed_text["dueDate"])
+        due_date = ldap_time_2_datetime(self._data["dueDate"])
         self._title = _("Insufficient Funds for Bill")
         self._description = _(
             "The selected corporation wallet division for automatic payments "
@@ -58,7 +62,7 @@ class NotificationBillingIHubBillAboutToExpire(NotificationBaseEmbed):
     def __init__(self, notification: Notification) -> None:
         super().__init__(notification)
         solar_system_link = gen_solar_system_text(self._notification.eve_solar_system())
-        due_date = ldap_time_2_datetime(self._parsed_text.get("dueDate"))
+        due_date = ldap_time_2_datetime(self._data.get("dueDate"))
         self._title = _("IHub Bill About to Expire")
         self._description = _(
             "Maintenance bill for Infrastructure Hub in %(solar_system)s "
@@ -69,7 +73,7 @@ class NotificationBillingIHubBillAboutToExpire(NotificationBaseEmbed):
             "due_date": target_datetime_formatted(due_date),
         }
         self._color = Webhook.Color.DANGER
-        structure_type = get_or_create_esi_obj(EveType, id=EveTypeId.IHUB)
+        structure_type = get_or_create_eve_type(id=EveTypeId.IHUB)
         self._thumbnail = dhooks_lite.Thumbnail(
             structure_type.icon_url(size=self.ICON_DEFAULT_SIZE)
         )
@@ -92,3 +96,32 @@ class NotificationBillingIHubDestroyedByBillFailure(NotificationBaseEmbed):
         self._thumbnail = dhooks_lite.Thumbnail(
             structure_type.icon_url(size=self.ICON_DEFAULT_SIZE)
         )
+
+
+class NotificationCorpAllBillMsg(NotificationBaseEmbed):
+    def __init__(self, notification: Notification) -> None:
+        super().__init__(notification)
+        amount = self._data["amount"]
+        bill_type_id = self._data["billTypeID"]
+        bill_type_str = BillType.to_enum(bill_type_id).label
+        current_date = ldap_time_2_datetime(self._data["currentDate"])
+        due_date = ldap_time_2_datetime(self._data["dueDate"])
+        creditor = get_or_create_eve_entity(id=self._data["creditorID"])
+        debtor = get_or_create_eve_entity(id=self._data["debtorID"])
+        self._title = _("Bill issued")
+        self._description = _(
+            "A bill of %(amount)s ISK, due %(due_date)s owed by %(debtor)s "
+            "to %(creditor)s was issued %(current_date)s. "
+            "This bill is for %(bill_type)s."
+        ) % {
+            "amount": humanize_number(amount),
+            "bill_type": bill_type_str,
+            "creditor": gen_eve_entity_link(creditor),
+            "debtor": gen_eve_entity_link(debtor),
+            "current_date": target_datetime_formatted(current_date),
+            "due_date": target_datetime_formatted(due_date),
+        }
+        self._color = Webhook.Color.WARNING
+        self._thumbnail = dhooks_lite.Thumbnail(
+            debtor.icon_url(size=self.ICON_DEFAULT_SIZE)
+        )

aa_structures-2.8.0/structures/core/notification_embeds/character_embeds.py → aa_structures-2.9.1/structures/core/notification_embeds/corporate_embeds.py

@@ -1,13 +1,12 @@
-"""Character & corporation embeds."""
+"""Corporate embeds."""
 
 # pylint: disable=missing-class-docstring
 
 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.helpers import get_or_create_eve_entity
 from structures.models import Notification, Webhook
 
 from .helpers import (
@@ -21,15 +20,11 @@ from .main import NotificationBaseEmbed
 class NotificationCorpCharEmbed(NotificationBaseEmbed):
     def __init__(self, notification: Notification) -> None:
         super().__init__(notification)
-        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 = get_or_create_eve_entity(id=self._data["charID"])
+        self._corporation = get_or_create_eve_entity(id=self._data["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", "")
+        self._application_text = self._data.get("applicationText", "")
         self._thumbnail = dhooks_lite.Thumbnail(
             self._character.icon_url(size=self.ICON_DEFAULT_SIZE)
         )
@@ -60,7 +55,7 @@ class NotificationCorpAppInvitedMsg(NotificationCorpCharEmbed):
             "character_name": self._character.name
         }
         inviting_character = gen_eve_entity_link_from_id(
-            self._parsed_text.get("invokingCharID")
+            self._data.get("invokingCharID")
         )
         self._description = _(
             "%(character_name)s has been invited to join %(corporation_name)s "
@@ -77,6 +72,22 @@ class NotificationCorpAppInvitedMsg(NotificationCorpCharEmbed):
         self._color = Webhook.Color.INFO
 
 
+class NotificationCharAppRejectMsg(NotificationCorpCharEmbed):
+    def __init__(self, notification: Notification) -> None:
+        super().__init__(notification)
+        self._title = _("%(character_name)s rejects invitation") % {
+            "character_name": self._character.name
+        }
+        self._description = _(
+            "Application from %(character_name)s to join %(corporation_name)s "
+            "has been rejected."
+        ) % {
+            "character_name": self._character_link,
+            "corporation_name": self._corporation_link,
+        }
+        self._color = Webhook.Color.INFO
+
+
 class NotificationCorpAppRejectCustomMsg(NotificationCorpCharEmbed):
     def __init__(self, notification: Notification) -> None:
         super().__init__(notification)
@@ -92,9 +103,8 @@ class NotificationCorpAppRejectCustomMsg(NotificationCorpCharEmbed):
             "character_name": self._character_link,
             "corporation_name": self._corporation_link,
             "application_text": self._application_text,
-            "customMessage": self._parsed_text.get("customMessage", ""),
+            "customMessage": self._data.get("customMessage", ""),
         }
-
         self._color = Webhook.Color.INFO
 
 

{aa_structures-2.8.0 → aa_structures-2.9.1}/structures/core/notification_embeds/main.py

@@ -2,19 +2,19 @@
 
 # pylint: disable=missing-class-docstring
 
+import re
 from typing import Optional
 
 import dhooks_lite
 
 from django.conf import settings
 from django.utils.translation import gettext as _
-from eveuniverse.models import EveEntity
 
 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 get_or_create_esi_obj, is_absolute_url
+from structures.helpers import get_or_create_eve_entity, is_absolute_url
 from structures.models.notifications import Notification, NotificationBase, Webhook
 
 from .helpers import target_datetime_formatted
@@ -33,7 +33,7 @@ class NotificationBaseEmbed:
         if not isinstance(notification, NotificationBase):
             raise TypeError("notification must be of type Notification")
         self._notification = notification
-        self._parsed_text = notification.parsed_text()
+        self._data = notification.parsed_text()
         self._title = ""
         self._description = ""
         self._color = None
@@ -66,24 +66,24 @@ class NotificationBaseEmbed:
         damage_parts = []
         for prop in damage_labels:
             field_name = f"{prop[0]}{field_postfix}"
-            if field_name in self._parsed_text:
+            if field_name in self._data:
                 label = prop[1]
-                value = self._parsed_text[field_name] * factor
+                value = self._data[field_name] * factor
                 damage_parts.append(f"{label}: {value:.1f}%")
         damage_text = " | ".join(damage_parts)
         return damage_text
 
     def get_aggressor_link(self) -> str:
         """Returns the aggressor link from a parsed_text for POS and POCOs only."""
-        if self._parsed_text.get("aggressorAllianceID"):
+        if self._data.get("aggressorAllianceID"):
             key = "aggressorAllianceID"
-        elif self._parsed_text.get("aggressorCorpID"):
+        elif self._data.get("aggressorCorpID"):
             key = "aggressorCorpID"
-        elif self._parsed_text.get("aggressorID"):
+        elif self._data.get("aggressorID"):
             key = "aggressorID"
         else:
             return "(Unknown aggressor)"
-        entity = get_or_create_esi_obj(EveEntity, id=self._parsed_text[key])
+        entity = get_or_create_eve_entity(id=self._data[key])
         return Webhook.create_link(entity.name, entity.profile_url)
 
     def fuel_expires_target_date(self) -> str:
@@ -153,16 +153,18 @@ class NotificationBaseEmbed:
 
     # pylint: disable = too-many-locals
     @staticmethod
-    def create(notification: "NotificationBase") -> "NotificationBaseEmbed":
+    def create(notif: "NotificationBase") -> "NotificationBaseEmbed":
         """Creates a new instance of the respective subclass for given Notification."""
 
         from .billing_embeds import (
             NotificationBillingBillOutOfMoneyMsg,
             NotificationBillingIHubBillAboutToExpire,
             NotificationBillingIHubDestroyedByBillFailure,
+            NotificationCorpAllBillMsg,
         )
-        from .character_embeds import (
+        from .corporate_embeds import (
             NotificationCharAppAcceptMsg,
+            NotificationCharAppRejectMsg,
             NotificationCharAppWithdrawMsg,
             NotificationCharLeftCorpMsg,
             NotificationCorpAppInvitedMsg,
@@ -213,26 +215,42 @@ class NotificationBaseEmbed:
             NotificationTowerResourceAlertMsg,
         )
         from .war_embeds import (
+            NotificationAcceptedAlly,
+            NotificationAllWarCorpJoinedAllianceMsg,
+            NotificationAllWarSurrenderMsg,
             NotificationAllyJoinedWarMsg,
             NotificationCorpWarSurrenderMsg,
+            NotificationDeclareWar,
+            NotificationMercOfferedNegotiationMsg,
+            NotificationMercOfferRetractedMsg,
+            NotificationOfferedSurrender,
+            NotificationOfferedToAlly,
             NotificationWarAdopted,
             NotificationWarCorporationBecameEligible,
             NotificationWarCorporationNoLongerEligible,
             NotificationWarDeclared,
+            NotificationWarHQRemovedFromSpace,
             NotificationWarInherited,
+            NotificationWarInvalid,
             NotificationWarRetractedByConcord,
             NotificationWarSurrenderOfferMsg,
         )
 
-        if not isinstance(notification, NotificationBase):
+        if not isinstance(notif, NotificationBase):
             raise TypeError("notification must be of type NotificationBase")
 
         NT = NotificationType
         notif_type_2_class = {
+            # Billing
+            NT.BILLING_CORP_ALL_BILL_MSG: NotificationCorpAllBillMsg,
+            NT.BILLING_BILL_OUT_OF_MONEY_MSG: NotificationBillingBillOutOfMoneyMsg,
+            NT.BILLING_I_HUB_BILL_ABOUT_TO_EXPIRE: NotificationBillingIHubBillAboutToExpire,
+            NT.BILLING_I_HUB_DESTROYED_BY_BILL_FAILURE: NotificationBillingIHubDestroyedByBillFailure,
             # character
             NT.CORP_APP_NEW_MSG: NotificationCorpAppNewMsg,
             NT.CORP_APP_INVITED_MSG: NotificationCorpAppInvitedMsg,
             NT.CORP_APP_REJECT_CUSTOM_MSG: NotificationCorpAppRejectCustomMsg,
+            NT.CORP_APP_REJECT_MSG: NotificationCharAppRejectMsg,
             NT.CHAR_APP_WITHDRAW_MSG: NotificationCharAppWithdrawMsg,
             NT.CHAR_APP_ACCEPT_MSG: NotificationCharAppAcceptMsg,
             NT.CHAR_LEFT_CORP_MSG: NotificationCharLeftCorpMsg,
@@ -242,7 +260,23 @@ class NotificationBaseEmbed:
             NT.MOONMINING_AUTOMATIC_FRACTURE: NotificationMoonminningAutomaticFracture,
             NT.MOONMINING_EXTRACTION_CANCELLED: NotificationMoonminningExtractionCanceled,
             NT.MOONMINING_LASER_FIRED: NotificationMoonminningLaserFired,
-            # upwell structures
+            # Orbitals
+            NT.ORBITAL_ATTACKED: NotificationOrbitalAttacked,
+            NT.ORBITAL_REINFORCED: NotificationOrbitalReinforced,
+            # Sov
+            NT.SOV_ENTOSIS_CAPTURE_STARTED: NotificationSovEntosisCaptureStarted,
+            NT.SOV_COMMAND_NODE_EVENT_STARTED: NotificationSovCommandNodeEventStarted,
+            NT.SOV_ALL_CLAIM_ACQUIRED_MSG: NotificationSovAllClaimAcquiredMsg,
+            NT.SOV_ALL_CLAIM_LOST_MSG: NotificationSovAllClaimLostMsg,
+            NT.SOV_STRUCTURE_REINFORCED: NotificationSovStructureReinforced,
+            NT.SOV_STRUCTURE_DESTROYED: NotificationSovStructureDestroyed,
+            NT.SOV_ALL_ANCHORING_MSG: NotificationSovAllAnchoringMsg,
+            # Towers
+            NT.TOWER_ALERT_MSG: NotificationTowerAlertMsg,
+            NT.TOWER_RESOURCE_ALERT_MSG: NotificationTowerResourceAlertMsg,
+            NT.TOWER_REFUELED_EXTRA: NotificationTowerRefueledExtra,
+            NT.TOWER_REINFORCED_EXTRA: NotificationTowerReinforcedExtra,
+            # Upwell structures
             NT.STRUCTURE_ONLINE: NotificationStructureOnline,
             NT.STRUCTURE_FUEL_ALERT: NotificationStructureFuelAlert,
             NT.STRUCTURE_JUMP_FUEL_ALERT: NotificationStructureJumpFuelAlert,
@@ -258,42 +292,46 @@ class NotificationBaseEmbed:
             NT.OWNERSHIP_TRANSFERRED: NotificationStructureOwnershipTransferred,
             NT.STRUCTURE_ANCHORING: NotificationStructureAnchoring,
             NT.STRUCTURE_REINFORCEMENT_CHANGED: NotificationStructureReinforceChange,
-            # Orbitals
-            NT.ORBITAL_ATTACKED: NotificationOrbitalAttacked,
-            NT.ORBITAL_REINFORCED: NotificationOrbitalReinforced,
-            # Towers
-            NT.TOWER_ALERT_MSG: NotificationTowerAlertMsg,
-            NT.TOWER_RESOURCE_ALERT_MSG: NotificationTowerResourceAlertMsg,
-            NT.TOWER_REFUELED_EXTRA: NotificationTowerRefueledExtra,
-            NT.TOWER_REINFORCED_EXTRA: NotificationTowerReinforcedExtra,
-            # Sov
-            NT.SOV_ENTOSIS_CAPTURE_STARTED: NotificationSovEntosisCaptureStarted,
-            NT.SOV_COMMAND_NODE_EVENT_STARTED: NotificationSovCommandNodeEventStarted,
-            NT.SOV_ALL_CLAIM_ACQUIRED_MSG: NotificationSovAllClaimAcquiredMsg,
-            NT.SOV_ALL_CLAIM_LOST_MSG: NotificationSovAllClaimLostMsg,
-            NT.SOV_STRUCTURE_REINFORCED: NotificationSovStructureReinforced,
-            NT.SOV_STRUCTURE_DESTROYED: NotificationSovStructureDestroyed,
-            NT.SOV_ALL_ANCHORING_MSG: NotificationSovAllAnchoringMsg,
             # War
+            NT.WAR_ACCEPTED_ALLY: NotificationAcceptedAlly,
             NT.WAR_ALLY_JOINED_WAR_AGGRESSOR_MSG: NotificationAllyJoinedWarMsg,
             NT.WAR_ALLY_JOINED_WAR_ALLY_MSG: NotificationAllyJoinedWarMsg,
             NT.WAR_ALLY_JOINED_WAR_DEFENDER_MSG: NotificationAllyJoinedWarMsg,
+            NT.WAR_ALL_WAR_CORP_JOINED_ALLIANCE_MSG: NotificationAllWarCorpJoinedAllianceMsg,
+            NT.WAR_ALL_WAR_SURRENDER_MSG: NotificationAllWarSurrenderMsg,
+            NT.WAR_CORPORATION_BECAME_ELIGIBLE: NotificationWarCorporationBecameEligible,
+            NT.WAR_CORPORATION_NO_LONGER_ELIGIBLE: NotificationWarCorporationNoLongerEligible,
+            NT.WAR_DECLARE_WAR: NotificationDeclareWar,
+            NT.WAR_MERC_OFFERED_NEGOTIATION_MSG: NotificationMercOfferedNegotiationMsg,
+            NT.WAR_MERC_OFFER_RETRACTED_MSG: NotificationMercOfferRetractedMsg,
             NT.WAR_CORP_WAR_SURRENDER_MSG: NotificationCorpWarSurrenderMsg,
+            NT.WAR_HQ_REMOVED_FROM_SPACE: NotificationWarHQRemovedFromSpace,
+            NT.WAR_OFFERED_TO_ALLY: NotificationOfferedToAlly,
+            NT.WAR_OFFERED_SURRENDER: NotificationOfferedSurrender,
             NT.WAR_WAR_ADOPTED: NotificationWarAdopted,
             NT.WAR_WAR_DECLARED: NotificationWarDeclared,
             NT.WAR_WAR_INHERITED: NotificationWarInherited,
+            NT.WAR_INVALID: NotificationWarInvalid,
             NT.WAR_WAR_RETRACTED_BY_CONCORD: NotificationWarRetractedByConcord,
-            NT.WAR_CORPORATION_BECAME_ELIGIBLE: NotificationWarCorporationBecameEligible,
-            NT.WAR_CORPORATION_NO_LONGER_ELIGIBLE: NotificationWarCorporationNoLongerEligible,
             NT.WAR_WAR_SURRENDER_OFFER_MSG: NotificationWarSurrenderOfferMsg,
-            # Billing
-            NT.BILLING_BILL_OUT_OF_MONEY_MSG: NotificationBillingBillOutOfMoneyMsg,
-            NT.BILLING_I_HUB_BILL_ABOUT_TO_EXPIRE: NotificationBillingIHubBillAboutToExpire,
-            NT.BILLING_I_HUB_DESTROYED_BY_BILL_FAILURE: NotificationBillingIHubDestroyedByBillFailure,
         }
         try:
-            notif_class = notif_type_2_class[notification.notif_type]
+            notif_class = notif_type_2_class[notif.notif_type]
         except KeyError:
-            raise NotImplementedError(repr(notification.notif_type)) from None
+            return NotificationGenericEmbed(notif)
+
+        return notif_class(notif)
+
 
-        return notif_class(notification)
+class NotificationGenericEmbed(NotificationBaseEmbed):
+    """A generic embed for undefined notifs."""
+
+    def __init__(self, notif: Notification) -> None:
+        super().__init__(notif)
+        self._title = re.sub(
+            r"((?<=[a-z])[A-Z]|(?<!\A)[A-Z](?=[a-z]))", r" \1", notif.notif_type
+        )
+        self._color = Webhook.Color.INFO
+        self._thumbnail = dhooks_lite.Thumbnail(
+            notif.sender.icon_url(size=self.ICON_DEFAULT_SIZE)
+        )