Fixed influence trend not showing

Elite-Kode · Feb 6, 2021 · 6d541bd · 6d541bd
1 parent a63f60e
commit 6d541bd
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 4 deletions.
diff --git a/src/modules/discord/commands/bgsReport.ts b/src/modules/discord/commands/bgsReport.ts
@@ -358,9 +358,12 @@ export class BGSReport {
                                 }
                                 if (primaryFactions.indexOf(faction.name) !== -1) {
                                     allMonitoredFactionsUsed.push(faction.name);
+                                    let filtered = systemResponse.faction_history.filter(factionEach => {
+                                        return factionEach.faction_name_lower === faction.name_lower;
+                                    });
                                     let influenceDifference = 0;
-                                    if (systemResponse.faction_history.length > 2) {
-                                        influenceDifference = influence - systemResponse.faction_history[1].influence;
+                                    if (filtered.length === 2) {
+                                        influenceDifference = influence - filtered[1].influence;
                                     }
                                     let influenceDifferenceText;
                                     if (influenceDifference > 0) {

diff --git a/src/modules/discord/commands/factionStatus.ts b/src/modules/discord/commands/factionStatus.ts
@@ -100,7 +100,7 @@ export class FactionStatus {
                                         return systemEach.system_lower === system.system_name_lower;
                                     });
                                     let influenceDifference = 0;
-                                    if (filtered.length > 2) {
+                                    if (filtered.length === 2) {
                                         influenceDifference = influence - filtered[1].influence;
                                     }
                                     let happiness = fdevIds.happiness[system.happiness].name;

diff --git a/src/modules/discord/commands/systemStatus.ts b/src/modules/discord/commands/systemStatus.ts
@@ -102,14 +102,29 @@ export class SystemStatus {
                                 minorFactions.forEach(faction => {
                                     let state = fdevIds.state[faction.faction_details.faction_presence.state].name;
                                     let influence = faction.faction_details.faction_presence.influence;
+                                    let filtered = responseSystem.faction_history.filter(factionEach => {
+                                        return factionEach.faction_name_lower === faction.name_lower;
+                                    });
+                                    let influenceDifference = 0;
+                                    if (filtered.length === 2) {
+                                        influenceDifference = influence - filtered[1].influence;
+                                    }
                                     let happiness = fdevIds.happiness[faction.faction_details.faction_presence.happiness].name;
                                     let activeStatesArray = faction.faction_details.faction_presence.active_states;
                                     let pendingStatesArray = faction.faction_details.faction_presence.pending_states;
                                     let recoveringStatesArray = faction.faction_details.faction_presence.recovering_states;
+                                    let influenceDifferenceText;
+                                    if (influenceDifference > 0) {
+                                        influenceDifferenceText = `📈${(influenceDifference * 100).toFixed(1)}%`;
+                                    } else if (influenceDifference < 0) {
+                                        influenceDifferenceText = `📉${(-influenceDifference * 100).toFixed(1)}%`;
+                                    } else {
+                                        influenceDifferenceText = `🔷${(influenceDifference * 100).toFixed(1)}%`;
+                                    }
                                     let factionDetail = `Last Updated : ${updateMoment.fromNow()}, ${updateMoment.from(tickMoment, true)} ${suffix} last detected tick \n`;
                                     factionDetail += `State : ${state}\n`;
                                     factionDetail += `Happiness: ${happiness}\n`;
-                                    factionDetail += `Influence : ${(influence * 100).toFixed(1)}%\n`;
+                                    factionDetail += `Influence : ${(influence * 100).toFixed(1)}%${influenceDifferenceText}\n`;
                                     let activeStates: string = "";
                                     if (activeStatesArray.length === 0) {
                                         activeStates = "None";