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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: aa-structures
-Version: 2.13.0
+Version: 2.14.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.13.0.dist-info → aa_structures-2.14.0.dist-info}/RECORD

@@ -1,18 +1,18 @@
-structures/__init__.py,sha256=sxMrwmEo1GeZidz442fY62l0Ke7WzyBdTC6IneBHO3U,204
-structures/admin.py,sha256=TYWGPou4s-mgspoGaZSiZu2nxBeNzidL_DcJTv7JGJI,40068
-structures/app_settings.py,sha256=7I_6VC7YecCxnSgtyNQa9h1Zdwb11qJhrNaBLgyA5m0,6527
+structures/__init__.py,sha256=OXqNqbUO5Qpf5_RjpBoWJz1oygLBj3q-5FymboOnAeQ,204
+structures/admin.py,sha256=cA04JFghU-zIGC168fhZ5Hj_FYAQxlF6TFVDb8sgO4A,40066
+structures/app_settings.py,sha256=aWA2bTcv_vVwIyisx-G7GBSpfM6JDyt2MWcXKtHnjK0,6651
 structures/apps.py,sha256=MNZH9l3qWCwuS7OGiKGkBVrDzKoOFlqwDdEgyEFzxVA,195
 structures/auth_hooks.py,sha256=nRbrixFkAE5gphDokB1E8xhH8FY2VtXVwu0XMmSGBAw,1013
-structures/constants.py,sha256=R7sC5esaWJayJpTDbug7dTKxkkXDKXQ-U6M9Qb0GH5s,967
+structures/constants.py,sha256=12iIVgFWSNaH1iYBByrsv3OQKCnNxluuckOdrfgzWzA,995
 structures/forms.py,sha256=kXs-SGIIj-D9xtFCILKe_PMRU4eHl3-HLNWRhaZKmnQ,391
 structures/helpers.py,sha256=_dw7j7yobpcV70VwWxoQiptk69b3ksvaDlRQKHg8Kmg,2344
-structures/managers.py,sha256=ihqcYgsQkDpCejho5l8pthRbJSNhCuWq6UaijPZVG6o,19793
+structures/managers.py,sha256=6zGvmiP1_TZ1uZlPTxNFYgJ77JIjY3uw2PmYeyrJ10E,20063
 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=v4hDwgJFqEEXJl9dDxCwTVmQo5yA_Ixjxs_BQEcwNDE,13224
+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/sovereignty.py,sha256=XKgjAFO4BfLpEEUz_hBr2DVDnvWBq9sL9EEQiT4T0n0,730
 structures/core/starbases.py,sha256=nw7skHYATrnAV-zuPAuxmhM5E4Aqjc_DHSU2TYWgBng,1757
@@ -65,8 +65,8 @@ structures/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3h
 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=8VDRL1fPep0TN6Nv5MJg1NC6_2V6bMJd6f-eda4-PJg,55697
-structures/models/structures_1.py,sha256=e1sI-2zMSKcPi2PyYA--fcc8rn-yQwODzlUHKjeWgLI,29778
+structures/models/owners.py,sha256=9LLjOv7QAICAodx6XUEGGuO6RxLY4h6hZs8EWWiobs0,57875
+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
 structures/static/structures/css/main.css,sha256=kNgHhC3tVG376h8-6b71MtiERhYZ48cTIno5Kj6ZFGo,303
@@ -134,9 +134,9 @@ structures/static/structures/vendor/datatables/plugins/filterDropDown.min.js,sha
 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=x9IJXBmToPcBZygWfzhvipopP_yWPaS3VJGSKUASDYQ,3233
+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=87FkTebE2NvzVh9_nkffDo9wOX4tanLu66xpnG5--SI,8322
+structures/templates/structures/structures.html,sha256=WdtBxY3XumtpO4b23Arw8lVqGJf_gHIeD2AAxaKf7cU,8327
 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
@@ -162,13 +162,13 @@ structures/templatetags/structures.py,sha256=vSt5AnfYuo11q1SxiskT4oshSMsZ9ZgM0nY
 structures/tests/__init__.py,sha256=9MrJzKr8DdsQY3-79v188pTpwqT4TDQ46vKnBJAGqic,75
 structures/tests/test_admin.py,sha256=cb_AbOanp31k-oZhaUXCqnlkUu87EgNddq_VQKbB_Dk,26839
 structures/tests/test_helpers.py,sha256=BQC-4H-9-v5qW4nugqy0bkxuGlA3UO2clYY2lI2LjoY,4893
-structures/tests/test_managers_1.py,sha256=ruKq5VRYHdStDQe3uzVhcxF0seQQfmdudJEUYXzi8bY,34539
+structures/tests/test_managers_1.py,sha256=4dnlK7Le04eJUPjJc9ex5BxZWIJGAyEvdKuuYXU2gqY,34846
 structures/tests/test_managers_2.py,sha256=FISr_NT1Qnu9j1JYYTceNsUk8k9rfCTKwjKi5WUVbPs,3025
 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=2J5A8Dr9UHhzLEj6QTMty5iZXlNkQxtFmLvU8Wpdno4,10447
-structures/tests/core/test_notifications_timerboard.py,sha256=OMkAWH_jWXzCwotp6W2qWG6GpSGisyunZYOoy1UZomU,5583
+structures/tests/core/test_notifications_timers.py,sha256=7Os0xmrfDV2zJeBOFYb7K1KGcwpVHq36IglOdjps6Ac,5915
 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
@@ -176,8 +176,8 @@ structures/tests/core/notification_embeds/__init__.py,sha256=47DEQpj8HBSa-_TImW-
 structures/tests/core/notification_embeds/test_helpers.py,sha256=HG20TC8Bz7NqpaQWo6uvrsxfNIwTL2Zi_NRkh3UyN2Y,1776
 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
+structures/tests/integration/test_tasks.py,sha256=uhl7TJNELrL1vSDaRee0xEKNMLJuVqRIM32cIVUa_h4,27217
+structures/tests/integration/test_views.py,sha256=qlw1VzlyGW_xnWC-Ii16IHECO-F2x25sYbXeqz2T8IY,4364
 structures/tests/models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 structures/tests/models/test_eveuniverse.py,sha256=bQ1upOLfoivfaa9KCrzjWvSH_EvL2STuvfFfZ9saIMY,1623
 structures/tests/models/test_notifications_1.py,sha256=xVX4an54sZM8WLUdsAGUG2Nb4Rl7W5FBzhI0hBhJo5g,30300
