cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-23 04:51:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Announcing live test PRs (#5857)

Browse Source 
* Implement one.

* REVERT ME LATER

* Initial implementation dooonnee.

* log

* Fixes

* Lazyness squared
This commit is contained in:
Erki
2018-12-31 03:55:16 +01:00
committed by Werner
parent 746772f1c1
commit 2daef5c6b6
7 changed files with 122 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/helper_datums/getrev.dm
+68
View File
@@ -5,6 +5,8 @@ var/global/datum/getrev/revdata = new()
var/revision
var/date
var/showinfo
var/list/datum/tgs_revision_information/test_merge/test_merges
var/greeting_info
/datum/getrev/New()
var/list/head_branch = file2list(".git/HEAD", "\n")
@@ -24,6 +26,13 @@ var/global/datum/getrev/revdata = new()
date = unix2date(unix_time)
break
var/datum/tgs_api/api = TGS_READ_GLOBAL(tgs)
if (api)
test_merges = api.TestMerges()
else
test_merges = list()
world.log << "Running revision:"
world.log << branch
world.log << date
@@ -44,3 +53,62 @@ client/verb/showrevinfo()
src << "Revision unknown"
src << "<b>Current Map:</b> [current_map.full_name]"
/datum/getrev/proc/testmerge_overview()
if (!test_merges.len)
return
var/list/out = list("<br><center><font color='purple'><b>PRs test-merged for this round:</b><br>")
for (var/TM in test_merges)
out += testmerge_short_overview(TM)
out += "</font></center><br>"
return out.Join()
/datum/getrev/proc/generate_greeting_info()
if (!test_merges.len)
greeting_info = {"<div class="alert alert-info">
There are currently no test merges loaded onto the server.
</div>"}
return
var/list/out = list("<p>There are currently [test_merges.len] PRs being tested live.</p>",
{"<table class="table table-hover">"}
)
for (var/TM in test_merges)
out += testmerge_long_oveview(TM)
out += "</table>"
greeting_info = out.Join()
/datum/getrev/proc/testmerge_short_overview(datum/tgs_revision_information/test_merge/tm)
. = list()
. += "<hr><p>PR #[tm.number]: \"[html_encode(tm.title)]\""
. += "<br>\tAuthor: [html_encode(tm.author)]"
if (config.githuburl)
. += "<br>\t<a href='[config.githuburl]pull/[tm.number]'>\[Details...\]</a>"
. += "</p>"
/datum/getrev/proc/testmerge_long_oveview(datum/tgs_revision_information/test_merge/tm)
var/divid = "pr[tm.number]"
. = list()
. += {"<tr data-toggle="collapse" data-target="#[divid]" class="clickable">"}
. += {"<th>PR #[tm.number] - [html_encode(tm.title)]</th>"}
. += {"</tr><tr><td class="hiddenRow"><div id="[divid]" class="collapse">"}
. += {"<table class="table">"}
. += {"<tr><th>Author:</th><td>[html_encode(tm.author)]</td></tr>"}
. += {"<tr><th>Merged:</th><td>[tm.time_merged]</td></tr>"}
if (config.githuburl)
. += {"<tr><td colspan="2"><a href="?JSlink=github;pr=[tm.number]">Link to Github</a></td></tr>"}
. += {"<tr><th>Description:</th><td>[html_encode(tm.body)]</td></tr>"}
. += {"</table></div></td></tr>"}
code/datums/server_greeting.dm
+13 -1
View File
@@ -179,7 +179,7 @@
var/datum/asset/welcome = get_asset_datum(/datum/asset/simple/misc)
welcome.send(user)
user << browse('html/templates/welcome_screen.html', "window=greeting;size=640x500")
user << browse('html/templates/welcome_screen.html', "window=greeting;size=740x500")
/*
* A proc used to close the server greeting window for a user.
@@ -247,6 +247,16 @@
data["content"] = motd
user << output(JS_SANITIZE(data), "greeting.browser:AddContent")
data["div"] = "#testmerges"
data["content"] = revdata.greeting_info
if (revdata.test_merges.len)
data["update"] = 1
else
data["update"] = 0
data["changeHash"] = null
user << output(JS_SANITIZE(data), "greeting.browser:AddContent")
/*
* Basically the Topic proc for the greeting datum.
*/
@@ -338,3 +348,5 @@
#undef OUTDATED_MOTD
#undef MEMOFILE
#undef JS_SANITIZE