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

{aa_structures-2.11.0.dist-info → aa_structures-2.13.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: aa-structures
-Version: 2.11.0
+Version: 2.13.0
 Summary: App for managing Eve Online structures with Alliance Auth.
 Author-email: Erik Kalkoken <kalkoken87@gmail.com>
 Requires-Python: >=3.8

{aa_structures-2.11.0.dist-info → aa_structures-2.13.0.dist-info}/RECORD

@@ -1,4 +1,4 @@
-structures/__init__.py,sha256=73A8QmbMlzuQCd4B1PJ0x0-1eGmBUMeyKhZGFG2Oafk,204
+structures/__init__.py,sha256=sxMrwmEo1GeZidz442fY62l0Ke7WzyBdTC6IneBHO3U,204
 structures/admin.py,sha256=TYWGPou4s-mgspoGaZSiZu2nxBeNzidL_DcJTv7JGJI,40068
 structures/app_settings.py,sha256=7I_6VC7YecCxnSgtyNQa9h1Zdwb11qJhrNaBLgyA5m0,6527
 structures/apps.py,sha256=MNZH9l3qWCwuS7OGiKGkBVrDzKoOFlqwDdEgyEFzxVA,195
@@ -6,13 +6,13 @@ structures/auth_hooks.py,sha256=nRbrixFkAE5gphDokB1E8xhH8FY2VtXVwu0XMmSGBAw,1013
 structures/constants.py,sha256=R7sC5esaWJayJpTDbug7dTKxkkXDKXQ-U6M9Qb0GH5s,967
 structures/forms.py,sha256=kXs-SGIIj-D9xtFCILKe_PMRU4eHl3-HLNWRhaZKmnQ,391
 structures/helpers.py,sha256=_dw7j7yobpcV70VwWxoQiptk69b3ksvaDlRQKHg8Kmg,2344
-structures/managers.py,sha256=5hejDjWN3ZPZqvSGNf9HXtbtpWX9d75Ygc9FXrO0Np4,19638
+structures/managers.py,sha256=ihqcYgsQkDpCejho5l8pthRbJSNhCuWq6UaijPZVG6o,19793
 structures/providers.py,sha256=9QYHd8X5HwBhrbgbX3LUrXXV1KGM3hFhcxK6qIJjJtg,317
 structures/tasks.py,sha256=INZ3soMYHYfxrQsyTO-ozoxbVX6lpMnF3AUo8ybWIoA,9083
 structures/urls.py,sha256=An5v27AD_NXMNL66cMVtQNci1C_Aqry32rrvDkMpgYo,1467
 structures/core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 structures/core/notification_timers.py,sha256=G-QwpqP9HFv_Y7KsID9bLF-GluEJ1-duSJQN-zqJtM0,14977
-structures/core/notification_types.py,sha256=0SExh-VuImRz05jatnCu9lAfIFORUZ-kon9rjF4SXfI,12279
+structures/core/notification_types.py,sha256=v4hDwgJFqEEXJl9dDxCwTVmQo5yA_Ixjxs_BQEcwNDE,13224
 structures/core/serializers.py,sha256=4W6kA7mhVvc-1OSiTl_w0rSio_HUsjIBm9qbkEr9vCY,20965
 structures/core/sovereignty.py,sha256=XKgjAFO4BfLpEEUz_hBr2DVDnvWBq9sL9EEQiT4T0n0,730
 structures/core/starbases.py,sha256=nw7skHYATrnAV-zuPAuxmhM5E4Aqjc_DHSU2TYWgBng,1757
@@ -20,12 +20,13 @@ structures/core/notification_embeds/__init__.py,sha256=30cpjKLZ5_OFtXDACDcjvWQAY
 structures/core/notification_embeds/billing_embeds.py,sha256=d9XkTyYH7U3UDZaqXu0WoN0wvlrT2S68Rfn2jEpVtM4,5164
 structures/core/notification_embeds/corporate_embeds.py,sha256=mfm6dDrgzupyRZ9TZGXML-UGoY_PymNj9LuR8EthdDA,6098
 structures/core/notification_embeds/helpers.py,sha256=0SlrLLFyV0IrdOYfIOLQs0xZgzK8bO7Iroqh7dZnm98,2974
-structures/core/notification_embeds/main.py,sha256=N-l9PJYxgsBvcPOG1WQ2OgxC6hCAQnxgx2V1gWUsSMc,15233
+structures/core/notification_embeds/main.py,sha256=B8OReupxjSbtxqw2MXC9qN41A4Bw8x6_n0LIZlfIJxE,17311
 structures/core/notification_embeds/moonmining_embeds.py,sha256=5OJtfwoLE18mB62iwyHTcMo9eOPBC2vQFSjQlDnTcTY,7130
-structures/core/notification_embeds/orbital_embeds.py,sha256=ovAnTqrc2X0s-HhQS-UleI8J5-gJEO361HYJzcoAdeQ,2864
+structures/core/notification_embeds/orbital_embeds.py,sha256=abU9eN7-4FV2wm6IbZt5O0hQZ09hdrkSJ4JaKLBksTE,2864
+structures/core/notification_embeds/skyhook_embeds.py,sha256=Wl7G3jYin8IfSPFWfoBHndtvxiOUTIboD9xfJ1VJd_4,3019
 structures/core/notification_embeds/sov_embeds.py,sha256=_r4U5zN3MfEag9FCeN0my2d4qfMBUwYUGWW-oGftjn8,8901
-structures/core/notification_embeds/structures_embeds.py,sha256=YOLCnfxIaui7C8HXbWh3grq3eC6TwmdwC4h5ACd05U4,13236
-structures/core/notification_embeds/tower_embeds.py,sha256=n76URsS5xUOCXSYQMNzXeNk_msV08-0eNokeku1TDNs,5848
+structures/core/notification_embeds/structures_embeds.py,sha256=o4tWS2TACW70PTNtJt3FJNt2WGGUKy6n1890PMJfHzc,13683
+structures/core/notification_embeds/tower_embeds.py,sha256=Gowxiy5G655CPSJ76Jovpw2jZQYDCUXMB-jxanyiFHE,5848
 structures/core/notification_embeds/war_embeds.py,sha256=Wj5SuTP1jGRug8_x7qy8oyRCv9CjlZON7-RpJ2k57I4,18333
 structures/locale/django.pot,sha256=t4voMGKIXRUW7sYx7Rmut2tVyBtg2rUcIB5BK_POWTM,68368
 structures/locale/de/LC_MESSAGES/django.mo,sha256=Ok2o1b-v0o7uGfARfS6dmXLGMUHRjEp9nEjf0IJEYvM,3997
@@ -58,10 +59,12 @@ structures/migrations/0003_add_localization_and_unique_key.py,sha256=ZxJMfUtgUH2
 structures/migrations/0004_improve_localization.py,sha256=R29j2Ki9I_yOvEQTxEu_zMnZrR7JkSGpmvMTpp9XjqM,14014
 structures/migrations/0005_add_notification_types.py,sha256=aIgNZN4Gsvh9GiJ0i4XmXopT0qqjZTQrdVjZaVIJKP8,7087
 structures/migrations/0006_add_ownercharacter_disabled.py,sha256=yfcuwWHdSoF7HTEzdtQ1bGhI-K78SxCeE3g3z6UjbqI,726
+structures/migrations/0007_add_notificationtypes_skyhook_metenox.py,sha256=5qxb2AyZyyHFAU39ScFW4eCHHWBL9lMszt0MzXJu4RM,7835
+structures/migrations/0008_add_notificationtypes_skyhook_metenox.py,sha256=5QtcYJR7krqKheJ-vBb7QT771mK39aET7F07hhMy9q4,7844
 structures/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 structures/models/__init__.py,sha256=Da0-Z4BtsZ_mlnI6XtyvoE0UtTuOA0psGCuVhVPVKrM,916
 structures/models/eveuniverse.py,sha256=vTIfzZL9guEDuZHQvRdG6pI4zSEdMqfVE-2SkHdqbRo,2213
-structures/models/notifications.py,sha256=tznJo2prNjhk9C7S4cDrQxftIvuLcidB6vSkvFfb4mw,35146
+structures/models/notifications.py,sha256=HwQc-ChdP0ULuJgxUym9_CBsCWCmcHT7whlk9tB2vzw,35364
 structures/models/owners.py,sha256=8VDRL1fPep0TN6Nv5MJg1NC6_2V6bMJd6f-eda4-PJg,55697
 structures/models/structures_1.py,sha256=e1sI-2zMSKcPi2PyYA--fcc8rn-yQwODzlUHKjeWgLI,29778
 structures/models/structures_2.py,sha256=g5Pct5jNmZC-n7fnpLs5UyiP9JLrGdI1vjYucHTV_wQ,10371
@@ -164,14 +167,14 @@ structures/tests/test_managers_2.py,sha256=FISr_NT1Qnu9j1JYYTceNsUk8k9rfCTKwjKi5
 structures/tests/test_tasks.py,sha256=reL1rPv_kvTgsC4lq5SXulkbEHaJrw5B1-hFI4tiDWY,17269
 structures/tests/core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 structures/tests/core/test_notification_structuretimers.py,sha256=OvldjgIHmRVsqoC9C6VJRqwS9WeRFMgpyutRc69PjAU,10857
-structures/tests/core/test_notification_types.py,sha256=WNJGXoxO3LbgxPgCH416IJElREWFBtwx5pw8IulsmYo,9881
+structures/tests/core/test_notification_types.py,sha256=2J5A8Dr9UHhzLEj6QTMty5iZXlNkQxtFmLvU8Wpdno4,10447
 structures/tests/core/test_notifications_timerboard.py,sha256=OMkAWH_jWXzCwotp6W2qWG6GpSGisyunZYOoy1UZomU,5583
 structures/tests/core/test_serializers.py,sha256=ACs6x1IhesoJBFG76RmlglDWqaMlOuqq5kPyzvjGeKI,7056
 structures/tests/core/test_sovereignty.py,sha256=SGgNw6NxmaU3jV-EDhKJRLfHnRnqDCwm4oCoO-8gt9w,821
 structures/tests/core/test_starbases.py,sha256=Q3EZVIKZGzxUUvvn0TvZYOL9YQ-baiTRTT83xWqTAhQ,3186
 structures/tests/core/notification_embeds/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 structures/tests/core/notification_embeds/test_helpers.py,sha256=HG20TC8Bz7NqpaQWo6uvrsxfNIwTL2Zi_NRkh3UyN2Y,1776
-structures/tests/core/notification_embeds/test_main.py,sha256=vTDByjxxVCA6KMcr5XH4f4QsMgcDI_YDd-fjZfHztng,13808
+structures/tests/core/notification_embeds/test_main.py,sha256=rSUm8dGsddjnX_OUwtCh-wd5UhJ6ttTsfxc1soAoDv8,14667
 structures/tests/integration/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 structures/tests/integration/test_tasks.py,sha256=s6hL5UBotDmhLq7NUiOad72W-S_18u_yAHiLWVryVi8,23617
 structures/tests/integration/test_views.py,sha256=SkbIposTUjo0nujHL4WEaZO7nY1Bfuvm805H39XUv-g,4361
@@ -180,7 +183,7 @@ structures/tests/models/test_eveuniverse.py,sha256=bQ1upOLfoivfaa9KCrzjWvSH_EvL2
 structures/tests/models/test_notifications_1.py,sha256=xVX4an54sZM8WLUdsAGUG2Nb4Rl7W5FBzhI0hBhJo5g,30300
 structures/tests/models/test_notifications_2.py,sha256=wBoB6lHMK4yrd63DSkZ570yXW6coevDtI0pl1ttgB1o,31989
 structures/tests/models/test_notifications_3.py,sha256=u11s0k9EmtFgL3kyb4zDyLVliQLOps701ZgEA2T2i0Y,7257
-structures/tests/models/test_notifications_discord.py,sha256=9_42lcrb2lUUMRqgdRJAub9cJ4QZI71OyoORwK0LEvg,5551
+structures/tests/models/test_notifications_discord.py,sha256=6maDXjl2C5yH2XRgsvMtb3P-tfOdZLQDaksffiqS8OM,6312
 structures/tests/models/test_owners_1.py,sha256=o8AJasQ0-Pdb0FRFZcmNcMGjaIk8fH3OZIZw4paJiDw,24433
 structures/tests/models/test_owners_2.py,sha256=gkTXpSibPWs1XfZtPvyeEvVebyYZcKERD9GQSYSClYk,21911
 structures/tests/models/test_owners_3.py,sha256=cpDkfFkVvC1v4uuXha1vGUmWZ163huYTUDuZyed9Rdc,16947
@@ -189,12 +192,12 @@ structures/tests/models/test_owners_5.py,sha256=lTSfVY3rPOLyF-IhlKPT4mbRqvuN_NA-
 structures/tests/models/test_owners_6.py,sha256=R9UE2QGwiGTWLHzzOZwGQPWJrAPwIIl7UwrHH-ki4Ak,940
 structures/tests/models/test_structures.py,sha256=6HktwBOsmRtRq5MnRlZnvNixUsWUpRni_XnPjNpMN0Y,41469
 structures/tests/testdata/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-structures/tests/testdata/create_eveuniverse.py,sha256=E-Fh-dmuHmLZcqgK2U6mwt9W6dI7H99bG7DaETfcVQY,2129
-structures/tests/testdata/entities.json,sha256=kmcmmbHG_igHwvkpAJGHQEztEXjlo8McDuojpEBmgqU,32147
+structures/tests/testdata/create_eveuniverse.py,sha256=6CYgXtJaEwxWvQFyH-P0SKsRqeMuSyJ92ZJiXe_-nuY,2256
+structures/tests/testdata/entities.json,sha256=vmb0uhwTpD0gycGAakgYidr3qSbnHiMubAd4u7T2l70,36053
 structures/tests/testdata/esi_data.json,sha256=DX47oSlRZIPxlPueMfiNElbZbAip2cp3LAUmv8GAPJ0,13864
-structures/tests/testdata/eveuniverse.json,sha256=Z8_EXOF8XNvls9RfBYIHhoNX0rj0NqcjInTU6tZuwhI,993284
+structures/tests/testdata/eveuniverse.json,sha256=3fhD72lUNLj96wO4ASbpNcdH_8VbqcXUvKUXR6j0768,1028885
 structures/tests/testdata/factories.py,sha256=KNXxOad44DKD0luQ7QS0DepnCr1S_Z6qwfiXnNDy10I,24774
-structures/tests/testdata/generate_notifications.py,sha256=nE077mVHVmOVudKIGMtHUfBIcV5Ch5Z0IngD1gp5yQk,5746
+structures/tests/testdata/generate_notifications.py,sha256=lhcnbsnE4O6g0OFUAYO2sCfu8vmwBcFtxn-TuTLtFnM,5417
 structures/tests/testdata/generate_notifications_2.py,sha256=mdoGXd9vgy_opmrwTr9MfGe-QieHV4BHtRA7VFzxFKM,1413
 structures/tests/testdata/generate_structures.py,sha256=4p2ypDj-goniBnraTP2KfWzEX3YLj0qhKPNTfCXy05g,9134
 structures/tests/testdata/helpers.py,sha256=nUecEhe9NqP70zMo8gbAZaWIm2NvzvnF4w9doMtFPY8,6183
@@ -220,7 +223,7 @@ structures/webhooks/models.py,sha256=kUkt9rnRQIJIrU9Bjcs34rvkb-TMbUubHdn-kny08kI
 structures/webhooks/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 structures/webhooks/tests/test_core.py,sha256=4NcEAQgK2KhQkFOxYh2ad0S-qUWh1DNGDmLo5Mo5opI,6762
 structures/webhooks/tests/test_utils.py,sha256=ekADFv0JOEtXeqdiejbeqrABO__Q1flJHzVieQ7L9e0,459
-aa_structures-2.11.0.dist-info/LICENSE,sha256=XZiwB_S_40_HhnvLg5xvtBb3g1oGjPrk0rpFwk8iInE,1070
-aa_structures-2.11.0.dist-info/WHEEL,sha256=EZbGkh7Ie4PoZfRQ8I0ZuP9VklN_TvcZ6DSE5Uar4z4,81
-aa_structures-2.11.0.dist-info/METADATA,sha256=yuYKAElX7wpn9YDI8qwLn20gb_Vksa5A7mnjsnN5dBg,5972
-aa_structures-2.11.0.dist-info/RECORD,,
+aa_structures-2.13.0.dist-info/LICENSE,sha256=XZiwB_S_40_HhnvLg5xvtBb3g1oGjPrk0rpFwk8iInE,1070
+aa_structures-2.13.0.dist-info/WHEEL,sha256=EZbGkh7Ie4PoZfRQ8I0ZuP9VklN_TvcZ6DSE5Uar4z4,81
+aa_structures-2.13.0.dist-info/METADATA,sha256=nwtm73-vPjR46RQ_UZOVDX0UmhhEou7uOa_2MuQ0A58,5972
+aa_structures-2.13.0.dist-info/RECORD,,

structures/__init__.py

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

structures/core/notification_embeds/main.py

@@ -10,6 +10,8 @@ import dhooks_lite
 from django.conf import settings
 from django.utils.translation import gettext as _
 
+from allianceauth.services.hooks import get_extension_logger
+from app_utils.logging import LoggerAddTag
 from app_utils.urls import reverse_absolute, static_file_absolute_url
 
 from structures import __title__
@@ -17,7 +19,9 @@ from structures.core.notification_types import NotificationType
 from structures.helpers import get_or_create_eve_entity, is_absolute_url
 from structures.models.notifications import Notification, NotificationBase, Webhook
 
-from .helpers import target_datetime_formatted
+from .helpers import gen_alliance_link, gen_corporation_link, target_datetime_formatted
+
+logger = LoggerAddTag(get_extension_logger(__name__), __title__)
 
 
 class NotificationBaseEmbed:
@@ -73,9 +77,9 @@ class NotificationBaseEmbed:
         damage_text = " | ".join(damage_parts)
         return damage_text
 
-    def get_aggressor_link(self) -> str:
+    def gen_aggressor_link(self) -> str:
         """Returns the aggressor link from a parsed_text for POS and POCOs only."""
-        if self._data.get("aggressorAllianceID"):
+        if key := self._data.get("aggressorAllianceID"):
             key = "aggressorAllianceID"
         elif self._data.get("aggressorCorpID"):
             key = "aggressorCorpID"
@@ -86,6 +90,16 @@ class NotificationBaseEmbed:
         entity = get_or_create_eve_entity(id=self._data[key])
         return Webhook.create_link(entity.name, entity.profile_url)
 
+    def gen_attacker_link(self) -> str:
+        """Returns the attacker link from a parsed_text for Upwell structures only."""
+        if name := self._data.get("allianceName"):
+            return gen_alliance_link(name)
+
+        if name := self._data.get("corpName"):
+            return gen_corporation_link(name)
+
+        return _("(unknown)")
+
     def fuel_expires_target_date(self) -> str:
         """Return calculated target date when fuel expires. Returns '?' when no data."""
         if self._structure and self._structure.fuel_expires_at:
@@ -141,6 +155,20 @@ class NotificationBaseEmbed:
             footer_text += f" #{my_text}"
         footer_icon_url = footer_icon_url if is_absolute_url(footer_icon_url) else None
         footer = dhooks_lite.Footer(text=footer_text, icon_url=footer_icon_url)
+        max_description = dhooks_lite.Embed.MAX_DESCRIPTION
+        if self._description and len(self._description) > max_description:
+            logger.warning(
+                "%s: Description of notification is too long: %s",
+                self,
+                self._description,
+            )
+            self._description = self._description[:max_description]
+        max_title = dhooks_lite.Embed.MAX_TITLE
+        if self._title and len(self._title) > max_title:
+            logger.warning(
+                "%s: Title of notification is too long: %s", self, self._title
+            )
+            self._title = self._title[:max_title]
         return dhooks_lite.Embed(
             author=author,
             color=self._color,
@@ -182,6 +210,13 @@ class NotificationBaseEmbed:
             NotificationOrbitalAttacked,
             NotificationOrbitalReinforced,
         )
+        from .skyhook_embeds import (
+            NotificationSkyhookDeployed,
+            NotificationSkyhookDestroyed,
+            NotificationSkyhookLostShield,
+            NotificationSkyhookOnline,
+            NotificationSkyhookUnderAttack,
+        )
         from .sov_embeds import (
             NotificationSovAllAnchoringMsg,
             NotificationSovAllClaimAcquiredMsg,
@@ -198,6 +233,8 @@ class NotificationBaseEmbed:
             NotificationStructureJumpFuelAlert,
             NotificationStructureLostArmor,
             NotificationStructureLostShield,
+            NotificationStructureLowReagentsAlert,
+            NotificationStructureNoReagentsAlert,
             NotificationStructureOnline,
             NotificationStructureOwnershipTransferred,
             NotificationStructureRefueledExtra,
@@ -242,76 +279,84 @@ class NotificationBaseEmbed:
         NT = NotificationType
         notif_type_2_class = {
             # Billing
-            NT.BILLING_CORP_ALL_BILL_MSG: NotificationCorpAllBillMsg,
             NT.BILLING_BILL_OUT_OF_MONEY_MSG: NotificationBillingBillOutOfMoneyMsg,
+            NT.BILLING_CORP_ALL_BILL_MSG: NotificationCorpAllBillMsg,
             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.CHAR_APP_ACCEPT_MSG: NotificationCharAppAcceptMsg,
+            NT.CHAR_APP_WITHDRAW_MSG: NotificationCharAppWithdrawMsg,
+            NT.CHAR_LEFT_CORP_MSG: NotificationCharLeftCorpMsg,
             NT.CORP_APP_INVITED_MSG: NotificationCorpAppInvitedMsg,
+            NT.CORP_APP_NEW_MSG: NotificationCorpAppNewMsg,
             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,
             # moonmining
-            NT.MOONMINING_EXTRACTION_STARTED: NotificationMoonminningExtractionStarted,
-            NT.MOONMINING_EXTRACTION_FINISHED: NotificationMoonminningExtractionFinished,
             NT.MOONMINING_AUTOMATIC_FRACTURE: NotificationMoonminningAutomaticFracture,
             NT.MOONMINING_EXTRACTION_CANCELLED: NotificationMoonminningExtractionCanceled,
+            NT.MOONMINING_EXTRACTION_FINISHED: NotificationMoonminningExtractionFinished,
+            NT.MOONMINING_EXTRACTION_STARTED: NotificationMoonminningExtractionStarted,
             NT.MOONMINING_LASER_FIRED: NotificationMoonminningLaserFired,
             # 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_ANCHORING_MSG: NotificationSovAllAnchoringMsg,
             NT.SOV_ALL_CLAIM_ACQUIRED_MSG: NotificationSovAllClaimAcquiredMsg,
             NT.SOV_ALL_CLAIM_LOST_MSG: NotificationSovAllClaimLostMsg,
-            NT.SOV_STRUCTURE_REINFORCED: NotificationSovStructureReinforced,
+            NT.SOV_COMMAND_NODE_EVENT_STARTED: NotificationSovCommandNodeEventStarted,
+            NT.SOV_ENTOSIS_CAPTURE_STARTED: NotificationSovEntosisCaptureStarted,
             NT.SOV_STRUCTURE_DESTROYED: NotificationSovStructureDestroyed,
-            NT.SOV_ALL_ANCHORING_MSG: NotificationSovAllAnchoringMsg,
+            NT.SOV_STRUCTURE_REINFORCED: NotificationSovStructureReinforced,
             # Towers
             NT.TOWER_ALERT_MSG: NotificationTowerAlertMsg,
-            NT.TOWER_RESOURCE_ALERT_MSG: NotificationTowerResourceAlertMsg,
             NT.TOWER_REFUELED_EXTRA: NotificationTowerRefueledExtra,
             NT.TOWER_REINFORCED_EXTRA: NotificationTowerReinforcedExtra,
+            NT.TOWER_RESOURCE_ALERT_MSG: NotificationTowerResourceAlertMsg,
+            # Skyhooks
+            NT.SKYHOOK_DEPLOYED: NotificationSkyhookDeployed,
+            NT.SKYHOOK_DESTROYED: NotificationSkyhookDestroyed,
+            NT.SKYHOOK_LOST_SHIELDS: NotificationSkyhookLostShield,
+            NT.SKYHOOK_ONLINE: NotificationSkyhookOnline,
+            NT.SKYHOOK_UNDER_ATTACK: NotificationSkyhookUnderAttack,
             # Upwell structures
-            NT.STRUCTURE_ONLINE: NotificationStructureOnline,
+            NT.OWNERSHIP_TRANSFERRED: NotificationStructureOwnershipTransferred,
+            NT.STRUCTURE_ANCHORING: NotificationStructureAnchoring,
+            NT.STRUCTURE_DESTROYED: NotificationStructureDestroyed,
             NT.STRUCTURE_FUEL_ALERT: NotificationStructureFuelAlert,
             NT.STRUCTURE_JUMP_FUEL_ALERT: NotificationStructureJumpFuelAlert,
+            NT.STRUCTURE_LOST_ARMOR: NotificationStructureLostArmor,
+            NT.STRUCTURE_LOST_SHIELD: NotificationStructureLostShield,
+            NT.STRUCTURE_LOW_REAGENTS_ALERT: NotificationStructureLowReagentsAlert,
+            NT.STRUCTURE_NO_REAGENTS_ALERT: NotificationStructureNoReagentsAlert,
+            NT.STRUCTURE_ONLINE: NotificationStructureOnline,
             NT.STRUCTURE_REFUELED_EXTRA: NotificationStructureRefueledExtra,
+            NT.STRUCTURE_REINFORCEMENT_CHANGED: NotificationStructureReinforceChange,
             NT.STRUCTURE_SERVICES_OFFLINE: NotificationStructureServicesOffline,
-            NT.STRUCTURE_WENT_LOW_POWER: NotificationStructureWentLowPower,
-            NT.STRUCTURE_WENT_HIGH_POWER: NotificationStructureWentHighPower,
             NT.STRUCTURE_UNANCHORING: NotificationStructureUnanchoring,
             NT.STRUCTURE_UNDER_ATTACK: NotificationStructureUnderAttack,
-            NT.STRUCTURE_LOST_SHIELD: NotificationStructureLostShield,
-            NT.STRUCTURE_LOST_ARMOR: NotificationStructureLostArmor,
-            NT.STRUCTURE_DESTROYED: NotificationStructureDestroyed,
-            NT.OWNERSHIP_TRANSFERRED: NotificationStructureOwnershipTransferred,
-            NT.STRUCTURE_ANCHORING: NotificationStructureAnchoring,
-            NT.STRUCTURE_REINFORCEMENT_CHANGED: NotificationStructureReinforceChange,
+            NT.STRUCTURE_WENT_HIGH_POWER: NotificationStructureWentHighPower,
+            NT.STRUCTURE_WENT_LOW_POWER: NotificationStructureWentLowPower,
             # War
             NT.WAR_ACCEPTED_ALLY: NotificationAcceptedAlly,
+            NT.WAR_ALL_WAR_CORP_JOINED_ALLIANCE_MSG: NotificationAllWarCorpJoinedAllianceMsg,
+            NT.WAR_ALL_WAR_SURRENDER_MSG: NotificationAllWarSurrenderMsg,
             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_CORP_WAR_SURRENDER_MSG: NotificationCorpWarSurrenderMsg,
             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_INVALID: NotificationWarInvalid,
+            NT.WAR_MERC_OFFER_RETRACTED_MSG: NotificationMercOfferRetractedMsg,
+            NT.WAR_MERC_OFFERED_NEGOTIATION_MSG: NotificationMercOfferedNegotiationMsg,
             NT.WAR_OFFERED_SURRENDER: NotificationOfferedSurrender,
+            NT.WAR_OFFERED_TO_ALLY: NotificationOfferedToAlly,
             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_WAR_SURRENDER_OFFER_MSG: NotificationWarSurrenderOfferMsg,
         }

structures/core/notification_embeds/orbital_embeds.py

@@ -31,7 +31,7 @@ class NotificationOrbitalEmbed(NotificationBaseEmbed):
             self._notification.eve_solar_system()
         )
         self._owner_link = gen_corporation_link(str(notification.owner))
-        self._aggressor_link = self.get_aggressor_link()
+        self._aggressor_link = self.gen_aggressor_link()
         self._thumbnail = dhooks_lite.Thumbnail(
             self._structure_type.icon_url(size=self.ICON_DEFAULT_SIZE)
         )

structures/core/notification_embeds/skyhook_embeds.py

@@ -0,0 +1,89 @@
+"""Skyhook embeds."""
+
+# pylint: disable=missing-class-docstring
+
+import dhooks_lite
+
+from django.utils.translation import gettext as _
+
+from app_utils.datetime import ldap_time_2_datetime
+
+from structures.models import Notification, Webhook
+
+from .helpers import (
+    gen_corporation_link,
+    gen_solar_system_text,
+    target_datetime_formatted,
+)
+from .main import NotificationBaseEmbed
+
+
+class NotificationSkyhookEmbed(NotificationBaseEmbed):
+    """Base class for most structure related notification embeds."""
+
+    def __init__(self, n: Notification) -> None:
+        super().__init__(n)
+        type_ = n.eve_structure_type("typeID")
+        solar_system = n.eve_solar_system("solarsystemID")
+        self._description = _(
+            "The %(structure_type)s at **%(planet)s** "
+            "in %(solar_system)s belonging to %(owner_link)s "
+        ) % {
+            "structure_type": type_,
+            "planet": n.eve_planet(),
+            "solar_system": gen_solar_system_text(solar_system),
+            "owner_link": gen_corporation_link(str(n.owner)),
+        }
+        self._thumbnail = dhooks_lite.Thumbnail(
+            type_.icon_url(size=self.ICON_DEFAULT_SIZE)
+        )
+
+
+class NotificationSkyhookDeployed(NotificationSkyhookEmbed):
+    def __init__(self, n: Notification) -> None:
+        super().__init__(n)
+        self._title = _("Skyhook has started onlining")
+        self._description += _("has started onlining.")
+        self._color = Webhook.Color.INFO
+
+
+class NotificationSkyhookDestroyed(NotificationSkyhookEmbed):
+    def __init__(self, n: Notification) -> None:
+        super().__init__(n)
+        self._title = _("Skyhook destroyed")
+        self._description += _("has been destroyed.")
+        self._color = Webhook.Color.DANGER
+
+
+class NotificationSkyhookLostShield(NotificationSkyhookEmbed):
+    def __init__(self, n: Notification) -> None:
+        super().__init__(n)
+        self._title = _("Skyhook lost shield")
+        timer_ends_at = ldap_time_2_datetime(self._data["timestamp"])
+        self._description += _(
+            "has lost its shields and is now in reinforcement state until : %s"
+        ) % target_datetime_formatted(timer_ends_at)
+        self._color = Webhook.Color.DANGER
+
+
+class NotificationSkyhookOnline(NotificationSkyhookEmbed):
+    def __init__(self, n: Notification) -> None:
+        super().__init__(n)
+        self._title = _("Skyhook online")
+        self._description += _("is now online.")
+        self._color = Webhook.Color.SUCCESS
+
+
+class NotificationSkyhookUnderAttack(NotificationSkyhookEmbed):
+    def __init__(self, n: Notification) -> None:
+        super().__init__(n)
+        self._title = _("Skyhook under attack")
+        self._description += _(
+            "is under attack by %(attacker)s.\n"
+            "%(damage_text)s"
+            % {
+                "attacker": self.gen_attacker_link(),
+                "damage_text": self.compile_damage_text("Percentage"),
+            }
+        )
+        self._color = Webhook.Color.DANGER

structures/core/notification_embeds/structures_embeds.py

@@ -14,7 +14,6 @@ from structures.helpers import get_or_create_eve_entity, get_or_create_eve_type
 from structures.models import Notification, Structure, Webhook
 
 from .helpers import (
-    gen_alliance_link,
     gen_corporation_link,
     gen_solar_system_text,
     target_datetime_formatted,
@@ -165,21 +164,11 @@ class NotificationStructureUnderAttack(NotificationStructureEmbed):
         super().__init__(notification)
         self._title = _("Structure under attack")
         self._description += _("is under attack by %(attacker)s.\n%(damage_text)s") % {
-            "attacker": self._get_attacker_link(),
+            "attacker": self.gen_attacker_link(),
             "damage_text": self.compile_damage_text("Percentage"),
         }
         self._color = Webhook.Color.DANGER
 
-    def _get_attacker_link(self) -> str:
-        """Returns the attacker link from a parsed_text for Upwell structures only."""
-        if self._data.get("allianceName"):
-            return gen_alliance_link(self._data["allianceName"])
-
-        if self._data.get("corpName"):
-            return gen_corporation_link(self._data["corpName"])
-
-        return _("(unknown)")
-
 
 class NotificationStructureLostShield(NotificationStructureEmbed):
     def __init__(self, notification: Notification) -> None:
@@ -324,3 +313,25 @@ class NotificationStructureReinforceChange(NotificationBaseEmbed):
             _("\n\nChange becomes effective at %s.")
         ) % target_datetime_formatted(change_effective)
         self._color = Webhook.Color.INFO
+
+
+class NotificationStructureLowReagentsAlert(NotificationStructureEmbed):
+    def __init__(self, notification: Notification) -> None:
+        super().__init__(notification)
+        self._title = _("Structure low on reagents")
+        self._description += _(
+            "has insufficient reagents present to support "
+            "one full day of moon drill activity."
+        )
+        self._color = Webhook.Color.WARNING
+
+
+class NotificationStructureNoReagentsAlert(NotificationStructureEmbed):
+    def __init__(self, notification: Notification) -> None:
+        super().__init__(notification)
+        self._title = _("Structure out of reagents")
+        self._description += _(
+            "has run out of reagents, "
+            "which is preventing further moon material production."
+        )
+        self._color = Webhook.Color.DANGER

structures/core/notification_embeds/tower_embeds.py

@@ -56,7 +56,7 @@ class NotificationTowerEmbed(NotificationBaseEmbed):
 class NotificationTowerAlertMsg(NotificationTowerEmbed):
     def __init__(self, notification: Notification) -> None:
         super().__init__(notification)
-        aggressor_link = self.get_aggressor_link()
+        aggressor_link = self.gen_aggressor_link()
         damage_text = self.compile_damage_text("Value", 100)
         self._title = _("Starbase under attack")
         self._description += _("is under attack by %(aggressor)s.\n%(damage_text)s") % {