aa-killtracker 0.17.0__py3-none-any.whl → 0.18.0a2__py3-none-any.whl

{aa_killtracker-0.17.0.dist-info → aa_killtracker-0.18.0a2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aa-killtracker
-Version: 0.17.0
+Version: 0.18.0a2
 Summary: An app for running killmail trackers with Alliance Auth and Discord.
 Author-email: Erik Kalkoken <kalkoken87@gmail.com>
 Requires-Python: >=3.8

{aa_killtracker-0.17.0.dist-info → aa_killtracker-0.18.0a2.dist-info}/RECORD

@@ -1,17 +1,19 @@
-killtracker/__init__.py,sha256=g8DgOYglXz6Q4YuXHKdw2HdUBMexl4BSn7RbdC-hnGo,355
-killtracker/admin.py,sha256=s_O86Ct4prno0cQJE8otumCEqgkZ7H3Q_GFptEOTI_c,14103
-killtracker/app_settings.py,sha256=8owiemErRDKxkYY4XB0vFHTI9EqRMjz2SZGTTsEA2ao,3886
-killtracker/apps.py,sha256=yYOv4_T_eIiK5M7gr9Dre20WaNQXRKYOdfKyrforNhM,380
+killtracker/__init__.py,sha256=6BDL-xJ19nYjor-SkiCJL5oH0bqet4neHQ2sXqb_Hm8,357
+killtracker/admin.py,sha256=HkpfXq0KhqgLjt4kpe8PigonZ-5_ZKQ6D-Z_l3b3jB0,14235
+killtracker/app_settings.py,sha256=lJ0T86Nmh2dP050mM5hu-OfqIhjic_H5GveYAAKWI3c,4016
+killtracker/apps.py,sha256=lWolk2CVEHPNIMEylbK2fSuCSTRW1n6LBmiDjLoqqq4,384
 killtracker/checks.py,sha256=ytqWlhIbCsvGKi3xFbUvAZzbUlgOhiOrB67PZ2WfxM4,1311
 killtracker/constants.py,sha256=W7-VARE3B4_sdzV_9k7qunUzlxTcdSAeSp_ZJVnbUhw,2514
 killtracker/exceptions.py,sha256=aFY6qxQOta1V-qvgKp19Cgy6M16O7Si8moc2205OsX0,846
-killtracker/forms.py,sha256=BqJYcAQ9jbZxTkDsHxrxj0qKKTIGIW0mShbBYdCDlaA,5182
-killtracker/managers.py,sha256=JCrfc3yrKD4uHCfIzPu7y2HF-VIJm1yskdc-CFEf7V4,4390
-killtracker/providers.py,sha256=smkZe_rKHkZeWFzJ0RhIhJVcbrZUpLYR5fKCge-dpXY,348
-killtracker/tasks.py,sha256=GNdX1BGTWgR_wD_Eep6ibPHqC-PFIeVXDiyIJE7vW-E,8109
+killtracker/forms.py,sha256=SUM0U-Sa6FPcGVpsYJbVxHfEtf7hb1Qc_l92Zfa1OLk,5193
+killtracker/managers.py,sha256=lufSPdNrU7KXLfhwvFU82hEsBH--eNMSlCVlFuZYYuI,4422
+killtracker/providers.py,sha256=3DiOlklBq5kLGDV9nMlMbP2-S8AodNgR6gtB4cWWCUo,358
+killtracker/signals.py,sha256=IgULFrfq7m6-glWGyWisNjnom9_q40-XK56Yld1lNi8,906
+killtracker/tasks.py,sha256=sIZsWrJM8QR2aDXEmjH8u_FT8gjzqlKifaQoTPSxnXo,9208
 killtracker/core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-killtracker/core/discord_messages.py,sha256=mOKiMWq-3WnaSUFbfgVmlkAedGTZ7OWcVxLp7n58-Z0,14132
-killtracker/core/killmails.py,sha256=v7ciMSPHyIg4L4d-Q8UECuqJShfxfd3g_sdfRnKKSPY,20499
+killtracker/core/discord_messages.py,sha256=zepZ90-xtfvPafG0dIZYUWprozOi5I4Kjoj0jEQG5_U,16602
+killtracker/core/killmails.py,sha256=6n2nuhiPbIQXJUf63E_3coGOQmJajx2QeDofO5FioRs,21842
+killtracker/core/worker_shutdown.py,sha256=HHLR5DjLV67Sb3TDssoUnoOWO6_gcUkoov2aKV5qRNE,1289
 killtracker/management/commands/killtracker_load_eve.py,sha256=5P2wr6LU-EMl9_gG-DKP2yw3eFXOU7ApeuGAWEbvCKk,1159
 killtracker/migrations/0001_initial_new.py,sha256=WszI5DmNFtk45IZ2Zul3_Ak-VXmye9ffJKFAsGIxoXA,27818
 killtracker/migrations/0001_squashed_all.py,sha256=KXwOcRayjGGGmleg7-aTcXeIi-92Mn4BaGkEY3iE9Vc,26221
@@ -29,8 +31,8 @@ killtracker/migrations/0009_remove_old_models.py,sha256=bDIz0hywpFKbHYhdXFXzra5D
 killtracker/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 killtracker/models/__init__.py,sha256=WL6VD9MK7EsZot_RLPz0nX8WxJkp7RtQpw_mYpnVqu8,188
 killtracker/models/killmails.py,sha256=CCdrHkwUSoTOGqavG-TpMxDRleF9UEacOTui8v3-VT8,5181
-killtracker/models/trackers.py,sha256=t3pm29UW_0JqBgHbU0Xx1qgLyft7_EjNtKCJ37OM_fE,31188
-killtracker/models/webhooks.py,sha256=hh1mYE4pBU26YFawkv1z-j4uyX8aT25B0crOTsocSSY,8268
+killtracker/models/trackers.py,sha256=ATbwaQRYO6WgVt5rY3WZicB7D-08EmdDKdJ3WN949dY,31121
+killtracker/models/webhooks.py,sha256=J4e5VupEpvcC-hWDg8BZ4ZrCSkqGFinGUDx95FKe52U,7593
 killtracker/static/killtracker/killtracker_logo.png,sha256=3jc9zmYHqP60Np5piP5RfkX0_II-315DNjZ4FRGbqKc,74625
 killtracker/static/killtracker/zkb_icon.png,sha256=wuVfgyTbTs9qS4KGbDAH3Q9KVPgHqYV5eaVrjEmTjsE,328
 killtracker/templates/admin/killtracker/tracker/killmail_test.html,sha256=TI2ON8qf9pW4rX6G7pT990ZadkipwncQgGUC0FPcWQY,649
@@ -38,17 +40,19 @@ killtracker/tests/__init__.py,sha256=CEt5qqp6ptDrx1lwuA6epZ5bzh1CwUJYXeMZqWK9jT0
 killtracker/tests/test_admin.py,sha256=XFAlF_Q4h5Z_agkmRtB30GmCayqQPblLolFrN41xu7Q,5659
 killtracker/tests/test_admin_2.py,sha256=rP0EscM9qUil_ZuXute3R8TQY2P5XSjmxHLbziCGcVw,1140
 killtracker/tests/test_exceptions.py,sha256=wheTwm0JOBqYVI-DJM4KK2usFAZT1Q-O52VMOnSAz8Y,326
-killtracker/tests/test_integration.py,sha256=EX0IQGU_Vwsmjeoqeprg13VuW8AT9I8CT1bm3_cvfPs,3226
-killtracker/tests/test_tasks.py,sha256=ZDoCUBd-1kSOKrvSeTrlDaSGFmzHieT5ef0iBz6nr2I,13929
+killtracker/tests/test_integration.py,sha256=d1W7102L1_fOUmQJpvPE_5ldJf9iZRrj3LfMsTvtGBo,3245
+killtracker/tests/test_tasks.py,sha256=eaxmImSJvYZneQqv5pYb5due0oS90JvLR0DHtGvyEh4,15990
+killtracker/tests/utils.py,sha256=lpWD3peOyxiwq7z8kO4GLQl98kZ4mEcWgyuUTCUSp_Y,442
 killtracker/tests/core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-killtracker/tests/core/test_discord_messages_1.py,sha256=1cYpj4E9pNqQOeE7yWeV1mme-JYGIHfSIibOauEHi88,3101
-killtracker/tests/core/test_discord_messages_2.py,sha256=AppA_FUFQA5I35UKjaEwn_ZQcnscqillR1SIo1unwJg,4774
-killtracker/tests/core/test_killmails.py,sha256=OFV6EbERi0UyMzXblLsNoJrPbLSIgtA27Wt9vGwOYd8,14349
+killtracker/tests/core/test_discord_messages_1.py,sha256=P-s-zmStMi6fd0yrtKQJxiCVnD1GFF4JJ6ffrIXzYOw,4624
+killtracker/tests/core/test_discord_messages_2.py,sha256=r-NwE_bpJSnedw3nIyad9XWgLa5ly6UPgYB-A7Mba30,4782
+killtracker/tests/core/test_killmails.py,sha256=S08P50xMgq_hiKLeuryAcOI0hN3CnI-jzHKQaN9G5UU,16114
+killtracker/tests/core/test_worker_shutdown.py,sha256=wg0fJQKVPibpRbBfoPCQZycl4rRSGRr6hrYxcRhtEnc,1014
 killtracker/tests/models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 killtracker/tests/models/test_killmails.py,sha256=0ytwIGbTPb1OTzmK8B9VnR1ylxMuaYtp2tvCXzNOwNc,8293
-killtracker/tests/models/test_trackers_1.py,sha256=_ARZKBrQz0QF6_OZEOFOsTqNdfflz7wWenAT-T35nqU,42771
-killtracker/tests/models/test_trackers_2.py,sha256=FmtaWBjV32NlIjYPaG5Kh87oES5ChoDMVJ4ol2uWopE,5404
-killtracker/tests/models/test_webhook.py,sha256=E4BgmQw9mI5ZenV6ncYHbBonlEeWvvdilAS8IKFkbjw,5246
+killtracker/tests/models/test_trackers_1.py,sha256=7DqrF7LE0jJn1ATOQRU8BPcqsvgUIx2ccabOUYsCN-o,42794
+killtracker/tests/models/test_trackers_2.py,sha256=kPCZuS9N3GUtoauMR96aZv9VI5ShAIQpJZLyo0SPOQM,5473
+killtracker/tests/models/test_webhook.py,sha256=VeBm5qdBUHcauFfH2-OoaD8uplqv4D3l2TtVrS5iQzc,6116
 killtracker/tests/testdata/__init__.py,sha256=9aQhf8V-DseZMWjJ_QMXOba6CypoHFSVpYRZEUh-oFc,212
 killtracker/tests/testdata/create_eveuniverse.py,sha256=Ewr5OBiQwjK1kwDCRh3A3f0Z-CCPi8Gp8dpsPgVAU4A,966
 killtracker/tests/testdata/evealliances.json,sha256=i6udrtUnWQjn71Iw17WWz9Eb1fdGUNhI1UYLt0hZHog,307
@@ -61,7 +65,7 @@ killtracker/tests/testdata/killmails.json,sha256=HKfpXQJ_ikymBSewh4wWixYpLwC3kNB
 killtracker/tests/testdata/load_eveuniverse.py,sha256=FitVc12E_ob56ezK5Y1q07Kbyc7N8poHiCNaLRGU4Jg,388
 killtracker/tools/drop_tables_killtracker.sql,sha256=fJrGY23NKRunpYC3hI-klFkWub4sBuhfP8TaT__zjPg,1726
 killtracker/tools/generate_conditions_text.py,sha256=LxAtTQIX-IbuqaNDMV1XHhq5AbrrlwxLWgXa1M7DWQo,767
-aa_killtracker-0.17.0.dist-info/licenses/LICENSE,sha256=XZiwB_S_40_HhnvLg5xvtBb3g1oGjPrk0rpFwk8iInE,1070
-aa_killtracker-0.17.0.dist-info/WHEEL,sha256=G2gURzTEtmeR8nrdXUJfNiB3VYVxigPQ-bEQujpNiNs,82
-aa_killtracker-0.17.0.dist-info/METADATA,sha256=ixjtGgUPTMWb4glIZb_EmI-WZMdl9R9BLLR-aUlV9Gg,13927
-aa_killtracker-0.17.0.dist-info/RECORD,,
+aa_killtracker-0.18.0a2.dist-info/licenses/LICENSE,sha256=XZiwB_S_40_HhnvLg5xvtBb3g1oGjPrk0rpFwk8iInE,1070
+aa_killtracker-0.18.0a2.dist-info/WHEEL,sha256=G2gURzTEtmeR8nrdXUJfNiB3VYVxigPQ-bEQujpNiNs,82
+aa_killtracker-0.18.0a2.dist-info/METADATA,sha256=7xoqmIUN3AAKkHhGvuL04Fd3wP9QLCZEkPm4o2oH4l0,13929
+aa_killtracker-0.18.0a2.dist-info/RECORD,,

killtracker/__init__.py

@@ -3,7 +3,7 @@
 # pylint: disable = invalid-name
 default_app_config = "killtracker.apps.KillmailsConfig"
 
-__version__ = "0.17.0"
+__version__ = "0.18.0a2"
 __title__ = "Killtracker"
 
 APP_NAME = "aa-killtracker"

killtracker/admin.py

@@ -4,16 +4,21 @@
 
 
 from django.contrib import admin
+from django.db.models import QuerySet
 from django.http import HttpResponseRedirect
 from django.shortcuts import render
 from django.utils.safestring import mark_safe
 
 from allianceauth import NAME as site_header
 
-from . import tasks
-from .core.killmails import Killmail
-from .forms import TrackerAdminForm, TrackerAdminKillmailIdForm, field_nice_display
-from .models import EveKillmail, EveKillmailAttacker, Tracker, Webhook
+from killtracker import tasks
+from killtracker.core.killmails import Killmail
+from killtracker.forms import (
+    TrackerAdminForm,
+    TrackerAdminKillmailIdForm,
+    field_nice_display,
+)
+from killtracker.models import EveKillmail, EveKillmailAttacker, Tracker, Webhook
 
 
 class EveKillmailAttackerInline(admin.TabularInline):
@@ -46,17 +51,17 @@ class WebhookAdmin(admin.ModelAdmin):
     list_filter = ("is_enabled",)
     ordering = ("name",)
 
-    def _messages_in_queue(self, obj):
-        return obj.main_queue.size()
+    def _messages_in_queue(self, obj: Webhook):
+        return obj.messages_queued()
 
     actions = ["send_test_message", "purge_messages"]
 
     @admin.display(description="Purge queued messages of selected webhooks")
-    def purge_messages(self, request, queryset):
+    def purge_messages(self, request, queryset: QuerySet[Webhook]):
         actions_count = 0
         killmails_deleted = 0
         for webhook in queryset:
-            killmails_deleted += webhook.main_queue.clear()
+            killmails_deleted += webhook.delete_queued_messages()
             actions_count += 1
         self.message_user(
             request,

killtracker/app_settings.py

@@ -6,7 +6,7 @@ KILLTRACKER_REDISQ_LOCK_TIMEOUT = clean_setting("KILLTRACKER_REDISQ_LOCK_TIMEOUT
 """Timeout for lock to ensure atomic access to ZKB RedisQ."""
 
 KILLTRACKER_KILLMAIL_MAX_AGE_FOR_TRACKER = clean_setting(
-    "KILLTRACKER_KILLMAIL_MAX_AGE_FOR_TRACKER", 60
+    "KILLTRACKER_KILLMAIL_MAX_AGE_FOR_TRACKER", 600
 )
 """Ignore killmails that are older than the given number in minutes
 sometimes killmails appear belated on ZKB,
@@ -14,7 +14,7 @@ this feature ensures they don't create new alerts.
 """
 
 KILLTRACKER_MAX_KILLMAILS_PER_RUN = clean_setting(
-    "KILLTRACKER_MAX_KILLMAILS_PER_RUN", 100
+    "KILLTRACKER_MAX_KILLMAILS_PER_RUN", 500
 )
 """Maximum number of killmails retrieved from ZKB by task run."""
 
@@ -62,11 +62,14 @@ when creating trackers.
 #####################
 # INTERNAL SETTINGS
 
-KILLTRACKER_REDISQ_TTW = clean_setting("KILLTRACKER_REDISQ_TTW", 5)
+KILLTRACKER_REDISQ_TTW = clean_setting("KILLTRACKER_REDISQ_TTW", 1)
 """Max duration to wait for new killmails from redisq in seconds."""
 
 KILLTRACKER_TASKS_TIMEOUT = clean_setting("KILLTRACKER_TASKS_TIMEOUT", 1_800)
-"""Tasks hard timeout."""
+"""Tasks hard timeout in seconds."""
+
+KILLTRACKER_RUN_TIMEOUT = clean_setting("KILLTRACKER_RUN_TIMEOUT", 55)
+"""Timeout for killtracker run in seconds."""
 
 KILLTRACKER_DISCORD_SEND_DELAY = clean_setting(
     "KILLTRACKER_DISCORD_SEND_DELAY", default_value=2, min_value=1, max_value=900

killtracker/apps.py

@@ -9,7 +9,5 @@ class KillmailsConfig(AppConfig):
     verbose_name = f"Killtracker v{__version__}"
 
     def ready(self) -> None:
-        from . import checks  # noqa: F401 pylint: disable=unused-import
-        from .core.killmails import Killmail
-
-        Killmail.reset_lock_key()
+        import killtracker.checks  # noqa: F401 pylint: disable=unused-import
+        import killtracker.signals  # noqa: F401 pylint: disable=unused-import

killtracker/core/discord_messages.py

@@ -1,6 +1,11 @@
-"""Create discord messages from killmails."""
+"""This module allows to create Discord messages from killmails."""
 
-from typing import NamedTuple, Optional
+from __future__ import annotations
+
+import json
+from copy import copy
+from dataclasses import dataclass
+from typing import TYPE_CHECKING, List, Optional
 
 import dhooks_lite
 from requests.exceptions import HTTPError
@@ -11,38 +16,116 @@ from eveuniverse.models import EveEntity, EveSolarSystem
 from allianceauth.eveonline.evelinks import dotlan, eveimageserver, zkillboard
 from allianceauth.services.hooks import get_extension_logger
 from app_utils.django import app_labels
+from app_utils.json import JSONDateTimeDecoder, JSONDateTimeEncoder
 from app_utils.logging import LoggerAddTag
 from app_utils.urls import static_file_absolute_url
 from app_utils.views import humanize_value
 
 from killtracker import __title__
-from killtracker.models import Tracker
 
 from .killmails import ZKB_KILLMAIL_BASEURL, Killmail, TrackerInfo
 
-ICON_SIZE = 128
+if TYPE_CHECKING:
+    from killtracker.models import Tracker
+
+
+_ICON_SIZE = 128
 
 
 logger = LoggerAddTag(get_extension_logger(__name__), __title__)
 
 
-class MainOrgInfo(NamedTuple):
+@dataclass
+class DiscordMessage:
+    """A Discord message created from a Killmail."""
+
+    avatar_url: Optional[str] = None
+    content: Optional[str] = None
+    embeds: Optional[List[dhooks_lite.Embed]] = None
+    killmail_id: int = 0  # Killmail ID this message from created from
+    tts: Optional[bool] = None
+    username: Optional[str] = None
+
+    def __post_init__(self):
+        if not self.content and not self.embeds:
+            raise ValueError("Message must have content or embeds to be valid")
+
+    def to_json(self) -> str:
+        """Converts a Discord message into a JSON object and returns it."""
+
+        if self.embeds:
+            embeds_list = [obj.asdict() for obj in self.embeds]
+        else:
+            embeds_list = None
+
+        message = {}
+        if self.killmail_id:
+            message["killmail_id"] = self.killmail_id
+        if self.content:
+            message["content"] = self.content
+        if embeds_list:
+            message["embeds"] = embeds_list
+        if self.tts:
+            message["tts"] = self.tts
+        if self.username:
+            message["username"] = self.username
+        if self.avatar_url:
+            message["avatar_url"] = self.avatar_url
+
+        return json.dumps(message, cls=JSONDateTimeEncoder)
+
+    @classmethod
+    def from_json(cls, s: str) -> "DiscordMessage":
+        """Creates a DiscordMessage object from an JSON object and returns it."""
+        message1: dict = json.loads(s, cls=JSONDateTimeDecoder)
+        message2 = copy(message1)
+        if message1.get("embeds"):
+            message2["embeds"] = [
+                dhooks_lite.Embed.from_dict(embed_dict)
+                for embed_dict in message1.get("embeds")
+            ]
+        else:
+            message2["embeds"] = None
+        return cls(**message2)
+
+    @classmethod
+    def from_killmail(
+        cls, tracker: Tracker, killmail: Killmail, intro_text: Optional[str] = None
+    ) -> "DiscordMessage":
+        """Creates a DiscordMessage object from a Killmail and returns it."""
+        m = DiscordMessage(
+            killmail_id=killmail.id,
+            content=_create_content(tracker, intro_text),
+            embeds=[_create_embed(tracker, killmail)],
+        )
+        return m
+
+
+@dataclass(frozen=True)
+class _MainOrgInfo:
     """Infos about a main organization."""
 
-    text: str = ""
+    icon_url: str = ""
     name: str = ""
-    icon_url: str = eveimageserver.alliance_logo_url(1, size=ICON_SIZE)
     show_as_fleet_kill: bool = False
+    text: str = ""
+
+    def __post_init__(self):
+        if self.icon_url == "":
+            icon_url = eveimageserver.alliance_logo_url(1, size=_ICON_SIZE)
+            object.__setattr__(self, "icon_url", icon_url)
 
 
-class FinalAttackerInfo(NamedTuple):
+@dataclass(frozen=True)
+class _FinalAttackerInfo:
     """Infos about the final attacker on a killmail."""
 
     name: str = ""
     ship_type: str = ""
 
 
-class VictimInfo(NamedTuple):
+@dataclass(frozen=True)
+class _VictimInfo:
     """Infos about the victim of a killmail."""
 
     name: str
@@ -53,9 +136,11 @@ class VictimInfo(NamedTuple):
     ship_type_icon_url: str
 
 
-def create_content(tracker: Tracker, intro_text: Optional[str] = None) -> str:
+def _create_content(tracker: Tracker, intro_text: Optional[str] = None) -> str:
     """Create content for Discord message for a killmail."""
 
+    from killtracker.models import Tracker
+
     intro_parts = []
 
     if tracker.ping_type == Tracker.ChannelPingType.EVERYBODY:
@@ -102,7 +187,7 @@ def _import_discord_user():
     return DiscordUser
 
 
-def create_embed(tracker: Tracker, killmail: Killmail) -> dhooks_lite.Embed:
+def _create_embed(tracker: Tracker, killmail: Killmail) -> dhooks_lite.Embed:
     """Create Discord embed for a killmail."""
 
     resolver: EveEntityNameResolver = EveEntity.objects.bulk_resolve_names(  # type: ignore
@@ -111,7 +196,7 @@ def create_embed(tracker: Tracker, killmail: Killmail) -> dhooks_lite.Embed:
 
     # self info
     distance_text = ""
-    main_org = MainOrgInfo()
+    main_org = _MainOrgInfo()
     main_ship_group_text = ""
     tracked_ship_types_text = ""
 
@@ -137,10 +222,24 @@ def create_embed(tracker: Tracker, killmail: Killmail) -> dhooks_lite.Embed:
     title = _calc_title(killmail, resolver, main_org, victim)
     thumbnail_url = _calc_thumbnail_url(victim, main_org)
 
-    return _create_embed(killmail, tracker, victim, description, title, thumbnail_url)
+    author = _calc_author(victim)
+    zkb_icon_url = static_file_absolute_url("killtracker/zkb_icon.png")
+    embed_color = int(tracker.color[1:], 16) if tracker and tracker.color else None
 
+    embed = dhooks_lite.Embed(
+        author=author,
+        description=description,
+        title=title,
+        url=f"{ZKB_KILLMAIL_BASEURL}{killmail.id}/",
+        thumbnail=dhooks_lite.Thumbnail(url=thumbnail_url),
+        footer=dhooks_lite.Footer(text="zKillboard", icon_url=zkb_icon_url),
+        timestamp=killmail.time,
+        color=embed_color,
+    )
+    return embed
 
-def _calc_author(victim: VictimInfo):
+
+def _calc_author(victim: _VictimInfo):
     # TODO This is a workaround for Embed.Author.name. Address in dhooks_lite
     return (
         dhooks_lite.Author(
@@ -158,10 +257,10 @@ def _calc_description(
     killmail: Killmail,
     resolver: EveEntityNameResolver,
     distance_text: str,
-    main_org: MainOrgInfo,
+    main_org: _MainOrgInfo,
     main_ship_group_text: str,
     tracked_ship_types_text: str,
-    victim: VictimInfo,
+    victim: _VictimInfo,
 ):
     solar_system_text = _calc_solar_system(tracker, killmail)
     total_value = (
@@ -186,18 +285,18 @@ def _calc_description(
 
 def _calc_victim(
     tracker: Tracker, killmail: Killmail, resolver: EveEntityNameResolver
-) -> VictimInfo:
+) -> _VictimInfo:
     if killmail.victim.alliance_id:
         victim_organization = resolver.to_name(killmail.victim.alliance_id)
         victim_org_url = zkillboard.alliance_url(killmail.victim.alliance_id)
         victim_org_icon_url = eveimageserver.alliance_logo_url(
-            killmail.victim.alliance_id, size=ICON_SIZE
+            killmail.victim.alliance_id, size=_ICON_SIZE
         )
     elif killmail.victim.corporation_id:
         victim_organization = resolver.to_name(killmail.victim.corporation_id)
         victim_org_url = zkillboard.corporation_url(killmail.victim.corporation_id)
         victim_org_icon_url = eveimageserver.corporation_logo_url(
-            killmail.victim.corporation_id, size=ICON_SIZE
+            killmail.victim.corporation_id, size=_ICON_SIZE
         )
     else:
         victim_organization = ""
@@ -229,12 +328,12 @@ def _calc_victim(
     ship_type = resolver.to_name(ship_type_id) if ship_type_id else ""
 
     ship_type_icon_url = (
-        eveimageserver.type_icon_url(ship_type_id, size=ICON_SIZE)
+        eveimageserver.type_icon_url(ship_type_id, size=_ICON_SIZE)
         if ship_type_id
         else ""
     )
 
-    return VictimInfo(
+    return _VictimInfo(
         organization=victim_organization,
         org_url=victim_org_url,
         org_icon_url=victim_org_icon_url,
@@ -246,7 +345,7 @@ def _calc_victim(
 
 def _calc_final_attacker(
     tracker: Tracker, killmail: Killmail, resolver: EveEntityNameResolver
-) -> FinalAttackerInfo:
+) -> _FinalAttackerInfo:
     for attacker in killmail.attackers:
         if attacker.is_final_blow:
             final_attacker = attacker
@@ -255,7 +354,7 @@ def _calc_final_attacker(
         final_attacker = None
 
     if not final_attacker:
-        return FinalAttackerInfo()
+        return _FinalAttackerInfo()
 
     if final_attacker.corporation_id:
         final_attacker_corporation_zkb_link = _corporation_zkb_link(
@@ -286,7 +385,7 @@ def _calc_final_attacker(
 
     ship_type = resolver.to_name(ship_type_id) if ship_type_id else ""
 
-    return FinalAttackerInfo(name=final_attacker_str, ship_type=ship_type)
+    return _FinalAttackerInfo(name=final_attacker_str, ship_type=ship_type)
 
 
 def _calc_solar_system(tracker: Tracker, killmail: Killmail):
@@ -338,12 +437,12 @@ def _calc_main_group(
         if main_org_entity.is_corporation:
             main_org_link = _corporation_zkb_link(tracker, main_org_entity.id, resolver)
             main_org_icon_url = eveimageserver.corporation_logo_url(
-                main_org_entity.id, size=ICON_SIZE
+                main_org_entity.id, size=_ICON_SIZE
             )
         else:
             main_org_link = _alliance_zkb_link(tracker, main_org_entity.id, resolver)
             main_org_icon_url = eveimageserver.alliance_logo_url(
-                main_org_entity.id, size=ICON_SIZE
+                main_org_entity.id, size=_ICON_SIZE
             )
         main_org_text = f" | Main group: {main_org_link} ({main_org_entity.count})"
         show_as_fleet_kill = tracker.identify_fleets
@@ -351,7 +450,7 @@ def _calc_main_group(
         show_as_fleet_kill = False
         main_org_text = main_org_name = main_org_icon_url = ""
 
-    return MainOrgInfo(
+    return _MainOrgInfo(
         text=main_org_text,
         name=main_org_name,
         icon_url=main_org_icon_url,
@@ -380,7 +479,7 @@ def _calc_tracked_ship_types(
     return f"\nTracked ship types involved: **{ship_types_text}**"
 
 
-def _calc_thumbnail_url(victim: VictimInfo, main_org: MainOrgInfo):
+def _calc_thumbnail_url(victim: _VictimInfo, main_org: _MainOrgInfo):
     if main_org.show_as_fleet_kill:
         return main_org.icon_url
 
@@ -390,8 +489,8 @@ def _calc_thumbnail_url(victim: VictimInfo, main_org: MainOrgInfo):
 def _calc_title(
     killmail: Killmail,
     resolver: EveEntityNameResolver,
-    main_org: MainOrgInfo,
-    victim: VictimInfo,
+    main_org: _MainOrgInfo,
+    victim: _VictimInfo,
 ):
     solar_system_name = (
         resolver.to_name(killmail.solar_system_id) if killmail.solar_system_id else ""
@@ -403,31 +502,6 @@ def _calc_title(
     return f"{solar_system_name} | {victim.ship_type} | Killmail"
 
 
-def _create_embed(
-    killmail: Killmail,
-    tracker: Tracker,
-    victim: VictimInfo,
-    description: str,
-    title: str,
-    thumbnail_url: str,
-):
-    author = _calc_author(victim)
-    zkb_icon_url = static_file_absolute_url("killtracker/zkb_icon.png")
-    embed_color = int(tracker.color[1:], 16) if tracker and tracker.color else None
-
-    embed = dhooks_lite.Embed(
-        author=author,
-        description=description,
-        title=title,
-        url=f"{ZKB_KILLMAIL_BASEURL}{killmail.id}/",
-        thumbnail=dhooks_lite.Thumbnail(url=thumbnail_url),
-        footer=dhooks_lite.Footer(text="zKillboard", icon_url=zkb_icon_url),
-        timestamp=killmail.time,
-        color=embed_color,
-    )
-    return embed
-
-
 def _character_zkb_link(
     tracker: Tracker, entity_id: int, resolver: EveEntityNameResolver
 ) -> str: