aa-structures 2.16.0__py3-none-any.whl → 3.0.0__py3-none-any.whl

{aa_structures-2.16.0.dist-info → aa_structures-3.0.0.dist-info}/METADATA

@@ -1,13 +1,12 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: aa-structures
-Version: 2.16.0
+Version: 3.0.0
 Summary: App for managing Eve Online structures with Alliance Auth.
 Author-email: Erik Kalkoken <kalkoken87@gmail.com>
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 Classifier: Environment :: Web Environment
 Classifier: Framework :: Django
-Classifier: Framework :: Django :: 4.0
 Classifier: Framework :: Django :: 4.2
 Classifier: Intended Audience :: End Users/Desktop
 Classifier: License :: OSI Approved :: MIT License
@@ -17,10 +16,12 @@ Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
 Classifier: Topic :: Internet :: WWW/HTTP
 Classifier: Topic :: Internet :: WWW/HTTP :: Dynamic Content
+License-File: LICENSE
 Requires-Dist: allianceauth-app-utils>=1.22
-Requires-Dist: allianceauth>=3.0
+Requires-Dist: allianceauth>=4
 Requires-Dist: dhooks-lite>=1.0
 Requires-Dist: django-eveuniverse>=1.5.2
 Requires-Dist: django-multiselectfield

{aa_structures-2.16.0.dist-info → aa_structures-3.0.0.dist-info}/RECORD

@@ -1,4 +1,4 @@
-structures/__init__.py,sha256=Z3bIPmcm4sX1w_r8VxYDVpCP0rbtGGuzUzh7wP8la5c,204
+structures/__init__.py,sha256=p-Kws80XoPuHIk0qVeDd8FLU4GCvqHAoNk9pn-WgZC4,203
 structures/admin.py,sha256=K7wh8mHFfGHONn7oLdqXsBAxq0rmYrwbZ7S3uIOuMtg,41303
 structures/app_settings.py,sha256=aWA2bTcv_vVwIyisx-G7GBSpfM6JDyt2MWcXKtHnjK0,6651
 structures/apps.py,sha256=MNZH9l3qWCwuS7OGiKGkBVrDzKoOFlqwDdEgyEFzxVA,195
@@ -12,15 +12,15 @@ 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=KLjkVrlCCKTWtHJNUfI3U6ppAIZN8vPnIx1zCafRkKQ,16748
-structures/core/notification_types.py,sha256=Ebl4i-mvyGe4luxeNiPmxf7T9bmghe8NU5Giu9pqPCo,13262
-structures/core/serializers.py,sha256=4W6kA7mhVvc-1OSiTl_w0rSio_HUsjIBm9qbkEr9vCY,20965
+structures/core/notification_types.py,sha256=AMelkzBgOVcXKQauHEjBkcu5iFcLx6R_e9kXLBasbrs,13676
+structures/core/serializers.py,sha256=E20LHTt24RfjzuDDhXo-K4JjMiZaa5eHdm61YTzpwZo,20989
 structures/core/sovereignty.py,sha256=XKgjAFO4BfLpEEUz_hBr2DVDnvWBq9sL9EEQiT4T0n0,730
 structures/core/starbases.py,sha256=nw7skHYATrnAV-zuPAuxmhM5E4Aqjc_DHSU2TYWgBng,1757
 structures/core/notification_embeds/__init__.py,sha256=30cpjKLZ5_OFtXDACDcjvWQAYszM2BrYxUYb5PRQoTA,131
 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/corporate_embeds.py,sha256=v1ala3_2czhXRoUEk-XvripsbYyBY0bjci7UjwNTSZQ,8367
 structures/core/notification_embeds/helpers.py,sha256=0SlrLLFyV0IrdOYfIOLQs0xZgzK8bO7Iroqh7dZnm98,2974
-structures/core/notification_embeds/main.py,sha256=B8OReupxjSbtxqw2MXC9qN41A4Bw8x6_n0LIZlfIJxE,17311
+structures/core/notification_embeds/main.py,sha256=QRMbJoOV-Y6mrplJlbJsILN8PhBXHCePEdepyWM6MSw,17658
 structures/core/notification_embeds/moonmining_embeds.py,sha256=5OJtfwoLE18mB62iwyHTcMo9eOPBC2vQFSjQlDnTcTY,7130
 structures/core/notification_embeds/orbital_embeds.py,sha256=abU9eN7-4FV2wm6IbZt5O0hQZ09hdrkSJ4JaKLBksTE,2864
 structures/core/notification_embeds/skyhook_embeds.py,sha256=Wl7G3jYin8IfSPFWfoBHndtvxiOUTIboD9xfJ1VJd_4,3019