@@ -188,19 +188,19 @@ structures/tests/models/test_owners_1.py,sha256=o8AJasQ0-Pdb0FRFZcmNcMGjaIk8fH3O
 structures/tests/models/test_owners_2.py,sha256=gkTXpSibPWs1XfZtPvyeEvVebyYZcKERD9GQSYSClYk,21911
 structures/tests/models/test_owners_3.py,sha256=cpDkfFkVvC1v4uuXha1vGUmWZ163huYTUDuZyed9Rdc,16947
 structures/tests/models/test_owners_4.py,sha256=_VP4QsPYGwBnn_bVN4aNX2ZVeJzMAzWObZrgCJkOPgY,19496
-structures/tests/models/test_owners_5.py,sha256=lTSfVY3rPOLyF-IhlKPT4mbRqvuN_NA-kyU0Vzzp9qY,31607
+structures/tests/models/test_owners_5.py,sha256=TIF_SqJqyGja8FBV2lQNAC4yff1usmJ4e0QW7e68zTg,36929
 structures/tests/models/test_owners_6.py,sha256=R9UE2QGwiGTWLHzzOZwGQPWJrAPwIIl7UwrHH-ki4Ak,940
-structures/tests/models/test_structures.py,sha256=6HktwBOsmRtRq5MnRlZnvNixUsWUpRni_XnPjNpMN0Y,41469
+structures/tests/models/test_structures.py,sha256=iCCa0yYyPHieNfj8TQbdoIv141oLc6hlICZ6AsTnHAw,41849
 structures/tests/testdata/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 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=3fhD72lUNLj96wO4ASbpNcdH_8VbqcXUvKUXR6j0768,1028885
-structures/tests/testdata/factories.py,sha256=KNXxOad44DKD0luQ7QS0DepnCr1S_Z6qwfiXnNDy10I,24774
+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_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
+structures/tests/testdata/helpers.py,sha256=FSlg7-6Dn3aMQnQPUnH9o9r8WsV1_BYxElm-E9x_5uo,6316
 structures/tests/testdata/load_eveuniverse.py,sha256=e3XQNYZXwmhfLQdvO4D1dfbSwhF1Zwr3ag9nG9E3XDM,395
 structures/tests/testdata/tasks_loadtest.py,sha256=Hn0UVeaMfdi5S4W12lsb6g_xwjQcNYDmeXvQdTsPfBM,963
 structures/tests/testdata/test_generate_structures.py,sha256=vpReGRROduZsGB99Dq7yPKNKSkSLFdLM_esdf5TTnnI,414
@@ -208,14 +208,14 @@ structures/tests/views/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3
 structures/tests/views/test_public.py,sha256=FTaT3VUOnoT4t9rCCTCGyDrberpa8CRJHsXuqAw2PQE,1372
 structures/tests/views/test_service_status.py,sha256=mWkP13HnKRa3ltsZ2FKJuZRJjvYic9wjgQ1J3qA8n-k,4197
 structures/tests/views/test_statistics.py,sha256=MHt31AIX9_jt8-yP8XsbsiRRUKEtY8mQJbk11saFYZc,2626
-structures/tests/views/test_structures.py,sha256=4DrURs32GvbMnXXJm1dC1ZhsDVhJ50iKyiqTRyyRe70,28284
+structures/tests/views/test_structures.py,sha256=KbD3RqUKhWxcRsHfZbgyNHWj7Z9bJt7wOj45s0y17EY,28489
 structures/tests/views/utils.py,sha256=0ALPjL8d0vcIWa_Pl4_gDl1qtBp71oDqyZLJyvDj-Uc,247
 structures/views/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 structures/views/common.py,sha256=Z_hcpEpkGrhwFdMAAMON_DqsfQ_lMyRwOMl5ROo_aSk,818
 structures/views/public.py,sha256=-Tel-poYKZTy8eQllhsWUxVf7HYBuCfeL9JWlbKhs7s,3035
 structures/views/statistics.py,sha256=7jj8b9ATsYwE7Cg6gMp-bYx29nV43GdWYun9WBggGkM,4709
 structures/views/status.py,sha256=gcahbk6dPIZDqkaNHDAsEHyDWLzicTK18Fom0A6xx3c,718
-structures/views/structures.py,sha256=E1ssnqr2zp0rLQ3txIa6XkcX3NStNjMkuQM4iNjt6yw,22560
+structures/views/structures.py,sha256=Wb57jFfRa0Zxo6TxKmOCQ-jtopzPtHe0go6gnJn40CA,22584
 structures/webhooks/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 structures/webhooks/core.py,sha256=mP25MbQG8Yv2YayDFcR6x2V30eqXhR2q5u4SRefblf4,6573
 structures/webhooks/managers.py,sha256=L3G3AmsyDeif_lfpWshmAxQ61UGJ9w8i9lZaF2jbOtQ,1117
@@ -223,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.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,,
+aa_structures-2.14.0.dist-info/LICENSE,sha256=XZiwB_S_40_HhnvLg5xvtBb3g1oGjPrk0rpFwk8iInE,1070
+aa_structures-2.14.0.dist-info/WHEEL,sha256=EZbGkh7Ie4PoZfRQ8I0ZuP9VklN_TvcZ6DSE5Uar4z4,81
+aa_structures-2.14.0.dist-info/METADATA,sha256=X7YMjOqlJc_CkmHeFWJiYgKb8QLDPdnzPibT_bh6ReM,5972
+aa_structures-2.14.0.dist-info/RECORD,,

structures/__init__.py

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

structures/admin.py

@@ -324,7 +324,7 @@ class NotificationBaseAdmin(admin.ModelAdmin):
             message = format_lazy("{first} {second}", first=first, second=second)
         else:
             message = first
-        message = format_lazy({first})
+        message = format_lazy(first)
         self.message_user(request, message)
 
 

structures/app_settings.py

@@ -49,6 +49,10 @@ STRUCTURES_FEATURE_REFUELED_NOTIFICATIONS = clean_setting(
 )
 """Enable / disable refueled notifications feature."""
 
+STRUCTURES_FEATURE_SKYHOOKS = clean_setting("STRUCTURES_FEATURE_SKYHOOKS", False)
+"""Show skyhooks in structures list."""
+
+
 STRUCTURES_FEATURE_STARBASES = clean_setting("STRUCTURES_FEATURE_STARBASES", True)
 """Enable / disable starbases feature."""
 

structures/constants.py

@@ -42,6 +42,7 @@ class EveTypeId(IntEnum):
     IHUB = 32458
     JUMP_GATE = 35841
     LIQUID_OZONE = 16273
