Merge branch 'hotfix/3.6.1'

CHANGELOG.md

@@ -1,5 +1,12 @@
 # Change Log
 
+## v3.6.1 - 2024-04-07
+
+### Bug Fixes:
+
+* For some CMDRS, TW system and station data was omitted for some systems.
+
+
 ## v3.6.0 - 2024-03-23
 
 ### New Features:

bgstally/activity.py

@@ -1244,15 +1244,8 @@ def _generate_tw_system_text(self, system: dict, discord: bool):
         # Force plain text if we are not posting to Discord
         fp:bool = not discord
 
-        # system_tw_enabled defaults to True. Set to False if any faction is disabled in the system
-        system_tw_enabled:bool = True
-
         # Faction-specific tally
         for faction in system['Factions'].values():
-            if faction['Enabled'] != CheckStates.STATE_ON:
-                system_tw_enabled = False
-                continue
-
             for station_name in faction.get('TWStations', {}):
                 faction_station = faction['TWStations'][station_name]
                 if faction_station['enabled'] != CheckStates.STATE_ON: continue
@@ -1285,8 +1278,6 @@ def _generate_tw_system_text(self, system: dict, discord: bool):
                 system_station['reactivate'] += faction_station['reactivate']
                 system_station['mission_count_total'] += faction_station['reactivate']
 
-        if not system_tw_enabled : return ""
-
         # System-specific tally
         kills:int = sum(system['TWKills'].values())
         sandr:int = sum(int(d['delivered']) for d in system['TWSandR'].values())

load.py

@@ -8,7 +8,7 @@
 from bgstally.debug import Debug
 
 PLUGIN_NAME = "BGS-Tally"
-PLUGIN_VERSION = semantic_version.Version.coerce("3.6.0")
+PLUGIN_VERSION = semantic_version.Version.coerce("3.6.1")
 
 # Initialise the main plugin class
 this:BGSTally = BGSTally(PLUGIN_NAME, PLUGIN_VERSION)