@@ -61,11 +61,12 @@ structures/migrations/0005_add_notification_types.py,sha256=aIgNZN4Gsvh9GiJ0i4Xm
 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/0009_add_project_goal_notifications.py,sha256=ig0ZLIvoml2WTBRp2-5nEI57P5nKSJGf1y7hAlGG2I0,8074
 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=HwQc-ChdP0ULuJgxUym9_CBsCWCmcHT7whlk9tB2vzw,35364
-structures/models/owners.py,sha256=Oxs9LDtoKRvpqGtvZehNDyBPKgW_UIrUntZPe6LVPzY,59611
+structures/models/owners.py,sha256=yXeP21KkdpNdO6yqKLoEMfYVA72uVaCvBmq0e19Qm78,59611
 structures/models/structures_1.py,sha256=zk380uG2DuQ7exO7THbq5TE5Ro2jr6EyVCIxRJXHIJI,29958
 structures/models/structures_2.py,sha256=g5Pct5jNmZC-n7fnpLs5UyiP9JLrGdI1vjYucHTV_wQ,10371
 structures/static/structures/css/global.css,sha256=R4LEH9PwLoN77qkqBK7u2y_vzRC3fq8X_zKnAW7yhiA,1165
@@ -125,26 +126,26 @@ structures/static/structures/img/panel/tyrannis_darkred.png,sha256=CwCeqXvr6Nm-K
 structures/static/structures/img/panel/tyrannis_default.png,sha256=18TntkT7i0YZHZ-v9D_-glKHDKYEA0rSTjXMqwXFy0Q,38343
 structures/static/structures/img/panel/tyrannis_revelations.png,sha256=mnaL5lt-1D-Do7sb77QJDc3EPtoynz207Z932S09is0,42868
 structures/static/structures/js/global.js,sha256=DK1IZs-SePAO00WVTo03iOcw1CfT43ET2X7a4givvgk,1842
-structures/static/structures/js/public.js,sha256=b7CnBNpjffMmvQ022_vb6RfVmnyoH2bAmA0JIUFiw2s,3746
+structures/static/structures/js/public.js,sha256=Bxi2BOE2H9fxzlC9U4qiboKqUDXy8MMGC5elvWKiFeE,3970
 structures/static/structures/js/statistics.js,sha256=qSfjy3opXq9XQ1Fp1yXA0dbk6JylgavpJpVIPfRZ9x8,2857
-structures/static/structures/js/structures.js,sha256=YccSuNWXvCs5WNitWy7NdC-nIHlCu2-LCjPAWbApJSk,15089
+structures/static/structures/js/structures.js,sha256=RPgdyQHPssY1VcaPMdkTFiKeRuZGz1r-T3CWm3Fn83w,15240
 structures/static/structures/vendor/datatables/plugins/dataTables.rowGroup.min.js,sha256=TqdVnz3vX_H-UpCbPy3eqKY7poGMHGkKud7oBnHu9eY,5573
 structures/static/structures/vendor/datatables/plugins/datetime.js,sha256=yJzBU69oWEoQI16MOC18R2vrPpzqPGrGmtFhR6UT30A,3908
 structures/static/structures/vendor/datatables/plugins/filterDropDown.min.js,sha256=_ZGm5gV7NHq3wulljXeipLvpJi0SNEI4mydoEUCXIeQ,2529
 structures/static/structures/vendor/datatables/plugins/rowGroup.bootstrap.min.css,sha256=mfb-mieZDwLASMlQTUNXrZQr8OXvQyEDfV3Xz3E7DSU,384
 structures/static/structures/vendor/datatables/plugins/rowGroup.dataTables.min.css,sha256=mfb-mieZDwLASMlQTUNXrZQr8OXvQyEDfV3Xz3E7DSU,384
