ED/EDMarketConnector
1
0
Fork 0
mirror of https://github.com/EDCD/EDMarketConnector.git synced 2025-04-13 15:57:14 +03:00
Code Issues Projects Releases Wiki Activity

eddn: Ensure CAPI-sourced messages have uploaderID set

Browse Source 
If no 'live' Journal events yet, plugins/eddn won't have had an event to set
this from.
This commit is contained in:
Athanasius 2022-12-05 15:53:27 +00:00
parent 3ed568e544
commit 6bd48a163c
No known key found for this signature in database
GPG Key ID: 772697E181BB2767
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
plugins/eddn.py
View File

@ -2409,7 +2409,7 @@ def journal_entry( # noqa: C901, CCR001
return None
def cmdr_data(data: CAPIData, is_beta: bool) -> Optional[str]:
def cmdr_data(data: CAPIData, is_beta: bool) -> Optional[str]: # noqa: CCR001
"""
Process new CAPI data.
@ -2417,6 +2417,14 @@ def cmdr_data(data: CAPIData, is_beta: bool) -> Optional[str]:
:param is_beta: bool - True if this is a beta version of the Game.
:return: str - Error message, or `None` if no errors.
"""
# 'Update' can trigger CAPI queries before plugins have been fed any
# Journal events. So this.cmdr_name might not be set otherwise.
if (
not this.cmdr_name
and data.get('commander') and (cmdr_name := data['commander'].get('name'))
):
this.cmdr_name = cmdr_name
if (data['commander'].get('docked') or (this.on_foot and monitor.station)
and config.get_int('output') & config.OUT_EDDN_SEND_STATION_DATA):
try: