From 15ea858c6b777d8c98a7cf45393c3dad3438d44d Mon Sep 17 00:00:00 2001
From: Athanasius <github@miggy.org>
Date: Sun, 10 Oct 2021 14:55:46 +0100
Subject: [PATCH] EDDN: codexentry: Use BodyID if available

---
 plugins/eddn.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/plugins/eddn.py b/plugins/eddn.py
index d22b451d..48ed2b9f 100644
--- a/plugins/eddn.py
+++ b/plugins/eddn.py
@@ -799,8 +799,13 @@ Msg:\n{msg}'''
         entry = ret
 
         # Body Name and ID, if available
+        # We only trust the Status.json value
         if this.status_body_name is not None:
             entry['BodyName'] = this.status_body_name
+            # And thus only set BodyID, which will be from journal events, if
+            # the Journal-sourced Body Name matches
+            if this.status_body_name == this.body_name:
+                entry['BodyID'] = this.body_id
         #######################################################################
 
         msg = {