-structures/templates/structures/base.html,sha256=ND0JjP2Pa537FXOrIj3cziHfDbTh0ZNzrLFJ_zpVhw8,337
-structures/templates/structures/public.html,sha256=R3kjhr1MLC5r9r8L3t-1-Nh7-ngKbRiiZNIwgpsGg70,3239
-structures/templates/structures/statistics.html,sha256=rVI_wPW4VXIO3IoWna8_GoqWCc5ra-6Jc9iekfusS78,1736
-structures/templates/structures/structures.html,sha256=q0c7Wlaxvt2dg1B236JIEmmSBgQyX5F_QlBLokt-W0E,8329
+structures/templates/structures/base.html,sha256=uefphR7JSABi6BtoOzx4t4cMBCMqelVPNpMYESe27xI,1711
+structures/templates/structures/public.html,sha256=P93tur3mxlx-MwTfGPu6KBlxBfMVV2WnnJJdGOF5tQI,3219
+structures/templates/structures/statistics.html,sha256=2AVIeznBQCaJc-z7kxNSx3pxSdLW5Y81AiISbvUTAPE,1644
+structures/templates/structures/structures.html,sha256=BfzIj_i6jYLOQNXx_aopIv7PJAD-MEyXVuLM4b02vAQ,8138
 structures/templates/structures/modals/fitting_assets.html,sha256=0GSpDAk-wgvaZdxM9JzteUYhoPsek5y-L4TdG2q5Sbg,264
 structures/templates/structures/modals/fitting_gfx.html,sha256=hmdU1Zv09woGKigUugbBRxScKQun8l81yEPUMGrok2g,9530
-structures/templates/structures/modals/poco_details.html,sha256=uwaEM0jDvkdu_Lff2mUKwm7pn1KXePcgN9yBwFHsQO4,2705
-structures/templates/structures/modals/starbase_detail.html,sha256=qfFayAyzL1Sa20NVhK-O4gnfASQQ-zvR-0Q8FyAwBQc,4133
-structures/templates/structures/modals/structure_details.html,sha256=lA6PoGPECv7c3MPBiF059gjYTwvjTOGspgfldC1gb2s,4102
+structures/templates/structures/modals/poco_details.html,sha256=oiaSEMF9HiojXHbN2OjHmK5nPuWRR4mZBgB9ySYNrAY,2835
+structures/templates/structures/modals/starbase_detail.html,sha256=-mOo5zMGClZ2oRjVQS440n55ipHM8rU2O8wVPuI3OmI,4383
+structures/templates/structures/modals/structure_details.html,sha256=zY3X_LFmrj2c3bUevSDd10qzmR1rsHqtgkDbSI_e8Xc,4339
 structures/templates/structures/modals/tab_general_detail.html,sha256=oX3Aa3RrjfWXUDiQgxB7HN-6ILJDL0fZuf85_0Kua5w,2324
 structures/templates/structures/modals/tab_services_detail.html,sha256=fd-KhwR0ARF3hFCPXCjirpBHgdZv-RgoXzHMYUe0vSQ,596
-structures/templates/structures/partials/menu.html,sha256=pxN_Tvo_vON0Fauyg_XPYlE6R6kaKRNFfhkLszIAMJI,2329
+structures/templates/structures/partials/menu.html,sha256=rSsemMJclo_O33V9NaGRMa39tZizpwZXHXvkfUAYknM,2335
 structures/templates/structures/partials/public/poco_list.html,sha256=tVAsGXS7rh7Qr5x2X26buyt7jwJJ-YoNLs9eMs0gDM4,1222
 structures/templates/structures/partials/statistics/structure_summary.html,sha256=ZCEBOPhfOUyih7C8TzaQi9OI2AsMzZGBb9ZGHsShzmk,1133
 structures/templates/structures/partials/structures/active_tags.html,sha256=KhYA6LbAqg-iJJ2J4BGACXdbdiZFM4wAgDEq2RQEu0s,106
@@ -153,10 +154,10 @@ structures/templates/structures/partials/structures/orbital_list.html,sha256=uWV
 structures/templates/structures/partials/structures/starbase_list.html,sha256=Djl3nsTSn9TIZ6k4F0hiF-qDv_rLiVSIapnWUz0bvqU,1412
 structures/templates/structures/partials/structures/structure_list.html,sha256=2EHP1xJrmDNhwENhxGY3L6YbC53qFwhnDHcFzxkNXpI,1421
 structures/templates/structures/templatetags/detail_title.html,sha256=PWoYNZhTt1ngDEdz_B4TlyC7duO-8MxgznSUb27lUDA,117
