cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-12 00:27:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Display round id in notes panel (#7524)

Browse Source 
* Display round id in notes panel

* fix
This commit is contained in:
SkyratBot
2021-08-13 19:33:14 +02:00
committed by GitHub
parent 01f0cb0a34
commit 1381a827ae
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/admin/sql_message_system.dm
+12 -6
View File
@@ -410,7 +410,8 @@
server,
IFNULL((SELECT byond_key FROM [format_table_name("player")] WHERE ckey = lasteditor), lasteditor),
expire_timestamp,
playtime
playtime,
round_id
FROM [format_table_name("messages")]
WHERE type = :type AND deleted = 0 AND (expire_timestamp > NOW() OR expire_timestamp IS NULL)
"}, list("type" = type))
@@ -431,11 +432,12 @@
var/server = query_get_type_messages.item[7]
var/editor_key = query_get_type_messages.item[9] // SKYRAT EDIT CHANGE BEGIN - MULTISERVER
var/expire_timestamp = query_get_type_messages.item[10]
var/playtime = query_get_type_messages.item[11] // SKYRAT EDIT CHANGE END - MULTISERVER
var/playtime = query_get_type_messages.item[11]
var/round_id = query_get_type_messages.item[12] // SKYRAT EDIT CHANGE END - MULTISERVER
output += "<b>"
if(type == "watchlist entry")
output += "[t_key] | "
output += "[timestamp] | [server] | [admin_key]"
output += "[timestamp] | [server] | Round [round_id] | [admin_key]"
if(type == "watchlist entry")
output += " | [get_exp_format(text2num(playtime))] Living Playtime"
if(expire_timestamp)
@@ -463,7 +465,10 @@
IFNULL((SELECT byond_key FROM [format_table_name("player")] WHERE ckey = lasteditor), lasteditor),
DATEDIFF(NOW(), timestamp),
IFNULL((SELECT byond_key FROM [format_table_name("player")] WHERE ckey = targetckey), targetckey),
expire_timestamp, severity, playtime
expire_timestamp,
severity,
playtime,
round_id
FROM [format_table_name("messages")]
WHERE type <> 'memo' AND targetckey = :targetckey AND deleted = 0 AND (expire_timestamp > NOW() OR expire_timestamp IS NULL)
ORDER BY timestamp DESC
@@ -494,7 +499,8 @@
target_key = query_get_messages.item[11]
var/expire_timestamp = query_get_messages.item[12]
var/severity = query_get_messages.item[13]
var/playtime = query_get_messages.item[14] // SKYRAT EDIT CHANGE END - MULTISERVER
var/playtime = query_get_messages.item[14]
var/round_id = query_get_messages.item[15] // SKYRAT EDIT CHANGE END - MULTISERVER
var/alphatext = ""
var/nsd = CONFIG_GET(number/note_stale_days)
var/nfd = CONFIG_GET(number/note_fresh_days)
@@ -511,7 +517,7 @@
var/list/data = list("<div style='margin:0px;[alphatext]'><p class='severity'>")
if(severity)
data += "<img src='[SSassets.transport.get_asset_url("[severity]_button.png")]' height='24' width='24'></img> "
data += "<b>[timestamp] | [server] | [admin_key][secret ? " | <i>- Secret</i>" : ""] | [get_exp_format(text2num(playtime))] Living Playtime"
data += "<b>[timestamp] | [server] | Round [round_id] | [admin_key][secret ? " | <i>- Secret</i>" : ""] | [get_exp_format(text2num(playtime))] Living Playtime"
if(expire_timestamp)
data += " | Expires [expire_timestamp]"
data += "</b></p><center>"