diff --git a/code/__DEFINES/tgs.dm b/code/__DEFINES/tgs.dm index a8d824a797b..de9533dc32b 100644 --- a/code/__DEFINES/tgs.dm +++ b/code/__DEFINES/tgs.dm @@ -1,6 +1,6 @@ // tgstation-server DMAPI -#define TGS_DMAPI_VERSION "6.0.0" +#define TGS_DMAPI_VERSION "6.0.1" // All functions and datums outside this document are subject to change with any version and should not be relied on. @@ -95,7 +95,7 @@ #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 these 4 events as the DMAPI can never receive them. // #define TGS_EVENT_WATCHDOG_LAUNCH 17 // #define TGS_EVENT_WATCHDOG_CRASH 18 // #define TGS_EVENT_WORLD_END_PROCESS 19 diff --git a/code/modules/tgs/v3210/api.dm b/code/modules/tgs/v3210/api.dm index 245381b93ea..5b41e6a89d8 100644 --- a/code/modules/tgs/v3210/api.dm +++ b/code/modules/tgs/v3210/api.dm @@ -160,7 +160,7 @@ var/datum/tgs_revision_information/test_merge/tm = new tm.number = text2num(I) var/list/entry = json[I] - tm.head_commit = entry["commit"] + tm.pull_request_commit = entry["commit"] tm.author = entry["author"] tm.title = entry["title"] . += tm diff --git a/code/modules/tgs/v5/api.dm b/code/modules/tgs/v5/api.dm index dfa1b6f9482..6735ed5dec5 100644 --- a/code/modules/tgs/v5/api.dm +++ b/code/modules/tgs/v5/api.dm @@ -66,10 +66,13 @@ if(revInfo) tm.commit = revisionData[DMAPI5_REVISION_INFORMATION_COMMIT_SHA] tm.origin_commit = revisionData[DMAPI5_REVISION_INFORMATION_ORIGIN_COMMIT_SHA] + tm.timestamp = entry[DMAPI5_REVISION_INFORMATION_TIMESTAMP] else TGS_WARNING_LOG("Failed to decode [DMAPI5_TEST_MERGE_REVISION] from test merge #[tm.number]!") - tm.timestamp = entry[DMAPI5_TEST_MERGE_TIME_MERGED] + if(!tm.timestamp) + tm.timestamp = 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]