-structures/templates/structures/templatetags/list_asset.html,sha256=6wWndrdBlWbOMIQlGaqeUtSfk-c6F3ZQMYErZJ4H7SM,375
-structures/templates/structures/templatetags/list_item.html,sha256=vWOvGx-QEjsno-iqSJrfv_ip4VphoVVV0-FIngqnK5Q,706
-structures/templates/structures/templatetags/list_tax_item.html,sha256=K5XSYY5UyNx_o3GWN_WLyObxb0mDcmCJkztc20sTC0Q,505
-structures/templates/structures/templatetags/list_title.html,sha256=C2NWwo27TGfGsQo4BgSD_2A6TemcR4DEwb04tSN_hEM,68
+structures/templates/structures/templatetags/list_asset.html,sha256=loGzJwxp--c3nYAukAAGqfp4_hcBddoWgbooLLPDI1A,414
+structures/templates/structures/templatetags/list_item.html,sha256=jhl2Clt6fmLSQPidTqkgwTk2gZmwx7aWTQ7ClQSwwyM,706
+structures/templates/structures/templatetags/list_tax_item.html,sha256=Cs9KDpCaiC-hyBqETbWObSnepn1lpRBjto33OY_X4x0,505
+structures/templates/structures/templatetags/list_title.html,sha256=IzRlAPQ1cDDXnhpEO2CtD_GIfHrh-wy06LeOZP3KmNw,52
 structures/templatetags/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 structures/templatetags/structures.py,sha256=vSt5AnfYuo11q1SxiskT4oshSMsZ9ZgM0nYpYiMl8bA,1637
 structures/tests/__init__.py,sha256=9MrJzKr8DdsQY3-79v188pTpwqT4TDQ46vKnBJAGqic,75
@@ -194,11 +195,11 @@ structures/tests/models/test_structures.py,sha256=iCCa0yYyPHieNfj8TQbdoIv141oLc6
 structures/tests/testdata/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 structures/tests/testdata/constants.py,sha256=iab-9cHjAO4RBM88UeWbBypRm9qoZcViwZ8BPY17p1Q,441
 structures/tests/testdata/create_eveuniverse.py,sha256=a5DHYAxxsytOeevAL53RDoeDWObKwViqfpXRlmZeOHY,2157
-structures/tests/testdata/entities.json,sha256=vmb0uhwTpD0gycGAakgYidr3qSbnHiMubAd4u7T2l70,36053
+structures/tests/testdata/entities.json,sha256=G4OyYlrAbUa0eY1PZgA-K-77c-w5TrDvoF-dI-duNSo,37358
 structures/tests/testdata/esi_data.json,sha256=DX47oSlRZIPxlPueMfiNElbZbAip2cp3LAUmv8GAPJ0,13864
 structures/tests/testdata/eveuniverse.json,sha256=7RA5qeaPYx78Mk5_zixL2XYd-Oa4omhUihjgAbgNLyc,1616628
 structures/tests/testdata/factories.py,sha256=UF7Zao2-DjVFLZLEBWaJv4Pg1uw5D6p0TO8ZKuoAI_8,25293
-structures/tests/testdata/generate_notifications.py,sha256=lhcnbsnE4O6g0OFUAYO2sCfu8vmwBcFtxn-TuTLtFnM,5417
+structures/tests/testdata/generate_notifications.py,sha256=MmgG8N-0k1WMNJ_r1TEnbDwLs4su6--gUEZ3lJ6qhOk,5416
 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=FSlg7-6Dn3aMQnQPUnH9o9r8WsV1_BYxElm-E9x_5uo,6316
@@ -224,7 +225,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.16.0.dist-info/LICENSE,sha256=XZiwB_S_40_HhnvLg5xvtBb3g1oGjPrk0rpFwk8iInE,1070
-aa_structures-2.16.0.dist-info/WHEEL,sha256=EZbGkh7Ie4PoZfRQ8I0ZuP9VklN_TvcZ6DSE5Uar4z4,81
-aa_structures-2.16.0.dist-info/METADATA,sha256=1Aqt2HSauvphDqPjDpuv3s2Pkht-0ezvNuQWA7Op4hI,5972
-aa_structures-2.16.0.dist-info/RECORD,,
+aa_structures-3.0.0.dist-info/licenses/LICENSE,sha256=XZiwB_S_40_HhnvLg5xvtBb3g1oGjPrk0rpFwk8iInE,1070
+aa_structures-3.0.0.dist-info/WHEEL,sha256=G2gURzTEtmeR8nrdXUJfNiB3VYVxigPQ-bEQujpNiNs,82
+aa_structures-3.0.0.dist-info/METADATA,sha256=OyAeM44w8YCHpim9bIhelwPeDXb45WR3PkJkXx3mCX0,6003
+aa_structures-3.0.0.dist-info/RECORD,,

