From c7ceaa2cfdb8b1a541903ebab532c94f8303d10a Mon Sep 17 00:00:00 2001
From: Liza Carvelli <liza@carvel.li>
Date: Sun, 3 Mar 2024 20:14:17 +0100
Subject: [PATCH] Don't set FC-Id if char has FC exclusion set

---
 Influx/Influx.csproj                    |  2 +-
 Influx/Influx/InfluxStatisticsClient.cs | 14 ++++++++------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/Influx/Influx.csproj b/Influx/Influx.csproj
index 1c0b880..f8ed94c 100644
--- a/Influx/Influx.csproj
+++ b/Influx/Influx.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
         <TargetFramework>net7.0-windows</TargetFramework>
-        <Version>0.7</Version>
+        <Version>0.8</Version>
         <LangVersion>11.0</LangVersion>
         <Nullable>enable</Nullable>
         <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
diff --git a/Influx/Influx/InfluxStatisticsClient.cs b/Influx/Influx/InfluxStatisticsClient.cs
index f795b8f..db7a5d0 100644
--- a/Influx/Influx/InfluxStatisticsClient.cs
+++ b/Influx/Influx/InfluxStatisticsClient.cs
@@ -86,11 +86,15 @@ internal sealed class InfluxStatisticsClient : IDisposable
                     {
                         update.LocalStats.TryGetValue(character, out LocalStats? localStats);
 
+                        bool includeFc = character.FreeCompanyId > 0 &&
+                                         _configuration.IncludedCharacters.Any(x =>
+                                             x.LocalContentId == character.CharacterId && x.IncludeFreeCompany);
+
                         values.Add(PointData.Measurement("currency")
                             .Tag("id", character.CharacterId.ToString())
                             .Tag("player_name", character.Name)
                             .Tag("type", character.CharacterType.ToString())
-                            .Tag("fc_id", character.FreeCompanyId > 0 ? character.FreeCompanyId.ToString() : null)
+                            .Tag("fc_id", includeFc ? character.FreeCompanyId.ToString() : null)
                             .Field("gil", localStats?.Gil ?? currencies.Gil)
                             .Field("mgp", localStats?.MGP ?? 0)
                             .Field("ventures", currencies.Ventures)
@@ -104,7 +108,7 @@ internal sealed class InfluxStatisticsClient : IDisposable
                                 .Tag("id", character.CharacterId.ToString())
                                 .Tag("player_name", character.Name)
                                 .Tag("type", character.CharacterType.ToString())
-                                .Tag("fc_id", character.FreeCompanyId > 0 ? character.FreeCompanyId.ToString() : null)
+                                .Tag("fc_id", includeFc ? character.FreeCompanyId.ToString() : null)
                                 .Field("gc", localStats.GrandCompany)
                                 .Field("gc_rank", localStats.GcRank)
                                 .Field("seals", (GrandCompany)localStats.GrandCompany switch
@@ -143,8 +147,7 @@ internal sealed class InfluxStatisticsClient : IDisposable
                                             .Tag("id", character.CharacterId.ToString())
                                             .Tag("player_name", character.Name)
                                             .Tag("type", character.CharacterType.ToString())
-                                            .Tag("fc_id",
-                                                character.FreeCompanyId > 0 ? character.FreeCompanyId.ToString() : null)
+                                            .Tag("fc_id", includeFc ? character.FreeCompanyId.ToString() : null)
                                             .Tag("job", abbreviation)
                                             .Field("level", level)
                                             .Timestamp(date, WritePrecision.S));
@@ -158,8 +161,7 @@ internal sealed class InfluxStatisticsClient : IDisposable
                                     .Tag("id", character.CharacterId.ToString())
                                     .Tag("player_name", character.Name)
                                     .Tag("msq_name", localStats.MsqName)
-                                    .Tag("fc_id",
-                                        character.FreeCompanyId > 0 ? character.FreeCompanyId.ToString() : null)
+                                    .Tag("fc_id", includeFc ? character.FreeCompanyId.ToString() : null)
                                     .Field("msq_count", localStats.MsqCount)
                                     .Field("msq_genre", localStats.MsqGenre)
                                     .Timestamp(date, WritePrecision.S));