jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-11-08 02:53:25 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

[Report] Surface resolution audit info in report details

Browse source 
- Add resolved_by_name to ServerInfo_Report and join resolved_by users in
  the report list, my-list and details queries
- Render resolution note and resolved-at/by in the report detail pane
  instead of duplicating the description into the chat log context
This commit is contained in:
Lukas Brübach 2026-10-07 23:05:28 +02:00
parent a51f564b3c
commit a804c1a6fe
3 changed files with 58 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

21
cockatrice/src/interface/widgets/utility/report_utils.cpp
View file

@ -92,10 +92,27 @@ void renderReportDetails(QTextEdit *chatLogEdit,
const QString &moderatorPrefix, const QString &moderatorPrefix,
const QString &nonModeratorPrefix) const QString &nonModeratorPrefix)
{ {
QString details;
if (report.has_resolution_note() && !report.resolution_note().empty()) {
details = QObject::tr("Resolution note: %1").arg(QString::fromStdString(report.resolution_note()));
}
if (report.has_resolution_time()) {
QString resolvedBy = QObject::tr("unknown");
if (report.has_resolved_by_name() && !report.resolved_by_name().empty()) {
resolvedBy = QString::fromStdString(report.resolved_by_name());
}
if (!details.isEmpty()) {
details += "\n";
}
details += QObject::tr("Resolved at %1 by %2").arg(formatReportTime(report.resolution_time()), resolvedBy);
}
if (report.has_chat_log() && !report.chat_log().empty()) { if (report.has_chat_log() && !report.chat_log().empty()) {
chatLogEdit->setPlainText(QString::fromStdString(report.chat_log())); const QString chatLog = QString::fromStdString(report.chat_log());
chatLogEdit->setPlainText(
details.isEmpty() ? chatLog : details + "\n\n" + QObject::tr("=== Chat Log ===") + "\n" + chatLog);
} else { } else {
chatLogEdit->clear(); chatLogEdit->setPlainText(details);
} }
commentsEdit->clear(); commentsEdit->clear();

1
libcockatrice_protocol/libcockatrice/protocol/pb/serverinfo_report.proto
View file

@ -33,4 +33,5 @@ message ServerInfo_Report {
optional string chat_log = 14; optional string chat_log = 14;
optional string resolution_note = 15; optional string resolution_note = 15;
optional string resolved_by_name = 16;
} }

63
servatrice/src/serversocketinterface.cpp
View file

@ -1972,11 +1972,12 @@ Response::ResponseCode AbstractServerSocketInterface::cmdReportList(const Comman
QString queryStr = "SELECT r.id, r.reporter_name, r.reported_user_name, r.game_id, " QString queryStr = "SELECT r.id, r.reporter_name, r.reported_user_name, r.game_id, "
"r.category, r.description, r.created_at, r.status, " "r.category, r.description, r.created_at, r.status, "
"r.resolution_note, u.name AS assigned_mod_name, r.room_id, " "r.resolution_note, u.name AS assigned_mod_name, ru.name AS resolved_by_name, r.room_id, "
"(SELECT id FROM {prefix}_replays WHERE id_game = r.game_id ORDER BY id DESC LIMIT 1) " "(SELECT id FROM {prefix}_replays WHERE id_game = r.game_id ORDER BY id DESC LIMIT 1) "
"AS replay_id " "AS replay_id "
"FROM {prefix}_reports r " "FROM {prefix}_reports r "
"LEFT JOIN {prefix}_users u ON r.assigned_to = u.id "; "LEFT JOIN {prefix}_users u ON r.assigned_to = u.id "
"LEFT JOIN {prefix}_users ru ON r.resolved_by = ru.id ";
if (unresolvedOnly) { if (unresolvedOnly) {
queryStr += "WHERE r.status = 'open' OR r.status = 'assigned' "; queryStr += "WHERE r.status = 'open' OR r.status = 'assigned' ";
@ -2017,13 +2018,16 @@ Response::ResponseCode AbstractServerSocketInterface::cmdReportList(const Comman
if (!query->value(9).isNull()) { if (!query->value(9).isNull()) {
info->set_assigned_mod_name(query->value(9).toString().toStdString()); info->set_assigned_mod_name(query->value(9).toString().toStdString());
} }
if (!query->value(10).isNull()) { if (!query->value(10).isNull()) {
info->set_room_id(query->value(10).toInt()); info->set_resolved_by_name(query->value(10).toString().toStdString());
} }
if (!query->value(11).isNull()) { if (!query->value(11).isNull()) {
info->set_replay_id(query->value(11).toInt()); info->set_room_id(query->value(11).toInt());
}
if (!query->value(12).isNull()) {
info->set_replay_id(query->value(12).toInt());
} }
} }
@ -2697,11 +2701,12 @@ Response::ResponseCode AbstractServerSocketInterface::cmdReportMyList(const Comm
QString queryStr = "SELECT r.id, r.reporter_name, r.reported_user_name, r.game_id, " QString queryStr = "SELECT r.id, r.reporter_name, r.reported_user_name, r.game_id, "
"r.category, r.description, r.created_at, r.status, " "r.category, r.description, r.created_at, r.status, "
"r.resolution_note, u.name AS assigned_mod_name, r.room_id, " "r.resolution_note, u.name AS assigned_mod_name, ru.name AS resolved_by_name, r.room_id, "
"(SELECT id FROM {prefix}_replays WHERE id_game = r.game_id ORDER BY id DESC LIMIT 1) " "(SELECT id FROM {prefix}_replays WHERE id_game = r.game_id ORDER BY id DESC LIMIT 1) "
"AS replay_id " "AS replay_id "
"FROM {prefix}_reports r " "FROM {prefix}_reports r "
"LEFT JOIN {prefix}_users u ON r.assigned_to = u.id " "LEFT JOIN {prefix}_users u ON r.assigned_to = u.id "
"LEFT JOIN {prefix}_users ru ON r.resolved_by = ru.id "
"WHERE r.reporter_id = :reporter_id " "WHERE r.reporter_id = :reporter_id "
"ORDER BY r.created_at DESC LIMIT 200"; "ORDER BY r.created_at DESC LIMIT 200";
@ -2737,13 +2742,16 @@ Response::ResponseCode AbstractServerSocketInterface::cmdReportMyList(const Comm
if (!query->value(9).isNull()) { if (!query->value(9).isNull()) {
info->set_assigned_mod_name(query->value(9).toString().toStdString()); info->set_assigned_mod_name(query->value(9).toString().toStdString());
} }
if (!query->value(10).isNull()) { if (!query->value(10).isNull()) {
info->set_room_id(query->value(10).toInt()); info->set_resolved_by_name(query->value(10).toString().toStdString());
} }
if (!query->value(11).isNull()) { if (!query->value(11).isNull()) {
info->set_replay_id(query->value(11).toInt()); info->set_room_id(query->value(11).toInt());
}
if (!query->value(12).isNull()) {
info->set_replay_id(query->value(12).toInt());
} }
} }
@ -2802,17 +2810,19 @@ Response::ResponseCode AbstractServerSocketInterface::cmdReportDetails(const Com
// Columns: 0=id, 1=reporter_id, 2=reporter_name, 3=reported_user_name, 4=game_id, // Columns: 0=id, 1=reporter_id, 2=reporter_name, 3=reported_user_name, 4=game_id,
// 5=category, 6=description, 7=created_at, 8=status, // 5=category, 6=description, 7=created_at, 8=status,
// 9=resolution_note, 10=assigned_mod_name, 11=chat_log, // 9=resolution_note, 10=assigned_mod_name, 11=resolved_by_name,
// 12=room_id, 13=resolution_time, 14=replay_id // 12=chat_log, 13=room_id, 14=resolution_time, 15=replay_id
QString queryStr = "SELECT r.id, r.reporter_id, r.reporter_name, r.reported_user_name, r.game_id, " QString queryStr =
"r.category, r.description, r.created_at, r.status, " "SELECT r.id, r.reporter_id, r.reporter_name, r.reported_user_name, r.game_id, "
"r.resolution_note, u.name AS assigned_mod_name, r.chat_log, r.room_id, " "r.category, r.description, r.created_at, r.status, "
"r.resolution_time, " "r.resolution_note, u.name AS assigned_mod_name, ru.name AS resolved_by_name, r.chat_log, r.room_id, "
"(SELECT id FROM {prefix}_replays WHERE id_game = r.game_id ORDER BY id DESC LIMIT 1) " "r.resolution_time, "
"AS replay_id " "(SELECT id FROM {prefix}_replays WHERE id_game = r.game_id ORDER BY id DESC LIMIT 1) "
"FROM {prefix}_reports r " "AS replay_id "
"LEFT JOIN {prefix}_users u ON r.assigned_to = u.id " "FROM {prefix}_reports r "
"WHERE r.id = :id"; "LEFT JOIN {prefix}_users u ON r.assigned_to = u.id "
"LEFT JOIN {prefix}_users ru ON r.resolved_by = ru.id "
"WHERE r.id = :id";
QSqlQuery *query = sqlInterface->prepareQuery(queryStr); QSqlQuery *query = sqlInterface->prepareQuery(queryStr);
query->bindValue(":id", reportId); query->bindValue(":id", reportId);
@ -2851,21 +2861,24 @@ Response::ResponseCode AbstractServerSocketInterface::cmdReportDetails(const Com
if (!query->value(10).isNull()) { if (!query->value(10).isNull()) {
info->set_assigned_mod_name(query->value(10).toString().toStdString()); info->set_assigned_mod_name(query->value(10).toString().toStdString());
} }
if (!query->value(11).isNull()) { if (!query->value(11).isNull()) {
info->set_chat_log(query->value(11).toString().toStdString()); info->set_resolved_by_name(query->value(11).toString().toStdString());
} }
if (!query->value(12).isNull()) { if (!query->value(12).isNull()) {
info->set_room_id(query->value(12).toInt()); info->set_chat_log(query->value(12).toString().toStdString());
} }
if (!query->value(13).isNull()) { if (!query->value(13).isNull()) {
info->set_resolution_time(query->value(13).toDateTime().toSecsSinceEpoch()); info->set_room_id(query->value(13).toInt());
} }
if (!query->value(14).isNull()) { if (!query->value(14).isNull()) {
info->set_replay_id(query->value(14).toInt()); info->set_resolution_time(query->value(14).toDateTime().toSecsSinceEpoch());
}
if (!query->value(15).isNull()) {
info->set_replay_id(query->value(15).toInt());
} }
QSqlQuery *commentQuery = QSqlQuery *commentQuery =