{aa_structures-2.16.0.dist-info → aa_structures-3.0.0.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: flit 3.9.0
+Generator: flit 3.12.0
 Root-Is-Purelib: true
 Tag: py3-none-any

structures/__init__.py

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

structures/core/notification_embeds/corporate_embeds.py

@@ -157,3 +157,61 @@ class NotificationCharLeftCorpMsg(NotificationCorpCharEmbed):
             "corporation_name": self._corporation_link,
         }
         self._color = Webhook.Color.INFO
+
+
+class NotificationCorpGoalEmbed(NotificationBaseEmbed):
+    def __init__(self, notification: Notification) -> None:
+        super().__init__(notification)
+        self._creator = get_or_create_eve_entity(id=self._data["creator_id"])
+        self._creator_link = gen_eve_entity_link(self._creator)
+        self._corporation = get_or_create_eve_entity(id=self._data["corporation_id"])
+        self._goal_name = self._data["goal_name"]
+        self._thumbnail = dhooks_lite.Thumbnail(
+            self._corporation.icon_url(size=self.ICON_DEFAULT_SIZE)
+        )
+
+
+class NotificationCorpGoalClosed(NotificationCorpGoalEmbed):
+    def __init__(self, notification: Notification) -> None:
+        super().__init__(notification)
+        self._title = _("Project canceled")
+        closer = get_or_create_eve_entity(id=self._data["closer_id"])
+        self._description = _(
+            "Project **%(goal_name)s** has ben closed by %(closer)s "
+            "and will not accept further contributions."
+            % {
+                "goal_name": self._goal_name,
+                "closer": gen_eve_entity_link(closer),
+            }
+        )
+        self._color = Webhook.Color.INFO
+
+
+class NotificationCorpGoalCompleted(NotificationCorpGoalEmbed):
+    def __init__(self, notification: Notification) -> None:
+        super().__init__(notification)
+        self._title = _("Project completed")
+        self._description = _(
+            "Project **%(goal_name)s** created by %(creator)s "
+            "has been successfully completed after reaching it's target."
+            % {
+                "goal_name": self._goal_name,
+                "creator": self._creator_link,
+            }
+        )
+        self._color = Webhook.Color.SUCCESS
+
+
+class NotificationCorpGoalCreated(NotificationCorpGoalEmbed):
+    def __init__(self, notification: Notification) -> None:
+        super().__init__(notification)
+        self._title = _("New Project Available")
+        self._description = _(
+            "Project **%(goal_name)s** has been created by %(creator)s "
+            "and is open for contributions."
+            % {
+                "goal_name": self._goal_name,
+                "creator": self._creator_link,
+            }
+        )
+        self._color = Webhook.Color.INFO

structures/core/notification_embeds/main.py

@@ -1,4 +1,4 @@
-"""Billing embeds."""
+"""Dispatcher for all embeds."""
 
 # pylint: disable=missing-class-docstring
 
@@ -198,6 +198,9 @@ class NotificationBaseEmbed:
             NotificationCorpAppInvitedMsg,
             NotificationCorpAppNewMsg,
             NotificationCorpAppRejectCustomMsg,