+    ORBITAL_SKYHOOK = 81080
     NITROGEN_FUEL_BLOCK = 4051
     STRONTIUM = 16275
     TCU = 32226

structures/core/notification_timers.py

@@ -53,7 +53,9 @@ def add_or_remove_timer(notif: Notification) -> bool:
     elif notif.notif_type == NotificationType.SOV_STRUCTURE_REINFORCED:
         timer_processed = _gen_timer_sov_reinforcements(notif)
     elif notif.notif_type == NotificationType.ORBITAL_REINFORCED:
-        timer_processed = _gen_timer_orbital_reinforcements(notif)
+        timer_processed = _gen_timer_customs_office_reinforcements(notif)
+    elif notif.notif_type == NotificationType.SKYHOOK_LOST_SHIELDS:
+        timer_processed = _gen_timer_skyhook_reinforcements(notif)
     elif notif.notif_type in [
         NotificationType.MOONMINING_EXTRACTION_STARTED,
         NotificationType.MOONMINING_EXTRACTION_CANCELLED,
@@ -65,9 +67,7 @@ def add_or_remove_timer(notif: Notification) -> bool:
     elif notif.notif_type == NotificationType.TOWER_REINFORCED_EXTRA:
         timer_processed = _gen_timer_tower_reinforcements(notif)
     else:
-        raise NotImplementedError(
-            f"Unsupported notification type for timers: {notif.notif_type}"
-        )
+        raise NotImplementedError(notif.notif_type)
     if timer_processed:
         logger.info("%s: Created timer for notification", notif.notification_id)
         notif.is_timer_added = True
@@ -181,8 +181,8 @@ def _gen_timer_sov_reinforcements(notif: Notification) -> bool:
     return timer_processed
 
 
-def _gen_timer_orbital_reinforcements(notif: Notification) -> bool:
-    """Generate timer for orbital reinforcements."""
+def _gen_timer_customs_office_reinforcements(notif: Notification) -> bool:
+    """Generate timer for customs office reinforcements."""
 
     solar_system = notif.eve_solar_system()
     planet = notif.eve_planet()
@@ -231,6 +231,53 @@ def _gen_timer_orbital_reinforcements(notif: Notification) -> bool:
     return timer_processed
 
 
+def _gen_timer_skyhook_reinforcements(notif: Notification) -> bool:
+    """Generate timer for skyhook reinforcements."""
+
+    solar_system = notif.eve_solar_system("solarsystemID")
+    structure_type = notif.eve_structure_type("typeID")
+    planet = notif.eve_planet()
+    eve_time = ldap_time_2_datetime(notif.parsed_text()["timestamp"])
+    timer_processed = False
+
+    if AuthTimer:
+        AuthTimer.objects.create(
+            details=gettext("Final timer"),
+            system=solar_system.name,
+            planet_moon=planet.name,
+            structure="POCO",  # Auth timer does not support the Skyhook type yet
+            objective="Friendly",
+            eve_time=eve_time,
+            eve_corp=notif.owner.corporation,
+            corp_timer=STRUCTURES_TIMERS_ARE_CORP_RESTRICTED,
+        )
+        timer_processed = True
+
+    if Timer:
+        visibility = (
+            Timer.Visibility.CORPORATION
+            if STRUCTURES_TIMERS_ARE_CORP_RESTRICTED
+            else Timer.Visibility.UNRESTRICTED
+        )
+        Timer.objects.create(
+            eve_solar_system=solar_system,
+            structure_type=structure_type,
+            timer_type=Timer.Type.FINAL,
+            objective=Timer.Objective.FRIENDLY,
+            date=eve_time,
+            location_details=planet.name,
+            eve_corporation=notif.owner.corporation,
+            eve_alliance=notif.owner.corporation.alliance,
+            visibility=visibility,
+            structure_name=structure_type.name,
+            owner_name=notif.owner.corporation.corporation_name,
+            details_notes=_timer_details_notes(notif),
+        )
+        timer_processed = True
+
+    return timer_processed
+
+
 def _gen_timer_moon_extraction(notif: Notification) -> bool:
     """Generate timer for moon mining extractions."""
     solar_system = notif.eve_solar_system()

structures/core/notification_types.py

@@ -221,6 +221,7 @@ class NotificationType(models.TextChoices):
             cls.STRUCTURE_LOST_ARMOR,
             cls.STRUCTURE_LOST_SHIELD,
             cls.TOWER_REINFORCED_EXTRA,
+            cls.SKYHOOK_LOST_SHIELDS,
         }
 
     @classmethod

structures/managers.py

@@ -2,9 +2,11 @@
 
 # pylint: disable=missing-class-docstring
 
+from __future__ import annotations
+
 import datetime as dt
 import itertools
-from typing import Any, Iterable, Optional, Set, Tuple
+from typing import TYPE_CHECKING, Any, Iterable, Optional, Set, Tuple
 
 from django.contrib.auth.models import User
 from django.db import models, transaction
@@ -24,6 +26,9 @@ from .core.notification_types import NotificationType
 from .providers import esi
 from .webhooks.managers import WebhookBaseManager
 
+if TYPE_CHECKING:
+    from .models import Owner
+
 logger = LoggerAddTag(get_extension_logger(__name__), __title__)
 
 
@@ -231,6 +236,10 @@ class StructureQuerySet(models.QuerySet):
         """Filter for starbases."""
         return self.filter(eve_type__eve_group__eve_category=EveCategoryId.STARBASE)
 
+    def filter_skyhooks(self) -> models.QuerySet:
+        """Filter for skyhooks."""
+        return self.filter(eve_type=EveTypeId.ORBITAL_SKYHOOK)
+
     def ids(self) -> Set[int]:
         """Return ids as set."""
         return set(self.values_list("id", flat=True))
@@ -380,7 +389,9 @@ class StructureManagerBase(models.Manager):
         obj, created = self.update_or_create_from_dict(structure=structure, owner=owner)
         return obj, created
 
