From 446f95e3229e05aed92414b95b6e9c0e3b0b1c2e Mon Sep 17 00:00:00 2001
From: Jordan Brown <Cyberboss@users.noreply.github.com>
Date: Mon, 25 May 2020 20:55:54 -0400
Subject: [PATCH 1/3] Convert CompileJobs in API RevInfo to EntityIds

---
 src/Tgstation.Server.Api/Models/RevisionInformation.cs  | 2 +-
 src/Tgstation.Server.Host/Models/RevisionInformation.cs | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Tgstation.Server.Api/Models/RevisionInformation.cs b/src/Tgstation.Server.Api/Models/RevisionInformation.cs
index 1d05a22755..8e115fb922 100644
--- a/src/Tgstation.Server.Api/Models/RevisionInformation.cs
+++ b/src/Tgstation.Server.Api/Models/RevisionInformation.cs
@@ -18,6 +18,6 @@ namespace Tgstation.Server.Api.Models
 		/// <summary>
 		/// The <see cref="CompileJob"/>s made from the <see cref="RevisionInformation"/>
 		/// </summary>
-		public ICollection<CompileJob>? CompileJobs { get; set; }
+		public ICollection<EntityId>? CompileJobs { get; set; }
 	}
 }
diff --git a/src/Tgstation.Server.Host/Models/RevisionInformation.cs b/src/Tgstation.Server.Host/Models/RevisionInformation.cs
index 17c676990b..02dd5edef3 100644
--- a/src/Tgstation.Server.Host/Models/RevisionInformation.cs
+++ b/src/Tgstation.Server.Host/Models/RevisionInformation.cs
@@ -48,9 +48,9 @@ namespace Tgstation.Server.Host.Models
 			OriginCommitSha = OriginCommitSha,
 			PrimaryTestMerge = PrimaryTestMerge?.ToApi(),
 			ActiveTestMerges = ActiveTestMerges.Select(x => x.TestMerge.ToApi()).ToList(),
-			CompileJobs = CompileJobs.Select(x => new Api.Models.CompileJob
+			CompileJobs = CompileJobs.Select(x => new Api.Models.EntityId
 			{
-				Id = x.Id // anti recursion measure
+				Id = x.Id
 			}).ToList()
 		};
 	}

From b1381a1416b639c9a8d98203a267ab316147d8ab Mon Sep 17 00:00:00 2001
From: Jordan Brown <Cyberboss@users.noreply.github.com>
Date: Mon, 25 May 2020 21:17:27 -0400
Subject: [PATCH 2/3] Use internal users as User.CreatedBy

---
 src/Tgstation.Server.Api/Models/User.cs                | 2 +-
 src/Tgstation.Server.Host/Core/SwaggerConfiguration.cs | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/Tgstation.Server.Api/Models/User.cs b/src/Tgstation.Server.Api/Models/User.cs
index e6f50acb27..60ecb7225d 100644
--- a/src/Tgstation.Server.Api/Models/User.cs
+++ b/src/Tgstation.Server.Api/Models/User.cs
@@ -16,6 +16,6 @@
 		/// <summary>
 		/// The <see cref="User"/> who created this <see cref="User"/>
 		/// </summary>
-		public User? CreatedBy { get; set; }
+		public Internal.User? CreatedBy { get; set; }
 	}
 }
\ No newline at end of file
diff --git a/src/Tgstation.Server.Host/Core/SwaggerConfiguration.cs b/src/Tgstation.Server.Host/Core/SwaggerConfiguration.cs
index cadd4c3e5f..fa4c191023 100644
--- a/src/Tgstation.Server.Host/Core/SwaggerConfiguration.cs
+++ b/src/Tgstation.Server.Host/Core/SwaggerConfiguration.cs
@@ -133,6 +133,14 @@ namespace Tgstation.Server.Host.Core
 			swaggerGenOptions.DocumentFilter<SwaggerConfiguration>();
 			swaggerGenOptions.SchemaFilter<SwaggerConfiguration>();
 
+			swaggerGenOptions.CustomSchemaIds(type =>
+			{
+				if (type == typeof(Api.Models.Internal.User))
+					return "ShallowUser";
+
+				return type.Name;
+			});
+
 			swaggerGenOptions.AddSecurityDefinition(PasswordSecuritySchemeId, new OpenApiSecurityScheme
 			{
 				In = ParameterLocation.Header,

From 9de2c459e741589a72b9394dde031cc5b01fdea2 Mon Sep 17 00:00:00 2001
From: Jordan Brown <Cyberboss@users.noreply.github.com>
Date: Mon, 25 May 2020 21:17:35 -0400
Subject: [PATCH 3/3] API 6.5.0

---
 build/Version.props | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build/Version.props b/build/Version.props
index 5018e6edbd..911e6616e3 100644
--- a/build/Version.props
+++ b/build/Version.props
@@ -3,8 +3,8 @@
     <!-- This is the authorative version list -->
     <!-- Integration tests will ensure they match across the board -->
     <TgsCoreVersion>4.2.7</TgsCoreVersion>
-    <TgsApiVersion>6.4.1</TgsApiVersion>
-    <TgsClientVersion>7.0.1</TgsClientVersion>
+    <TgsApiVersion>6.5.0</TgsApiVersion>
+    <TgsClientVersion>7.1.0</TgsClientVersion>
     <TgsDmapiVersion>5.2.1</TgsDmapiVersion>
     <TgsControlPanelVersion>0.4.0</TgsControlPanelVersion>
     <TgsHostWatchdogVersion>1.1.0</TgsHostWatchdogVersion>