+            NotificationCorpGoalClosed,
+            NotificationCorpGoalCompleted,
+            NotificationCorpGoalCreated,
         )
         from .moonmining_embeds import (
             NotificationMoonminningAutomaticFracture,
@@ -283,7 +286,7 @@ class NotificationBaseEmbed:
             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
+            # Corporate
             NT.CHAR_APP_ACCEPT_MSG: NotificationCharAppAcceptMsg,
             NT.CHAR_APP_WITHDRAW_MSG: NotificationCharAppWithdrawMsg,
             NT.CHAR_LEFT_CORP_MSG: NotificationCharLeftCorpMsg,
@@ -291,6 +294,9 @@ class NotificationBaseEmbed:
             NT.CORP_APP_NEW_MSG: NotificationCorpAppNewMsg,
             NT.CORP_APP_REJECT_CUSTOM_MSG: NotificationCorpAppRejectCustomMsg,
             NT.CORP_APP_REJECT_MSG: NotificationCharAppRejectMsg,
+            NT.CORPORATION_GOAL_CLOSED: NotificationCorpGoalClosed,
+            NT.CORPORATION_GOAL_COMPLETED: NotificationCorpGoalCompleted,
+            NT.CORPORATION_GOAL_CREATED: NotificationCorpGoalCreated,
             # moonmining
             NT.MOONMINING_AUTOMATIC_FRACTURE: NotificationMoonminningAutomaticFracture,
             NT.MOONMINING_EXTRACTION_CANCELLED: NotificationMoonminningExtractionCanceled,

structures/core/notification_types.py

@@ -11,61 +11,42 @@ from structures.app_settings import STRUCTURES_FEATURE_REFUELED_NOTIFICATIONS
 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_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", _(
-        "Upwell structure reinforcement time changed"
-    )
-    STRUCTURE_SERVICES_OFFLINE = "StructureServicesOffline", _(
-        "Upwell structure services went offline"
+    # billing
+    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"),
     )
-    STRUCTURE_UNANCHORING = "StructureUnanchoring", _("Upwell structure unanchoring")
-    STRUCTURE_UNDER_ATTACK = "StructureUnderAttack", _(
-        "Upwell structure is under attack"
+    BILLING_I_HUB_DESTROYED_BY_BILL_FAILURE = (
+        "IHubDestroyedByBillFailure",
+        _("I_HUB destroyed by bill failure"),
     )
-    STRUCTURE_WENT_HIGH_POWER = "StructureWentHighPower", _(
-        "Upwell structure went high power"
+
+    # Corporation Membership
+    CHAR_APP_ACCEPT_MSG = "CharAppAcceptMsg", _("Character joins corporation")
+    CORP_APP_INVITED_MSG = "CorpAppInvitedMsg", _(
+        "Character invited to join corporation"
     )
-    STRUCTURE_WENT_LOW_POWER = "StructureWentLowPower", _(
-        "Upwell structure went low power"
+    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 custom message"
     )
+    CHAR_APP_WITHDRAW_MSG = "CharAppWithdrawMsg", _("Character withdrew application")
+    CHAR_LEFT_CORP_MSG = "CharLeftCorpMsg", _("Character leaves corporation")
 
-    # 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")
+    # Corporation Goals
+    CORPORATION_GOAL_CLOSED = "CorporationGoalClosed", _("Corporation goal closed")
+    CORPORATION_GOAL_COMPLETED = "CorporationGoalCompleted", _(
+        "Corporation goal completed"
+    )
+    CORPORATION_GOAL_CREATED = "CorporationGoalCreated", _("Corporation goal created")
+    # CORPORATION_GOAL_NAME_CHANGE = "CorporationGoalNameChange", _(
+    #     "Corporation goal name change"
+    # )
 
-    # starbases
-    TOWER_ALERT_MSG = "TowerAlertMsg", _("Starbase attacked")
-    TOWER_REFUELED_EXTRA = "TowerRefueledExtra", _("Starbase refueled (BETA)")
-    TOWER_REINFORCED_EXTRA = "TowerReinforcedExtra", _("Starbase reinforced (BETA)")
-    TOWER_RESOURCE_ALERT_MSG = "TowerResourceAlertMsg", _("Starbase fuel alert")
-
-    # moon mining
+    # Moon Mining
     MOONMINING_AUTOMATIC_FRACTURE = "MoonminingAutomaticFracture", _(
         "Moon mining automatic fracture triggered"
     )
@@ -80,7 +61,18 @@ class NotificationType(models.TextChoices):
     )
     MOONMINING_LASER_FIRED = "MoonminingLaserFired", _("Moonmining laser fired")
 
-    # sov
+    # 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")
+
+    # Orbitals
+    ORBITAL_ATTACKED = "OrbitalAttacked", _("Customs office attacked")
+    ORBITAL_REINFORCED = "OrbitalReinforced", _("Customs office reinforced")
+
+    # Sov
     SOV_ALL_CLAIM_ACQUIRED_MSG = "SovAllClaimAquiredMsg", _(
         "Sovereignty claim acknowledgment"  # SovAllClaimAquiredMsg [sic!]
     )
@@ -101,7 +93,50 @@ class NotificationType(models.TextChoices):
         "Sovereignty command node event started"
     )
 
