From 249f89f0fef2b9e32e5592d8a5a528a81c09ce8c Mon Sep 17 00:00:00 2001 From: Phoebe Date: Sun, 25 Feb 2024 19:46:49 +0100 Subject: [PATCH] Add checks to ``Died`` event --- plugins/inara.py | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/plugins/inara.py b/plugins/inara.py index 0a18b9ae..ae416f84 100644 --- a/plugins/inara.py +++ b/plugins/inara.py @@ -1001,7 +1001,17 @@ def journal_entry( # noqa: C901, CCR001 elif 'KillerName' in entry: data['opponentName'] = entry['KillerName'] - new_add_event('addCommanderCombatDeath', entry['timestamp'], data) + elif 'KillerShip' in entry: + data['opponentName'] = entry['KillerShip'] + + # Paranoia in case of e.g. Thargoid activity not having complete data + opponent_name_issue = 'opponentName' not in data or data['opponentName'] == "" + wing_opponent_names_issue = 'wingOpponentNames' not in data or data['wingOpponentNames'] == [] + if opponent_name_issue and wing_opponent_names_issue: + logger.warning('Dropping addCommanderCombatDeath message because opponentName and wingOpponentNames came out as ""') + + else: + new_add_event('addCommanderCombatDeath', entry['timestamp'], data) elif event_name == 'Interdicted': data = {