Revert "Update TGS DMAPI (#2843)" (#2850)

This reverts commit cfd0319d01.

code/__DEFINES/tgs.dm

@@ -1,6 +1,6 @@
 // tgstation-server DMAPI
 
-#define TGS_DMAPI_VERSION "6.0.0"
+#define TGS_DMAPI_VERSION "5.2.10"
 
 // All functions and datums outside this document are subject to change with any version and should not be relied on.
 
@@ -95,13 +95,8 @@
 #define TGS_EVENT_WATCHDOG_SHUTDOWN 15
 /// Before the watchdog detaches for a TGS update/restart. No parameters.
 #define TGS_EVENT_WATCHDOG_DETACH 16
-// We don't actually implement these 3 events as the DMAPI can never receive them.
+// We don't actually implement this value as the DMAPI can never receive it
 // #define TGS_EVENT_WATCHDOG_LAUNCH 17
-// #define TGS_EVENT_WATCHDOG_CRASH 18
-// #define TGS_EVENT_WORLD_END_PROCESS 19
-// #define TGS_EVENT_WORLD_REBOOT 20
-/// Watchdog event when TgsInitializationComplete() is called. No parameters.
- #define TGS_EVENT_WORLD_PRIME 21
 
 // OTHER ENUMS
 
@@ -135,6 +130,7 @@
  *
  * This may use [/world/var/sleep_offline] to make this happen so ensure no changes are made to it while this call is running.
  * Afterwards, consider explicitly setting it to what you want to avoid this BYOND bug: http://www.byond.com/forum/post/2575184
+ * Before this point, note that any static files or directories may be in use by another server. Your code should account for this.
  * This function should not be called before ..() in [/world/proc/New].
  */
 /world/proc/TgsInitializationComplete()
@@ -144,7 +140,7 @@
 #define TGS_TOPIC var/tgs_topic_return = TgsTopic(args[1]); if(tgs_topic_return) return tgs_topic_return
 
 /**
- * Call this as late as possible in [world/proc/Reboot].
+ * Call this at the beginning of [world/proc/Reboot].
  */
 /world/proc/TgsReboot()
 	return
@@ -156,8 +152,6 @@
 /datum/tgs_revision_information
 	/// Full SHA of the commit.
 	var/commit
-	/// ISO 8601 timestamp of when the commit was created
-	var/timestamp
 	/// Full sha of last known remote commit. This may be null if the TGS repository is not currently tracking a remote branch.
 	var/origin_commit
 
@@ -207,7 +201,9 @@
 	/// An http URL to the test merge source.
 	var/url
 	/// The SHA of the test merge when that was merged.
-	var/head_commit
+	var/pull_request_commit
+	/// ISO 8601 timestamp of when the test merge was created on TGS.
+	var/time_merged
 	/// Optional comment left by the TGS user who initiated the merge.
 	var/comment
 
@@ -267,11 +263,11 @@
 // API FUNCTIONS
 
 /// Returns the maximum supported [/datum/tgs_version] of the DMAPI.
-/world/proc/TgsMaximumApiVersion()
+/world/proc/TgsMaximumAPIVersion()
 	return
 
 /// Returns the minimum supported [/datum/tgs_version] of the DMAPI.
-/world/proc/TgsMinimumApiVersion()
+/world/proc/TgsMinimumAPIVersion()
 	return
 
 /**

code/modules/tgs/core/core.dm

@@ -40,7 +40,7 @@
 		if(5)
 			api_datum = /datum/tgs_api/v5
 
-	var/datum/tgs_version/max_api_version = TgsMaximumApiVersion();
+	var/datum/tgs_version/max_api_version = TgsMaximumAPIVersion();
 	if(version.suite != null && version.minor != null && version.patch != null && version.deprecated_patch != null && version.deprefixed_parameter > max_api_version.deprefixed_parameter)
 		TGS_ERROR_LOG("Detected unknown API version! Defaulting to latest. Update the DMAPI to fix this problem.")
 		api_datum = /datum/tgs_api/latest
@@ -64,10 +64,10 @@
 		TGS_WRITE_GLOBAL(tgs, null)
 		TGS_ERROR_LOG("Failed to activate API!")
 
-/world/TgsMaximumApiVersion()
+/world/TgsMaximumAPIVersion()
 	return new /datum/tgs_version("5.x.x")
 
-/world/TgsMinimumApiVersion()
+/world/TgsMinimumAPIVersion()
 	return new /datum/tgs_version("3.2.x")
 
 /world/TgsInitializationComplete()

code/modules/tgs/v4/api.dm

@@ -92,7 +92,7 @@
 	var/list/json = cached_json["testMerges"]
 	for(var/entry in json)
 		var/datum/tgs_revision_information/test_merge/tm = new
-		tm.timestamp = text2num(entry["timeMerged"])
+		tm.time_merged = text2num(entry["timeMerged"])
 
 		var/list/revInfo = entry["revision"]
 		if(revInfo)
@@ -104,7 +104,7 @@
 		tm.url = entry["url"]
 		tm.author = entry["author"]
 		tm.number = entry["number"]
-		tm.head_commit = entry["pullRequestRevision"]
+		tm.pull_request_commit = entry["pullRequestRevision"]
 		tm.comment = entry["comment"]
 
 		cached_test_merges += tm

code/modules/tgs/v5/_defines.dm

@@ -79,7 +79,6 @@
 #define DMAPI5_TOPIC_RESPONSE_CHAT_RESPONSES "chatResponses"
 
 #define DMAPI5_REVISION_INFORMATION_COMMIT_SHA "commitSha"
-#define DMAPI5_REVISION_INFORMATION_TIMESTAMP "timestamp"
 #define DMAPI5_REVISION_INFORMATION_ORIGIN_COMMIT_SHA "originCommitSha"
 
 #define DMAPI5_CHAT_USER_ID "id"

code/modules/tgs/v5/api.dm

@@ -18,9 +18,7 @@
 	var/initialized = FALSE
 
 /datum/tgs_api/v5/ApiVersion()
-	return new /datum/tgs_version(
-		#include "interop_version.dm"
-	)
+	return new /datum/tgs_version(TGS_DMAPI_VERSION)
 
 /datum/tgs_api/v5/OnWorldNew(minimum_required_security_level)
 	server_port = world.params[DMAPI5_PARAM_SERVER_PORT]
@@ -50,7 +48,6 @@
 	if(istype(revisionData))
 		revision = new
 		revision.commit = revisionData[DMAPI5_REVISION_INFORMATION_COMMIT_SHA]
-		revision.timestamp = revisionData[DMAPI5_REVISION_INFORMATION_TIMESTAMP]
 		revision.origin_commit = revisionData[DMAPI5_REVISION_INFORMATION_ORIGIN_COMMIT_SHA]
 	else
 		TGS_ERROR_LOG("Failed to decode [DMAPI5_RUNTIME_INFORMATION_REVISION] from runtime information!")
@@ -69,12 +66,12 @@
 			else
 				TGS_WARNING_LOG("Failed to decode [DMAPI5_TEST_MERGE_REVISION] from test merge #[tm.number]!")
 
-			tm.timestamp = entry[DMAPI5_TEST_MERGE_TIME_MERGED]
+			tm.time_merged = text2num(entry[DMAPI5_TEST_MERGE_TIME_MERGED])
 			tm.title = entry[DMAPI5_TEST_MERGE_TITLE_AT_MERGE]
 			tm.body = entry[DMAPI5_TEST_MERGE_BODY_AT_MERGE]
 			tm.url = entry[DMAPI5_TEST_MERGE_URL]
 			tm.author = entry[DMAPI5_TEST_MERGE_AUTHOR]
-			tm.head_commit = entry[DMAPI5_TEST_MERGE_PULL_REQUEST_REVISION]
+			tm.pull_request_commit = entry[DMAPI5_TEST_MERGE_PULL_REQUEST_REVISION]
 			tm.comment = entry[DMAPI5_TEST_MERGE_COMMENT]
 
 			test_merges += tm

code/modules/tgs/v5/interop_version.dm

@@ -1 +0,0 @@
-"5.3.0"

code/modules/tgs/v5/undefs.dm

@@ -79,7 +79,6 @@
 #undef DMAPI5_TOPIC_RESPONSE_CHAT_RESPONSES
 
 #undef DMAPI5_REVISION_INFORMATION_COMMIT_SHA
-#undef DMAPI5_REVISION_INFORMATION_TIMESTAMP
 #undef DMAPI5_REVISION_INFORMATION_ORIGIN_COMMIT_SHA
 
 #undef DMAPI5_CHAT_USER_ID