-    # wars
+    # Starbases
+    TOWER_ALERT_MSG = "TowerAlertMsg", _("Starbase attacked")
+    TOWER_REFUELED_EXTRA = "TowerRefueledExtra", _("Starbase refueled (BETA)")
+    TOWER_REINFORCED_EXTRA = "TowerReinforcedExtra", _("Starbase reinforced (BETA)")
+    TOWER_RESOURCE_ALERT_MSG = "TowerResourceAlertMsg", _("Starbase fuel alert")
+
+    # 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_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", _(
+        "Upwell structure reinforcement time changed"
+    )
+    STRUCTURE_SERVICES_OFFLINE = "StructureServicesOffline", _(
+        "Upwell structure services went offline"
+    )
+    STRUCTURE_UNANCHORING = "StructureUnanchoring", _("Upwell structure unanchoring")
+    STRUCTURE_UNDER_ATTACK = "StructureUnderAttack", _(
+        "Upwell structure is under attack"
+    )
+    STRUCTURE_WENT_HIGH_POWER = "StructureWentHighPower", _(
+        "Upwell structure went high power"
+    )
+    STRUCTURE_WENT_LOW_POWER = "StructureWentLowPower", _(
+        "Upwell structure went low power"
+    )
+
+    # Wars
     WAR_ACCEPTED_ALLY = "AcceptedAlly", _("War accepted ally")
     WAR_ALL_WAR_CORP_JOINED_ALLIANCE_MSG = "AllWarCorpJoinedAllianceMsg", _(
         "Alliance war corporation joined alliance message"
@@ -142,31 +177,6 @@ class NotificationType(models.TextChoices):
     )
     WAR_WAR_SURRENDER_OFFER_MSG = "WarSurrenderOfferMsg", _("War surrender offered")
 
-    # corporation membership
-    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 custom message"
-    )
-    CHAR_APP_WITHDRAW_MSG = "CharAppWithdrawMsg", _("Character withdrew application")
-    CHAR_LEFT_CORP_MSG = "CharLeftCorpMsg", _("Character leaves corporation")
-
-    # billing
-    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"),
-    )
-    BILLING_I_HUB_DESTROYED_BY_BILL_FAILURE = (
-        "IHubDestroyedByBillFailure",
-        _("I_HUB destroyed by bill failure"),
-    )
-
     @classmethod
     def esi_notifications(cls) -> Set["NotificationType"]:
         """Return all ESI notification types."""

structures/core/serializers.py

@@ -330,8 +330,8 @@ class _AbstractStructureListSerializer(ABC):
         ):
             ajax_url = reverse("structures:structure_details", args=[structure.id])
             row["details"] = format_html(
-                '<button type="button" class="btn btn-default" '
-                'data-toggle="modal" data-target="#modalUpwellDetails" '
+                '<button type="button" class="btn btn-secondary" '
+                'data-bs-toggle="modal" data-bs-target="#modalUpwellDetails" '
                 f"data-ajax_url={ajax_url} "
                 f'title="{_("Show fitting")}">'
                 '<i class="fas fa-search"></i></button>'
@@ -340,8 +340,8 @@ class _AbstractStructureListSerializer(ABC):
         elif structure.is_poco:
             ajax_url = reverse("structures:poco_details", args=[structure.id])
             row["details"] = format_html(
-                '<button type="button" class="btn btn-default" '
-                'data-toggle="modal" data-target="#modalPocoDetails" '
+                '<button type="button" class="btn btn-secondary" '
+                'data-bs-toggle="modal" data-bs-target="#modalPocoDetails" '
                 f"data-ajax_url={ajax_url} "
                 f'title="{_("Show details")}">'
                 '<i class="fas fa-search"></i></button>'
@@ -350,8 +350,8 @@ class _AbstractStructureListSerializer(ABC):
         elif structure.is_starbase:
             ajax_url = reverse("structures:starbase_detail", args=[structure.id])
             row["details"] = format_html(
-                '<button type="button" class="btn btn-default" '
-                'data-toggle="modal" data-target="#modalStarbaseDetail" '
+                '<button type="button" class="btn btn-secondary" '
+                'data-bs-toggle="modal" data-bs-target="#modalStarbaseDetail" '
                 f"data-ajax_url={ajax_url} "
                 f'title="{_("Show details")}">'
                 '<i class="fas fa-search"></i></button>'