-    def update_or_create_from_dict(self, structure: dict, owner) -> Tuple[Any, bool]:
+    def update_or_create_from_dict(
+        self, structure: dict, owner: Owner
+    ) -> Tuple[Any, bool]:
         """update or create structure from given dict"""
 
         eve_type: EveType = EveType.objects.get_or_create_esi(id=structure["type_id"])[

structures/models/owners.py

@@ -37,6 +37,7 @@ from structures.app_settings import (
     STRUCTURES_DEVELOPER_MODE,
     STRUCTURES_ESI_DIRECTOR_ERROR_MAX_RETRIES,
     STRUCTURES_FEATURE_CUSTOMS_OFFICES,
+    STRUCTURES_FEATURE_SKYHOOKS,
     STRUCTURES_FEATURE_STARBASES,
     STRUCTURES_HOURS_UNTIL_STALE_NOTIFICATION,
     STRUCTURES_NOTIFICATION_SYNC_GRACE_MINUTES,
@@ -545,14 +546,14 @@ class Owner(models.Model):
                 )
 
     def _remove_structures_not_returned_from_esi(
-        self, structures_qs: models.QuerySet, new_structures: Iterable
+        self, existing_structures: models.QuerySet, new_structures: Iterable[dict]
     ):
         """Remove structures no longer returned from ESI."""
-        ids_local = {x.id for x in structures_qs}
+        ids_local = {x.id for x in existing_structures}
         ids_from_esi = {x["structure_id"] for x in new_structures}
         ids_to_remove = ids_local - ids_from_esi
         if len(ids_to_remove) > 0:
-            structures_qs.filter(id__in=ids_to_remove).delete()
+            existing_structures.filter(id__in=ids_to_remove).delete()
             logger.info(
                 "Removed %d structures which apparently no longer exist.",
                 len(ids_to_remove),
@@ -650,7 +651,7 @@ class Owner(models.Model):
             self._store_raw_data("structures", structures)
 
         self._remove_structures_not_returned_from_esi(
-            structures_qs=self.structures.filter_upwell_structures(),
+            existing_structures=self.structures.filter_upwell_structures(),
             new_structures=structures,
         )
         return is_ok
@@ -701,7 +702,7 @@ class Owner(models.Model):
             return False
 
         self._remove_structures_not_returned_from_esi(
-            structures_qs=self.structures.filter_customs_offices(),
+            existing_structures=self.structures.filter_customs_offices(),
             new_structures=structures.values(),
         )
         return True
@@ -868,7 +869,7 @@ class Owner(models.Model):
             return False
 
         self._remove_structures_not_returned_from_esi(
-            structures_qs=self.structures.filter_starbases(),
+            existing_structures=self.structures.filter_starbases(),
             new_structures=structures,
         )
         character.reset_error_counter()
@@ -1214,15 +1215,18 @@ class Owner(models.Model):
     def update_asset_esi(self, user: Optional[User] = None):
         """Update assets from ESI."""
         token = self.fetch_token()
-        assets_data = self._fetch_structure_assets_from_esi(token)
+        assets_data = self._fetch_owner_assets_from_esi(token)
         self._store_items_for_upwell_structures(assets_data)
         self._store_items_for_starbases(assets_data)
+        if STRUCTURES_FEATURE_SKYHOOKS:
+            self._update_skyhooks_from_assets(assets_data)
+            self._resolve_skyhook_planets()
         if user:
             self._send_report_to_user(
                 topic="assets", topic_count=self.structures.count(), user=user
             )
 
-    def _fetch_structure_assets_from_esi(self, token: Token) -> dict:
+    def _fetch_owner_assets_from_esi(self, token: Token) -> dict:
         assets_raw = esi.client.Assets.get_corporations_corporation_id_assets(
             corporation_id=self.corporation.corporation_id,
             token=token.valid_access_token(),
@@ -1306,6 +1310,62 @@ class Owner(models.Model):
                     )
             structure.update_items(structure_items)
 
+    def _update_skyhooks_from_assets(self, assets_data: dict):
+        skyhooks = {
+            item_id: item
+            for item_id, item in assets_data.items()
+            if item["type_id"] == EveTypeId.ORBITAL_SKYHOOK
+            and item["location_type"] == "solar_system"
+            and item["location_flag"] == "AutoFit"
+            and item["is_singleton"]
+            and item["position"]
+        }
+        structures = []
+        for item in skyhooks.values():
+            structures.append(
+                {
+                    "corporation_id": self.corporation.corporation_id,
+                    "type_id": item["type_id"],
+                    "position": item["position"],
+                    "structure_id": item["item_id"],
+                    "system_id": item["location_id"],
+                }
+            )
+
+        for s in structures:
+            Structure.objects.update_or_create_from_dict(s, self)
+
+        self._remove_structures_not_returned_from_esi(
+            existing_structures=self.structures.filter_skyhooks(),
+            new_structures=structures,
+        )
+
+    def _resolve_skyhook_planets(self):
+        """Add planets to all unresolved Skyhooks."""
+        s: Structure
+        for s in self.structures.filter_skyhooks().filter(
+            eve_planet__isnull=True,
+            position_x__isnull=False,
+            position_y__isnull=False,
+            position_z__isnull=False,
+        ):
+            try:
+                celestial = s.eve_solar_system.nearest_celestial(
+                    x=s.position_x,
+                    y=s.position_y,
+                    z=s.position_z,
+                    group_id=EveGroupId.PLANET,
+                )
+            except OSError:
+                continue
+
+            if not celestial or not isinstance(celestial.eve_object, EvePlanet):
+                continue
+
+            s.eve_planet = celestial.eve_object
+            s.name = celestial.eve_type.name
+            s.save()
+
     @staticmethod
     def get_esi_scopes() -> List[str]:
         """Return all required ESI scopes."""

structures/models/structures_1.py

@@ -464,6 +464,11 @@ class Structure(models.Model):  # pylint: disable = too-many-public-methods
         """Return True if this structure is a starbase, else False."""
         return starbases.is_starbase(self.eve_type)
 
+    @property
+    def is_skyhook(self) -> bool:
+        """Return True if this structure is a skyhook, else False."""
+        return self.eve_type_id == EveTypeId.ORBITAL_SKYHOOK
+
     @cached_property
     def is_upwell_structure(self) -> bool:
         """Return True if this structure is an upwell structure, else False."""

structures/templates/structures/public.html

@@ -28,7 +28,7 @@
     <ul id="public-tabs" class="nav nav-tabs" role="tablist">
 
         <li role="presentation" class="active">
-            <a href="#pocos" aria-controls="pocos" role="tab" data-toggle="tab">
+            <a href="#pocos" aria-controls="orbitals" role="tab" data-toggle="tab">
                 {% translate "Customs Offices" %} <small>({{ pocos_count|default:"-" }})</small>
             </a>
         </li>
@@ -39,7 +39,7 @@
         <div class="panel-body">
             <div class="tab-content">
 
-                <div role="tabpanel" class="tab-pane active" id="pocos">
+                <div role="tabpanel" class="tab-pane active" id="orbitals">
                     {% include "structures/partials/public/poco_list.html" %}
                 </div>
 

structures/templates/structures/structures.html

@@ -48,8 +48,8 @@
         </li>
 
         <li role="presentation">
-            <a href="#pocos" aria-controls="pocos" role="tab" data-toggle="tab">
-                {% trans "Customs Offices" %} <small>({{ pocos_count|default:"-" }})</small>
+            <a href="#orbitals" aria-controls="orbitals" role="tab" data-toggle="tab">
+                {% trans "Orbitals" %} <small>({{ orbitals_count|default:"-" }})</small>
             </a>
         </li>
 
@@ -77,7 +77,7 @@
                     {% include "structures/partials/structures/structure_list.html" %}
                 </div>
 
-                <div role="tabpanel" class="tab-pane" id="pocos">
+                <div role="tabpanel" class="tab-pane" id="orbitals">
                     {% include "structures/partials/structures/poco_list.html" %}
                 </div>
 

structures/tests/core/{test_notifications_timerboard.py → test_notifications_timers.py}

@@ -4,6 +4,7 @@ from app_utils.django import app_labels
 from app_utils.testing import NoSocketsTestCase
 
 from structures.core import notification_timers
+from structures.core.notification_types import NotificationType
 from structures.models import Notification
 from structures.tests.testdata.factories import (
     GeneratedNotificationFactory,
@@ -107,7 +108,11 @@ if "timerboard" in app_labels():
         @patch(MODULE_PATH + ".STRUCTURES_MOON_EXTRACTION_TIMERS_ENABLED", True)
         def test_run_all(self):
             for obj in Notification.objects.all():
-                obj.add_or_remove_timer()
+                timer_types = NotificationType.relevant_for_timerboard()
+                with self.subTest(notif_type=obj.notif_type):
+                    is_timer = obj.notif_type in timer_types
+                    is_added = obj.add_or_remove_timer()
+                    self.assertEqual(is_timer, is_added)
 
         @patch(MODULE_PATH + ".STRUCTURES_TIMERS_ARE_CORP_RESTRICTED", False)
         def test_corp_restriction_1(self):

structures/tests/integration/test_tasks.py

@@ -7,7 +7,7 @@ import yaml
 
 from django.test import TestCase, override_settings
 from django.utils.timezone import now
-from eveuniverse.models import EveSolarSystem
+from eveuniverse.models import EvePlanet, EveSolarSystem
 
 from app_utils.django import app_labels
 from app_utils.esi import EsiStatus
@@ -22,11 +22,13 @@ from structures.tests.testdata.factories import (
     NotificationFactory,
     OwnerFactory,
     RawNotificationFactory,
+    SkyhookFactory,
     StarbaseFactory,
     StructureFactory,
     WebhookFactory,
     datetime_to_esi,
 )
+from structures.tests.testdata.helpers import NearestCelestial
 from structures.tests.testdata.load_eveuniverse import load_eveuniverse
 
 if "structuretimers" in app_labels():
@@ -613,3 +615,102 @@ class TestTasks(TestCase):
         self.assertEqual(len(embeds), 1)
         embed = embeds[0]
         self.assertIn("Territorial Claim Unit", embed.title)
+
+    @patch(OWNERS_PATH + ".STRUCTURES_FEATURE_SKYHOOKS", True)
+    def test_should_fetch_new_skyhooks_from_esi(
+        self, mock_esi_2, mock_esi, mock_execute
+    ):
+        # given
+        owner = OwnerFactory()
+        structure = SkyhookFactory(owner=owner)
+        eve_planet = EvePlanet.objects.get(id=40161469)
+        corporation_id = owner.corporation.corporation_id
+        endpoints = [
+            EsiEndpoint(
+                "Assets",
+                "get_corporations_corporation_id_assets",
+                "corporation_id",
+                needs_token=True,
+                data={
+                    str(corporation_id): [
+                        {
+                            "is_singleton": True,
+                            "item_id": structure.id,
+                            "location_flag": "AutoFit",
+                            "location_id": 30002537,
+                            "location_type": "solar_system",
+                            "quantity": 1,
+                            "type_id": 81080,
+                        },
+                    ]
+                },
+            ),
+            EsiEndpoint(
+                "Assets",
+                "post_corporations_corporation_id_assets_names",
+                "corporation_id",
+                needs_token=True,
+                data={str(corporation_id): []},
+            ),
+            EsiEndpoint(
+                "Assets",
+                "post_corporations_corporation_id_assets_locations",
+                "corporation_id",
+                needs_token=True,
+                data={
+                    str(corporation_id): [
+                        {"item_id": structure.id, "position": {"x": 1, "y": 2, "z": 3}}
+                    ]
+                },
+            ),
+            EsiEndpoint(
+                "Corporation",
+                "get_corporations_corporation_id_starbases",
+                "corporation_id",
+                needs_token=True,
+                data={str(corporation_id): []},
+            ),
+            EsiEndpoint(
+                "Corporation",
+                "get_corporations_corporation_id_structures",
+                "corporation_id",
+                needs_token=True,
+                data={str(corporation_id): []},
+            ),
+            EsiEndpoint(
+                "Planetary_Interaction",
+                "get_corporations_corporation_id_customs_offices",
+                "corporation_id",
+                needs_token=True,
+                data={str(corporation_id): []},
+            ),
+            EsiEndpoint(
+                "Sovereignty",
+                "get_sovereignty_map",
+                needs_token=False,
+                data=[],
+            ),
+            EsiEndpoint(
+                "Universe",
+                "get_universe_structures_structure_id",
+                "structure_id",
+                needs_token=True,
+                data={},
+            ),
+        ]
+        mock_esi.client = mock_esi_2.client = EsiClientStub.create_from_endpoints(
+            endpoints
+        )
+        structure_id = structure.id
+        structure.delete()
+        # when
+
+        with patch(OWNERS_PATH + ".EveSolarSystem.nearest_celestial") as m:
+            m.return_value = NearestCelestial(
+                eve_object=eve_planet,
+                distance=35_000_000,
+                eve_type=eve_planet.eve_type,
+            )
+            tasks.update_all_structures.delay()
+        # then
+        self.assertTrue(owner.structures.filter(id=structure_id).exists())

structures/tests/integration/test_views.py

@@ -46,7 +46,7 @@ class TestStructureListView(TestCase):
         # then
         self.assertEqual(response.status_code, 200)
         self.assertEqual(response.context["structures_count"], 2)
-        self.assertEqual(response.context["pocos_count"], 1)
+        self.assertEqual(response.context["orbitals_count"], 1)
         self.assertEqual(response.context["starbases_count"], 1)
         self.assertEqual(response.context["jump_gates_count"], 1)
         self.assertIn("data_export", response.context)

structures/tests/models/test_owners_5.py

@@ -7,18 +7,20 @@ from pytz import utc
 from django.test import override_settings
 from django.utils.timezone import now
 from esi.models import Token
+from eveuniverse.models import EvePlanet
 
 from app_utils.esi_testing import EsiClientStub, EsiEndpoint
 from app_utils.testing import BravadoResponseStub, NoSocketsTestCase, queryset_pks
 
 from structures.core.notification_types import NotificationType
-from structures.models import Notification, StructureItem
+from structures.models import Notification, Structure, StructureItem
 from structures.tests.testdata.factories import (
     EveCharacterFactory,
     EveCorporationInfoFactory,
     EveEntityCorporationFactory,
     JumpFuelAlertConfigFactory,
     OwnerFactory,
+    SkyhookFactory,
     StarbaseFactory,
     StructureFactory,
     StructureItemFactory,
@@ -27,6 +29,7 @@ from structures.tests.testdata.factories import (
     datetime_to_esi,
 )
 from structures.tests.testdata.helpers import (
+    NearestCelestial,
     load_eve_entities,
     load_notification_entities,
 )
@@ -711,6 +714,137 @@ class TestOwnerUpdateAssetEsi(NoSocketsTestCase):
         self.assertTrue(structure.items.filter(id=1300000003001).exists())
 
 
+@patch(OWNERS_PATH + ".STRUCTURES_FEATURE_SKYHOOKS", True)
+@patch(OWNERS_PATH + ".EveSolarSystem.nearest_celestial")
+@patch(OWNERS_PATH + ".esi")
+class TestOwnerUpdateSkyhooks(NoSocketsTestCase):
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+        load_eveuniverse()
+        cls.corporation = EveCharacterFactory()
+        character = EveCharacterFactory(corporation=cls.corporation)
+        cls.user = UserMainDefaultOwnerFactory(main_character__character=character)
+        cls.planet = EvePlanet.objects.get(id=40161469)
+        endpoints = [
+            EsiEndpoint(
+                "Assets",
+                "get_corporations_corporation_id_assets",
+                "corporation_id",
+                needs_token=True,
+                data={
+                    f"{cls.corporation.corporation_id}": [
+                        {
+                            "is_singleton": True,
+                            "item_id": 1000000010001,
+                            "location_flag": "AutoFit",
+                            "location_id": 30002537,
+                            "location_type": "solar_system",
+                            "quantity": 1,
+                            "type_id": 81080,
+                        },
+                    ],
+                },
+            ),
+            EsiEndpoint(
+                "Assets",
+                "post_corporations_corporation_id_assets_locations",
+                "corporation_id",
+                needs_token=True,
+                data={
+                    f"{cls.corporation.corporation_id}": [
+                        {"item_id": 1000000010001, "position": {"x": 1, "y": 2, "z": 3}}
+                    ]
+                },
+            ),
+        ]
+        cls.esi_client_stub = EsiClientStub.create_from_endpoints(endpoints)
+
+    def test_should_create_new_skyhooks_from_scratch(
+        self, mock_esi, mock_nearest_celestial
+    ):
+        # given
+        mock_esi.client = self.esi_client_stub
+        mock_nearest_celestial.return_value = NearestCelestial(
+            eve_object=self.planet, distance=35_000_000, eve_type=self.planet.eve_type
+        )
+        owner = OwnerFactory(user=self.user, assets_last_update_at=None)
+        # when
+        owner.update_asset_esi()
+        # then
+        owner.refresh_from_db()
+        self.assertEqual(owner.structures.count(), 1)
+        obj: Structure = owner.structures.get(pk=1000000010001)
+        self.assertTrue(obj.is_skyhook)
+        self.assertEqual(obj.eve_planet, self.planet)
+
+    def test_should_remove_obsolete_skyhooks(self, mock_esi, mock_nearest_celestial):
+        # given
+        mock_esi.client = self.esi_client_stub
+        mock_nearest_celestial.return_value = NearestCelestial(
+            eve_object=self.planet, distance=35_000_000, eve_type=self.planet.eve_type
+        )
+        owner = OwnerFactory(user=self.user, assets_last_update_at=None)
+        SkyhookFactory.create(owner=owner)
+        # when
+        owner.update_asset_esi()
+        # then
+        owner.refresh_from_db()
+        self.assertEqual(owner.structures.count(), 1)
+        obj: Structure = owner.structures.get(pk=1000000010001)
+        self.assertTrue(obj.is_skyhook)
+        self.assertEqual(obj.eve_planet, self.planet)
+
+    def test_should_update_existing_skyhook(self, mock_esi, mock_nearest_celestial):
+        # given
+        mock_esi.client = self.esi_client_stub
+        mock_nearest_celestial.return_value = NearestCelestial(
+            eve_object=self.planet, distance=35_000_000, eve_type=self.planet.eve_type
+        )
+        owner = OwnerFactory(user=self.user, assets_last_update_at=None)
+        SkyhookFactory.create(owner=owner, id=1000000010001, eve_planet_name="Thera I")
+        # when
+        owner.update_asset_esi()
+        # then
+        owner.refresh_from_db()
+        self.assertEqual(owner.structures.count(), 1)
+        obj: Structure = owner.structures.get(pk=1000000010001)
+        self.assertTrue(obj.is_skyhook)
+        self.assertEqual(obj.eve_planet, self.planet)
+
+    def test_should_ignore_os_error_when_resolving_planet(
+        self, mock_esi, mock_nearest_celestial
+    ):
+        # given
+        mock_esi.client = self.esi_client_stub
+        mock_nearest_celestial.side_effect = OSError
+        owner = OwnerFactory(user=self.user, assets_last_update_at=None)
+        # when
+        owner.update_asset_esi()
+        # then
+        owner.refresh_from_db()
+        self.assertEqual(owner.structures.count(), 1)
+        obj: Structure = owner.structures.get(pk=1000000010001)
+        self.assertTrue(obj.is_skyhook)
+        self.assertIsNone(obj.eve_planet)
+
+    def test_should_ignore_no_reply_when_resolving_planet(
+        self, mock_esi, mock_nearest_celestial
+    ):
+        # given
+        mock_esi.client = self.esi_client_stub
+        mock_nearest_celestial.return_value = None
+        owner = OwnerFactory(user=self.user, assets_last_update_at=None)
+        # when
+        owner.update_asset_esi()
+        # then
+        owner.refresh_from_db()
+        self.assertEqual(owner.structures.count(), 1)
+        obj: Structure = owner.structures.get(pk=1000000010001)
+        self.assertTrue(obj.is_skyhook)
+        self.assertIsNone(obj.eve_planet)
+
+
 class TestOwnerToken(NoSocketsTestCase):
     def test_should_return_valid_token(self):
         # given

structures/tests/models/test_structures.py

@@ -29,6 +29,7 @@ from structures.tests.testdata.factories import (
     OwnerFactory,
     PocoDetailsFactory,
     PocoFactory,
+    SkyhookFactory,
     StarbaseFactory,
     StructureFactory,
     StructureItemFactory,
@@ -367,48 +368,6 @@ class TestStructure(NoSocketsTestCase):
         # when/then
         self.assertEqual(obj.location_name, "?")
 
-    def test_is_poco(self):
-        # given
-        structure = StructureFactory.build(owner=self.owner)
-        poco = PocoFactory.build(owner=self.owner)
-        starbase = StarbaseFactory.build(owner=self.owner)
-        # then
-        self.assertFalse(structure.is_poco)
-        self.assertTrue(poco.is_poco)
-        self.assertFalse(starbase.is_poco)
-
-    def test_is_starbase(self):
-        # given
-        structure = StructureFactory.build(owner=self.owner)
-        poco = PocoFactory.build(owner=self.owner)
-        starbase = StarbaseFactory.build(owner=self.owner)
-        # then
-        self.assertFalse(structure.is_starbase)
-        self.assertFalse(poco.is_starbase)
-        self.assertTrue(starbase.is_starbase)
-
-    def test_is_upwell_structure(self):
-        # given
-        structure = StructureFactory.build(owner=self.owner)
-        poco = PocoFactory.build(owner=self.owner)
-        starbase = StarbaseFactory.build(owner=self.owner)
-        # then
-        self.assertTrue(structure.is_upwell_structure)
-        self.assertFalse(poco.is_upwell_structure)
-        self.assertFalse(starbase.is_upwell_structure)
-
-    def test_is_jump_gate(self):
-        # given
-        normal_structure = StructureFactory.build(owner=self.owner)
-        poco = PocoFactory.build(owner=self.owner)
-        starbase = StarbaseFactory.build(owner=self.owner)
-        jump_gate = JumpGateFactory.build(owner=self.owner)
-        # then
-        self.assertFalse(normal_structure.is_jump_gate)
-        self.assertFalse(poco.is_jump_gate)
-        self.assertFalse(starbase.is_jump_gate)
-        self.assertTrue(jump_gate.is_jump_gate)
-
     # TODO: activate
     # def test_is_upwell_structure_data_error(self):
     #     # group without a category
@@ -490,6 +449,54 @@ class TestStructure(NoSocketsTestCase):
         self.assertFalse(obj.owner_has_sov())
 
 
+class TestStructureIsX(NoSocketsTestCase):
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+        load_eveuniverse()
+        cls.owner = OwnerFactory()
+        cls.jump_gate = JumpGateFactory.build(owner=cls.owner)
+        cls.poco = PocoFactory.build(owner=cls.owner)
+        cls.skyhook = SkyhookFactory.build(owner=cls.owner)
+        cls.starbase = StarbaseFactory.build(owner=cls.owner)
+        cls.upwell_structure = StructureFactory.build(owner=cls.owner)
+
+    def test_is_jump_gate(self):
+        self.assertFalse(self.upwell_structure.is_jump_gate)
+        self.assertFalse(self.poco.is_jump_gate)
+        self.assertFalse(self.starbase.is_jump_gate)
+        self.assertTrue(self.jump_gate.is_jump_gate)
+        self.assertFalse(self.skyhook.is_jump_gate)
+
+    def test_is_poco(self):
+        self.assertFalse(self.upwell_structure.is_poco)
+        self.assertTrue(self.poco.is_poco)
+        self.assertFalse(self.starbase.is_poco)
+        self.assertFalse(self.jump_gate.is_poco)
+        self.assertFalse(self.skyhook.is_poco)
+
+    def test_is_starbase(self):
+        self.assertFalse(self.upwell_structure.is_starbase)
+        self.assertFalse(self.poco.is_starbase)
+        self.assertTrue(self.starbase.is_starbase)
+        self.assertFalse(self.jump_gate.is_starbase)
+        self.assertFalse(self.skyhook.is_starbase)
+
+    def test_is_skyhook(self):
+        self.assertFalse(self.upwell_structure.is_skyhook)
+        self.assertFalse(self.poco.is_skyhook)
+        self.assertFalse(self.starbase.is_skyhook)
+        self.assertFalse(self.jump_gate.is_skyhook)
+        self.assertTrue(self.skyhook.is_skyhook)
+
+    def test_is_upwell_structure(self):
+        self.assertTrue(self.upwell_structure.is_upwell_structure)
+        self.assertFalse(self.poco.is_upwell_structure)
+        self.assertFalse(self.starbase.is_upwell_structure)
+        self.assertTrue(self.jump_gate.is_upwell_structure)
+        self.assertFalse(self.skyhook.is_upwell_structure)
+
+
 class TestStructureFuel(NoSocketsTestCase):
     @classmethod
     def setUpClass(cls):

structures/tests/test_managers_1.py

@@ -25,6 +25,7 @@ from .testdata.factories import (
     EveSovereigntyMapFactory,
     OwnerFactory,
     PocoFactory,
+    SkyhookFactory,
     StarbaseFactory,
     StructureFactory,
     StructureTagFactory,
@@ -304,12 +305,15 @@ class TestStructureQuerySet(NoSocketsTestCase):
         cls.structure = StructureFactory(owner=cls.owner)
         cls.poco = PocoFactory(owner=cls.owner)
         cls.starbase = StarbaseFactory(owner=cls.owner)
+        cls.skyhook = SkyhookFactory(owner=cls.owner)
 
     def test_should_return_ids_as_set(self):
         # when
         ids = Structure.objects.ids()
         # then
-        self.assertSetEqual(ids, {self.structure.id, self.poco.id, self.starbase.id})
+        self.assertSetEqual(
+            ids, {self.structure.id, self.poco.id, self.starbase.id, self.skyhook.id}
+        )
 
     def test_should_filter_upwell_structures(self):
         # when
@@ -329,6 +333,12 @@ class TestStructureQuerySet(NoSocketsTestCase):
         # then
         self.assertSetEqual(result_qs.ids(), {self.starbase.id})
 
+    def test_should_filter_skyhooks(self):
+        # when
+        result_qs = Structure.objects.filter_skyhooks()
+        # then
+        self.assertSetEqual(result_qs.ids(), {self.skyhook.id})
+
 
 class TestStructureQuerySetVisibleForUser(NoSocketsTestCase):
     @classmethod

structures/tests/testdata/factories.py

@@ -476,6 +476,27 @@ class PocoDetailsFactory(
     standing_level = PocoDetails.StandingLevel.BAD
 
 
+class SkyhookFactory(StructureFactory):
+    class Params:
+        eve_planet_name = "Amamake V"
+
+    has_fitting = None
+    has_core = None
+    state = Structure.State.NA
+
+    @factory.lazy_attribute
+    def eve_planet(self):
+        return EvePlanet.objects.get(name=self.eve_planet_name)
+
+    @factory.lazy_attribute
+    def eve_solar_system(self):
+        return self.eve_planet.eve_solar_system
+
+    @factory.lazy_attribute
+    def eve_type(self):
+        return EveType.objects.get(id=EveTypeId.ORBITAL_SKYHOOK)
+
+
 class JumpGateFactory(StructureFactory):
     @factory.lazy_attribute
     def eve_type(self):

structures/tests/testdata/helpers.py

@@ -4,6 +4,7 @@ import datetime as dt
 import json
 import logging
 import unicodedata
+from collections import namedtuple
 from pathlib import Path
 from random import randrange
 
@@ -192,3 +193,8 @@ def datetime_to_ldap(my_dt: dt.datetime) -> int:
         ((my_dt - dt.datetime(1970, 1, 1, tzinfo=pytz.utc)).total_seconds())
         + 11644473600
     ) * 10000000
+
+
+NearestCelestial = namedtuple(
+    "NearestCelestial", ["eve_type", "eve_object", "distance"]
+)

structures/tests/views/test_structures.py

@@ -19,6 +19,7 @@ from structures.tests.testdata.factories import (
     JumpGateFactory,
     OwnerFactory,
     PocoFactory,
+    SkyhookFactory,
     StarbaseFactory,
     StructureFactory,
     StructureTagFactory,
@@ -148,6 +149,7 @@ class TestStructureListDataFilterVariant(TestCase):
         owner = OwnerFactory(user=cls.user)
         cls.structure = StructureFactory(owner=owner)
         cls.poco = PocoFactory(owner=owner)
+        cls.skyhook = SkyhookFactory(owner=owner)
         cls.starbase = StarbaseFactory(owner=owner)
         cls.jump_gate = JumpGateFactory(owner=owner)
 
@@ -163,17 +165,17 @@ class TestStructureListDataFilterVariant(TestCase):
         structure_ids = set(data.keys())
         self.assertSetEqual(structure_ids, {self.structure.id, self.jump_gate.id})
 
-    def test_should_return_pocos_only(self):
+    def test_should_return_orbitals_only(self):
         # given
         request = self.factory.get("/")
         request.user = self.user
         # when
-        response = structures.structure_list_data(request, "pocos")
+        response = structures.structure_list_data(request, "orbitals")
         # then
         self.assertEqual(response.status_code, 200)
         data = json_response_to_dict(response)
         structure_ids = set(data.keys())
-        self.assertSetEqual(structure_ids, {self.poco.id})
+        self.assertSetEqual(structure_ids, {self.poco.id, self.skyhook.id})
 
     def test_should_return_starbases_only(self):
         # given
@@ -211,7 +213,13 @@ class TestStructureListDataFilterVariant(TestCase):
         structure_ids = set(data.keys())
         self.assertSetEqual(
             structure_ids,
-            {self.structure.id, self.poco.id, self.starbase.id, self.jump_gate.id},
+            {
+                self.structure.id,
+                self.poco.id,
+                self.starbase.id,
+                self.jump_gate.id,
+                self.skyhook.id,
+            },
         )
 
     def test_should_raise_error_when_invalid_variant_requested(self):

structures/views/structures.py

@@ -58,7 +58,7 @@ class StructureSelection(str, Enum):
     """A pre-defined selection to filter structures data."""
 
     STRUCTURES = "structures"
-    POCOS = "pocos"
+    ORBITALS = "orbitals"
     STARBASES = "starbases"
     JUMP_GATES = "jump_gates"
     ALL = "all"
@@ -118,8 +118,8 @@ def structure_list(request: HttpRequest):
     structures_count = _structures_query(
         request.user, StructureSelection.STRUCTURES, tags
     ).count()
-    pocos_count = _structures_query(
-        request.user, StructureSelection.POCOS, tags
+    orbitals_count = _structures_query(
+        request.user, StructureSelection.ORBITALS, tags
     ).count()
     starbases_count = _structures_query(
         request.user, StructureSelection.STARBASES, tags
@@ -136,7 +136,7 @@ def structure_list(request: HttpRequest):
         "tags_exist": StructureTag.objects.exists(),
         "show_jump_gates_tab": STRUCTURES_SHOW_JUMP_GATES,
         "structures_count": structures_count,
-        "pocos_count": pocos_count,
+        "orbitals_count": orbitals_count,
         "starbases_count": starbases_count,
         "jump_gates_count": jump_gates_count,
         "data_export": data_export,
@@ -146,7 +146,7 @@ def structure_list(request: HttpRequest):
 
 def _construct_data_export(request, tags):
     structures_ajax_url = _construct_ajax_url(StructureSelection.STRUCTURES, tags)
-    pocos_ajax_url = _construct_ajax_url(StructureSelection.POCOS, tags)
+    pocos_ajax_url = _construct_ajax_url(StructureSelection.ORBITALS, tags)
     starbases_ajax_url = _construct_ajax_url(StructureSelection.STARBASES, tags)
     jump_gates_ajax_url = _construct_ajax_url(StructureSelection.JUMP_GATES, tags)
 
@@ -213,7 +213,7 @@ def _structures_query(
             eve_type__eve_group__eve_category_id=EveCategoryId.STRUCTURE
         )
 
-    elif selection == StructureSelection.POCOS:
+    elif selection == StructureSelection.ORBITALS:
         structures_qs = structures_qs.filter(
             eve_type__eve_group__eve_category_id=EveCategoryId.ORBITAL
         ).annotate_has_poco_details()