Track unpushed commits as dirty

.gitignore

@@ -22,6 +22,7 @@ lighthouse.config.json
 gitBranch.txt
 gitVersion.txt
 gitRemotes.txt
+gitUnpushed.txt
 ProjectLighthouse/.vscode/tasks.json
 ProjectLighthouse/.vscode/launch.json
 logs/Startup.log

ProjectLighthouse.sln.DotSettings

@@ -133,4 +133,5 @@
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=unfavourite/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Unheart/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Unpublish/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Unpushed/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=yourthumb/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>

ProjectLighthouse/Helpers/VersionHelper.cs

@@ -26,6 +26,8 @@ namespace LBPUnion.ProjectLighthouse.Helpers
                 // linq is a serious and painful catastrophe but its useful so i'm gonna keep using it
                 Remotes = lines.Select(line => line.Split("\t")[1]).ToArray();
 
+                CommitsOutOfDate = readManifestFile("gitUnpushed.txt").Split('\n').Length;
+
                 CanCheckForUpdates = true;
             }
             catch
@@ -64,7 +66,8 @@ namespace LBPUnion.ProjectLighthouse.Helpers
         public static string CommitHash { get; set; }
         public static string Branch { get; set; }
         public static string FullVersion => $"{ServerStatics.ServerName} {Branch}@{CommitHash} {Build}";
-        public static bool IsDirty => CommitHash.EndsWith("-dirty") || CommitHash == "invalid" || Branch == "invalid";
+        public static bool IsDirty => CommitHash.EndsWith("-dirty") || CommitsOutOfDate != 0 || CommitHash == "invalid" || Branch == "invalid";
+        public static int CommitsOutOfDate { get; set; }
         public static bool CanCheckForUpdates { get; set; }
         public static string[] Remotes { get; set; }
 

ProjectLighthouse/Pages/Debug/VersionInfoPage.cshtml

@@ -16,6 +16,7 @@
 <p><b>CommitHash</b>: @VersionHelper.CommitHash</p>
 <p><b>IsDirty</b>: @VersionHelper.IsDirty</p>
 <p><b>CanCheckForUpdates</b>: @VersionHelper.CanCheckForUpdates</p>
+<p><b>CommitsOutOfDate</b>: @VersionHelper.CommitsOutOfDate</p>
 
 <h2>Remotes</h2>
 @foreach (string remote in VersionHelper.Remotes)

ProjectLighthouse/Pages/Layouts/BaseLayout.cshtml

@@ -151,7 +151,7 @@
                 <div class="ui container">
                     <i class="warning icon"></i>
                     <span style="font-size: 1.2rem;">Potential License Violation</span>
-                    <p>This instance is a public-facing instance that has been modified without the changes committed. You may be in violation of the <a href="https://github.com/LBPUnion/project-lighthouse/blob/main/LICENSE">GNU Affero General Public License v3.0</a>.</p>
+                    <p>This instance is a public-facing instance that has been modified without the changes published. You may be in violation of the <a href="https://github.com/LBPUnion/project-lighthouse/blob/main/LICENSE">GNU Affero General Public License v3.0</a>.</p>
                     <p>If you believe this is an error, please create an issue with the output of <code>git status</code> ran from the root of the server source code in the description on our <a href="https://github.com/LBPUnion/project-lighthouse/issues">issue tracker</a>.</p>
                     <p>If not, please publish the source code somewhere accessible to your users.</p>
                 </div>

ProjectLighthouse/ProjectLighthouse.csproj

@@ -35,12 +35,17 @@
         <EmbeddedResource Include="gitRemotes.txt">
             <CopyToOutputDirectory>Always</CopyToOutputDirectory>
         </EmbeddedResource>
+        <None Remove="gitUnpushed.txt"/>
+        <EmbeddedResource Include="gitUnpushed.txt">
+            <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+        </EmbeddedResource>
     </ItemGroup>
 
     <Target Name="PreBuild" BeforeTargets="PreBuildEvent">
         <Exec Command="git describe --long --always --dirty --exclude=\* --abbrev=8 &gt; &quot;$(ProjectDir)/gitVersion.txt&quot;"/>
         <Exec Command="git branch --show-current &gt; &quot;$(ProjectDir)/gitBranch.txt&quot;"/>
         <Exec Command="git remote -v &gt; &quot;$(ProjectDir)/gitRemotes.txt&quot;"/>
+        <Exec Command="git log --branches --not --remotes --oneline &gt; &quot;$(ProjectDir)/gitUnpushed.txt&quot;"/>
     </Target>
 
 </Project>