diff --git a/cockatrice/cockatrice.qrc b/cockatrice/cockatrice.qrc index 14cf15b2f..4ec3d2385 100644 --- a/cockatrice/cockatrice.qrc +++ b/cockatrice/cockatrice.qrc @@ -62,9 +62,9 @@ resources/icons/mana/U.svg resources/icons/mana/W.svg - resources/backgrounds/home.png - resources/backgrounds/home-dark.png - resources/backgrounds/home-light.png + resources/backgrounds/home.jpg + resources/backgrounds/home-dark.jpg + resources/backgrounds/home-light.jpg resources/backgrounds/card_triplet.svg resources/backgrounds/placeholder_printing_selector.svg diff --git a/cockatrice/resources/backgrounds/home-dark.jpg b/cockatrice/resources/backgrounds/home-dark.jpg new file mode 100644 index 000000000..53d3406dd Binary files /dev/null and b/cockatrice/resources/backgrounds/home-dark.jpg differ diff --git a/cockatrice/resources/backgrounds/home-dark.png b/cockatrice/resources/backgrounds/home-dark.png deleted file mode 100644 index 68f48e2c2..000000000 Binary files a/cockatrice/resources/backgrounds/home-dark.png and /dev/null differ diff --git a/cockatrice/resources/backgrounds/home-light.jpg b/cockatrice/resources/backgrounds/home-light.jpg new file mode 100644 index 000000000..112146e4f Binary files /dev/null and b/cockatrice/resources/backgrounds/home-light.jpg differ diff --git a/cockatrice/resources/backgrounds/home-light.png b/cockatrice/resources/backgrounds/home-light.png deleted file mode 100644 index eaaaba932..000000000 Binary files a/cockatrice/resources/backgrounds/home-light.png and /dev/null differ diff --git a/cockatrice/resources/backgrounds/home.jpg b/cockatrice/resources/backgrounds/home.jpg new file mode 100644 index 000000000..112146e4f Binary files /dev/null and b/cockatrice/resources/backgrounds/home.jpg differ diff --git a/cockatrice/resources/backgrounds/home.png b/cockatrice/resources/backgrounds/home.png deleted file mode 100644 index eaaaba932..000000000 Binary files a/cockatrice/resources/backgrounds/home.png and /dev/null differ diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_report_user.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_report_user.cpp index 9519846e2..7b855af96 100644 --- a/cockatrice/src/interface/widgets/dialogs/dlg_report_user.cpp +++ b/cockatrice/src/interface/widgets/dialogs/dlg_report_user.cpp @@ -15,6 +15,7 @@ #include #include #include +#include DlgReportUser::DlgReportUser(AbstractClient *_client, const QString &_reportedUser, @@ -56,22 +57,14 @@ DlgReportUser::DlgReportUser(AbstractClient *_client, auto *categoryGrid = new QGridLayout(categoryGroup); categoryBox = new QComboBox; - categoryBox->addItem(tr("Cheating / Unsporting behavior"), "cheating"); - categoryBox->setItemData(categoryBox->count() - 1, - tr("Using external tools, card marked manipulation, or exploiting game bugs"), - Qt::ToolTipRole); - categoryBox->addItem(tr("Harassment / Abuse"), "harassment"); - categoryBox->setItemData(categoryBox->count() - 1, tr("Threatening, bullying, or persistent unwanted contact"), - Qt::ToolTipRole); - categoryBox->addItem(tr("Hate speech"), "hate_speech"); - categoryBox->setItemData(categoryBox->count() - 1, - tr("Discriminatory language targeting race, gender, religion, etc."), Qt::ToolTipRole); - categoryBox->addItem(tr("Spam"), "spam"); - categoryBox->setItemData(categoryBox->count() - 1, tr("Repeated unwanted messages or advertisements"), - Qt::ToolTipRole); - categoryBox->addItem(tr("Other"), "other"); - categoryBox->setItemData(categoryBox->count() - 1, tr("Any behavior not covered by the above categories"), - Qt::ToolTipRole); + for (const QString &key : ReportCategories::keys()) { + const QString label = categoryLabel(key); + if (label.isEmpty()) { + continue; // skip keys without a dialog label + } + categoryBox->addItem(label, key); + categoryBox->setItemData(categoryBox->count() - 1, categoryToolTip(key), Qt::ToolTipRole); + } categoryGrid->addWidget(new QLabel(tr("Category:")), 0, 0); categoryGrid->addWidget(categoryBox, 0, 1); @@ -189,3 +182,55 @@ void DlgReportUser::reportResponse(const Response &response) QMessageBox::warning(this, tr("Submission Failed"), tr("Failed to submit report. Please try again.")); } } + +QString DlgReportUser::categoryLabel(const QString &key) +{ + if (key == QLatin1String("cheating")) { + return tr("Cheating / Unsporting behavior"); + } + if (key == QLatin1String("bug_abuse")) { + return tr("Bug Abuse"); + } + if (key == QLatin1String("harassment")) { + return tr("Harassment / Abuse"); + } + if (key == QLatin1String("verbal_abuse")) { + return tr("Verbal Abuse"); + } + if (key == QLatin1String("hate_speech")) { + return tr("Hate speech"); + } + if (key == QLatin1String("spam")) { + return tr("Spam"); + } + if (key == QLatin1String("other")) { + return tr("Other"); + } + return QString(); +} + +QString DlgReportUser::categoryToolTip(const QString &key) +{ + if (key == QLatin1String("cheating")) { + return tr("Using external tools, cheat programs, or exploiting game bugs"); + } + if (key == QLatin1String("bug_abuse")) { + return tr("Exploiting a bug or glitch to gain an unfair advantage"); + } + if (key == QLatin1String("harassment")) { + return tr("Threatening, bullying, or persistent unwanted contact"); + } + if (key == QLatin1String("verbal_abuse")) { + return tr("Abusive or offensive language directed at another player"); + } + if (key == QLatin1String("hate_speech")) { + return tr("Discriminatory language targeting race, gender, religion, etc."); + } + if (key == QLatin1String("spam")) { + return tr("Repeated unwanted messages or advertisements"); + } + if (key == QLatin1String("other")) { + return tr("Any behavior not covered by the above categories"); + } + return QString(); +} diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_report_user.h b/cockatrice/src/interface/widgets/dialogs/dlg_report_user.h index c59fc5084..f8d5938ce 100644 --- a/cockatrice/src/interface/widgets/dialogs/dlg_report_user.h +++ b/cockatrice/src/interface/widgets/dialogs/dlg_report_user.h @@ -26,6 +26,9 @@ private slots: void reportResponse(const Response &response); private: + static QString categoryLabel(const QString &key); + static QString categoryToolTip(const QString &key); + AbstractClient *client; QString reportedUser; int gameId; diff --git a/cockatrice/src/interface/widgets/server/user/user_list_widget.cpp b/cockatrice/src/interface/widgets/server/user/user_list_widget.cpp index 1bb7c5288..d9e1e1e7e 100644 --- a/cockatrice/src/interface/widgets/server/user/user_list_widget.cpp +++ b/cockatrice/src/interface/widgets/server/user/user_list_widget.cpp @@ -218,9 +218,10 @@ void UserListTWI::setOnline(bool online) * 2) Admins, judge/vip/donator status ignored * 3) Moderators, judge/vip/donator status ignored * 4) Judges - * 5) VIPs - * 6) Donators - * 7) Everyone else + * 5) Developers + * 6) VIPs + * 7) Donators + * 8) Everyone else * @param other RHS to compare to * @return Left is less than the Right */ @@ -234,11 +235,10 @@ bool UserListTWI::operator<(const QTreeWidgetItem &other) const const auto &lhsUserLevelFlags = UserLevelFlags(data(0, Qt::UserRole).toInt()); const auto &rhsUserLevelFlags = UserLevelFlags(other.data(0, Qt::UserRole).toInt()); - // Admins, Developers & Mods need no additional comparison checks, just to see if they're an admin, a developer + // Admins & Moderators need no additional comparison checks, just to see if they're an admin // or a moderator static const QList userLevelWithNoOtherPrefOrder = { - ServerInfo_User_UserLevelFlag_IsAdmin, ServerInfo_User_UserLevelFlag_IsDeveloper, - ServerInfo_User_UserLevelFlag_IsModerator}; + ServerInfo_User_UserLevelFlag_IsAdmin, ServerInfo_User_UserLevelFlag_IsModerator}; for (const auto &userLevelEntry : userLevelWithNoOtherPrefOrder) { if (lhsUserLevelFlags.testFlag(userLevelEntry) && lhsUserLevelFlags.testFlag(userLevelEntry) == rhsUserLevelFlags.testFlag(userLevelEntry)) { @@ -249,10 +249,10 @@ bool UserListTWI::operator<(const QTreeWidgetItem &other) const } } - // Judges can be sorted by their additional ranks - static const QList userLevelOrder = {ServerInfo_User_UserLevelFlag_IsJudge, - ServerInfo_User_UserLevelFlag_IsRegistered, - ServerInfo_User_UserLevelFlag_IsUser}; + // Judges and developers can be sorted by their additional ranks + static const QList userLevelOrder = { + ServerInfo_User_UserLevelFlag_IsJudge, ServerInfo_User_UserLevelFlag_IsDeveloper, + ServerInfo_User_UserLevelFlag_IsRegistered, ServerInfo_User_UserLevelFlag_IsUser}; for (const auto &userLevelEntry : userLevelOrder) { if (lhsUserLevelFlags.testFlag(userLevelEntry) != rhsUserLevelFlags.testFlag(userLevelEntry)) { return lhsUserLevelFlags.testFlag(userLevelEntry) > rhsUserLevelFlags.testFlag(userLevelEntry); diff --git a/cockatrice/themes/Fabric/backgrounds/home-dark.jpg b/cockatrice/themes/Fabric/backgrounds/home-dark.jpg new file mode 100644 index 000000000..f69e5923e Binary files /dev/null and b/cockatrice/themes/Fabric/backgrounds/home-dark.jpg differ diff --git a/cockatrice/themes/Fabric/backgrounds/home-dark.png b/cockatrice/themes/Fabric/backgrounds/home-dark.png deleted file mode 100644 index 8d9514626..000000000 Binary files a/cockatrice/themes/Fabric/backgrounds/home-dark.png and /dev/null differ diff --git a/cockatrice/themes/Fabric/backgrounds/home-light.jpg b/cockatrice/themes/Fabric/backgrounds/home-light.jpg new file mode 100644 index 000000000..800e369e7 Binary files /dev/null and b/cockatrice/themes/Fabric/backgrounds/home-light.jpg differ diff --git a/cockatrice/themes/Fabric/backgrounds/home-light.png b/cockatrice/themes/Fabric/backgrounds/home-light.png deleted file mode 100644 index 78f51a686..000000000 Binary files a/cockatrice/themes/Fabric/backgrounds/home-light.png and /dev/null differ diff --git a/cockatrice/themes/Leather/backgrounds/home-dark.jpg b/cockatrice/themes/Leather/backgrounds/home-dark.jpg new file mode 100644 index 000000000..8c2c3d1df Binary files /dev/null and b/cockatrice/themes/Leather/backgrounds/home-dark.jpg differ diff --git a/cockatrice/themes/Leather/backgrounds/home-dark.png b/cockatrice/themes/Leather/backgrounds/home-dark.png deleted file mode 100644 index 20d16a27f..000000000 Binary files a/cockatrice/themes/Leather/backgrounds/home-dark.png and /dev/null differ diff --git a/cockatrice/themes/Leather/backgrounds/home-light.jpg b/cockatrice/themes/Leather/backgrounds/home-light.jpg new file mode 100644 index 000000000..3fb49538a Binary files /dev/null and b/cockatrice/themes/Leather/backgrounds/home-light.jpg differ diff --git a/cockatrice/themes/Leather/backgrounds/home-light.png b/cockatrice/themes/Leather/backgrounds/home-light.png deleted file mode 100644 index ee1da361d..000000000 Binary files a/cockatrice/themes/Leather/backgrounds/home-light.png and /dev/null differ diff --git a/cockatrice/themes/Plasma/backgrounds/home-dark.jpg b/cockatrice/themes/Plasma/backgrounds/home-dark.jpg new file mode 100644 index 000000000..230d78e8e Binary files /dev/null and b/cockatrice/themes/Plasma/backgrounds/home-dark.jpg differ diff --git a/cockatrice/themes/Plasma/backgrounds/home-dark.png b/cockatrice/themes/Plasma/backgrounds/home-dark.png deleted file mode 100644 index ce1469e2b..000000000 Binary files a/cockatrice/themes/Plasma/backgrounds/home-dark.png and /dev/null differ diff --git a/cockatrice/themes/Plasma/backgrounds/home-light.jpg b/cockatrice/themes/Plasma/backgrounds/home-light.jpg new file mode 100644 index 000000000..2552325eb Binary files /dev/null and b/cockatrice/themes/Plasma/backgrounds/home-light.jpg differ diff --git a/cockatrice/themes/Plasma/backgrounds/home-light.png b/cockatrice/themes/Plasma/backgrounds/home-light.png deleted file mode 100644 index 2e9000bd6..000000000 Binary files a/cockatrice/themes/Plasma/backgrounds/home-light.png and /dev/null differ diff --git a/cockatrice/themes/VelvetMarble/backgrounds/home-dark.jpg b/cockatrice/themes/VelvetMarble/backgrounds/home-dark.jpg new file mode 100644 index 000000000..b55f2524e Binary files /dev/null and b/cockatrice/themes/VelvetMarble/backgrounds/home-dark.jpg differ diff --git a/cockatrice/themes/VelvetMarble/backgrounds/home-dark.png b/cockatrice/themes/VelvetMarble/backgrounds/home-dark.png deleted file mode 100644 index 34738090f..000000000 Binary files a/cockatrice/themes/VelvetMarble/backgrounds/home-dark.png and /dev/null differ diff --git a/cockatrice/themes/VelvetMarble/backgrounds/home-light.jpg b/cockatrice/themes/VelvetMarble/backgrounds/home-light.jpg new file mode 100644 index 000000000..12a2fd2cc Binary files /dev/null and b/cockatrice/themes/VelvetMarble/backgrounds/home-light.jpg differ diff --git a/cockatrice/themes/VelvetMarble/backgrounds/home-light.png b/cockatrice/themes/VelvetMarble/backgrounds/home-light.png deleted file mode 100644 index de783e086..000000000 Binary files a/cockatrice/themes/VelvetMarble/backgrounds/home-light.png and /dev/null differ diff --git a/libcockatrice_network/libcockatrice/network/client/remote/remote_client.cpp b/libcockatrice_network/libcockatrice/network/client/remote/remote_client.cpp index 53608db65..de2cc720f 100644 --- a/libcockatrice_network/libcockatrice/network/client/remote/remote_client.cpp +++ b/libcockatrice_network/libcockatrice/network/client/remote/remote_client.cpp @@ -559,6 +559,15 @@ void RemoteClient::ping() PendingCommand *pend = i.next().value(); if (pend->tick() > maxTimeout) { i.remove(); + // Answer the command instead of dropping it silently: the connection may still + // be alive (other traffic keeps lastDataReceived fresh) while this single + // command stalled, and awaiters such as TabServer's room-join dedup can only + // release their in-flight markers when `finished` fires. A silent drop wedges + // them permanently - e.g. a room whose join timing never surfaces again. + Response response; + response.set_response_code(Response::RespNotConnected); + response.set_cmd_id(pend->getCommandContainer().cmd_id()); + pend->processResponse(response); pend->deleteLater(); } } diff --git a/libcockatrice_utility/CMakeLists.txt b/libcockatrice_utility/CMakeLists.txt index db23f7951..ab647258c 100644 --- a/libcockatrice_utility/CMakeLists.txt +++ b/libcockatrice_utility/CMakeLists.txt @@ -6,8 +6,12 @@ set(CMAKE_AUTOUIC ON) set(CMAKE_AUTORCC ON) set(UTILITY_SOURCES - libcockatrice/utility/cryptoutil.cpp libcockatrice/utility/expression.cpp libcockatrice/utility/levenshtein.cpp - libcockatrice/utility/passwordhasher.cpp libcockatrice/utility/server_rate_limiter.cpp + libcockatrice/utility/cryptoutil.cpp + libcockatrice/utility/expression.cpp + libcockatrice/utility/levenshtein.cpp + libcockatrice/utility/passwordhasher.cpp + libcockatrice/utility/report_categories.cpp + libcockatrice/utility/server_rate_limiter.cpp libcockatrice/utility/warning_categories.cpp ) @@ -20,6 +24,7 @@ set(UTILITY_HEADERS libcockatrice/utility/macros.h libcockatrice/utility/passwordhasher.h libcockatrice/utility/playmat_params.h + libcockatrice/utility/report_categories.h libcockatrice/utility/string_limits.h libcockatrice/utility/dice_limits.h libcockatrice/utility/counter_limits.h diff --git a/libcockatrice_utility/libcockatrice/utility/report_categories.cpp b/libcockatrice_utility/libcockatrice/utility/report_categories.cpp new file mode 100644 index 000000000..8551c1ca1 --- /dev/null +++ b/libcockatrice_utility/libcockatrice/utility/report_categories.cpp @@ -0,0 +1,16 @@ +#include "report_categories.h" + +namespace ReportCategories +{ +const QStringList &keys() +{ + static const QStringList categories = {"cheating", "bug_abuse", "harassment", "verbal_abuse", + "hate_speech", "spam", "other"}; + return categories; +} + +bool isValid(const QString &key) +{ + return keys().contains(key, Qt::CaseInsensitive); +} +} // namespace ReportCategories \ No newline at end of file diff --git a/libcockatrice_utility/libcockatrice/utility/report_categories.h b/libcockatrice_utility/libcockatrice/utility/report_categories.h new file mode 100644 index 000000000..5758c3dcf --- /dev/null +++ b/libcockatrice_utility/libcockatrice/utility/report_categories.h @@ -0,0 +1,24 @@ +#ifndef REPORT_CATEGORIES_H +#define REPORT_CATEGORIES_H + +#include +#include + +/** + * Canonical report categories, shared by the client and the server. + * + * This is the single source of truth for the category keys exchanged over the + * wire (Command_Report.category) and stored in the reports table. The server + * only accepts keys from this list and the client report dialog only offers + * keys from this list, so the two sides cannot drift apart again. + */ +namespace ReportCategories +{ +/** @brief The complete list of valid category keys, in canonical order. */ +const QStringList &keys(); + +/** @brief Whether @a key is a valid report category (case-insensitive). */ +bool isValid(const QString &key); +} // namespace ReportCategories + +#endif // REPORT_CATEGORIES_H \ No newline at end of file diff --git a/servatrice/src/serversocketinterface.cpp b/servatrice/src/serversocketinterface.cpp index c82a8dd73..9c78c48f3 100644 --- a/servatrice/src/serversocketinterface.cpp +++ b/servatrice/src/serversocketinterface.cpp @@ -128,6 +128,7 @@ #include #include #include +#include #include #include #include @@ -3775,8 +3776,7 @@ Response::ResponseCode AbstractServerSocketInterface::cmdReport(const Command_Re return Response::RespInvalidData; } - static const QStringList validCategories = {"cheating", "bug_abuse", "verbal_abuse", "other"}; - if (!validCategories.contains(category.toLower())) { + if (!ReportCategories::isValid(category)) { return Response::RespInvalidData; } diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index d23d9ba04..d80995d26 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -14,6 +14,7 @@ add_test(NAME server_rate_limiter_test COMMAND server_rate_limiter_test) add_test(NAME server_developer_role_test COMMAND server_developer_role_test) add_test(NAME server_game_join_test COMMAND server_game_join_test) add_test(NAME warning_categories_test COMMAND warning_categories_test) +add_test(NAME report_categories_test COMMAND report_categories_test) add_test(NAME lag_monitor_test COMMAND lag_monitor_test) add_test(NAME latency_tracker_test COMMAND latency_tracker_test) add_test(NAME metrics_registry_test COMMAND metrics_registry_test) @@ -37,6 +38,7 @@ add_executable(server_rate_limiter_test server_rate_limiter_test.cpp) add_executable(server_developer_role_test server_developer_role_test.cpp) add_executable(server_game_join_test server_game_join_test.cpp) add_executable(warning_categories_test warning_categories_test.cpp) +add_executable(report_categories_test report_categories_test.cpp) add_executable(lag_monitor_test ${CMAKE_SOURCE_DIR}/cockatrice/src/client/lag_monitor.cpp lag_monitor_test.cpp) target_include_directories(lag_monitor_test PRIVATE ${CMAKE_SOURCE_DIR}/cockatrice/src) add_executable(latency_tracker_test latency_tracker_test.cpp) @@ -91,6 +93,7 @@ if(NOT GTEST_FOUND) add_dependencies(server_developer_role_test gtest) add_dependencies(server_game_join_test gtest) add_dependencies(warning_categories_test gtest) + add_dependencies(report_categories_test gtest) add_dependencies(lag_monitor_test gtest) add_dependencies(latency_tracker_test gtest) add_dependencies(metrics_registry_test gtest) @@ -137,6 +140,9 @@ target_link_libraries( target_link_libraries( warning_categories_test libcockatrice_utility Threads::Threads ${GTEST_BOTH_LIBRARIES} ${TEST_QT_MODULES} ) +target_link_libraries( + report_categories_test libcockatrice_utility Threads::Threads ${GTEST_BOTH_LIBRARIES} ${TEST_QT_MODULES} +) target_link_libraries(lag_monitor_test Threads::Threads ${GTEST_BOTH_LIBRARIES} ${TEST_QT_MODULES}) target_link_libraries( latency_tracker_test libcockatrice_network Threads::Threads ${GTEST_BOTH_LIBRARIES} ${TEST_QT_MODULES} diff --git a/tests/report_categories_test.cpp b/tests/report_categories_test.cpp new file mode 100644 index 000000000..790b2cff6 --- /dev/null +++ b/tests/report_categories_test.cpp @@ -0,0 +1,54 @@ +#include "gtest/gtest.h" +#include +#include +#include +#include + +TEST(ReportCategoriesTest, CanonicalListIsNonEmptyAndStable) +{ + const QStringList categories = ReportCategories::keys(); + + ASSERT_FALSE(categories.isEmpty()); + EXPECT_EQ("cheating", categories.at(0)); + EXPECT_EQ("other", categories.last()); +} + +TEST(ReportCategoriesTest, CanonicalListContainsMergedClientAndServerCategories) +{ + const QStringList expected = {"cheating", "bug_abuse", "harassment", "verbal_abuse", + "hate_speech", "spam", "other"}; + EXPECT_EQ(expected, ReportCategories::keys()); + EXPECT_EQ(7, ReportCategories::keys().size()); +} + +TEST(ReportCategoriesTest, AllCanonicalKeysAreValid) +{ + for (const QString &category : ReportCategories::keys()) { + EXPECT_TRUE(ReportCategories::isValid(category)) << category.toStdString(); + } +} + +TEST(ReportCategoriesTest, LegacyCategoriesRemainValid) +{ + EXPECT_TRUE(ReportCategories::isValid("bug_abuse")); + EXPECT_TRUE(ReportCategories::isValid("verbal_abuse")); +} + +TEST(ReportCategoriesTest, ValidationIsCaseInsensitive) +{ + EXPECT_TRUE(ReportCategories::isValid("Cheating")); + EXPECT_TRUE(ReportCategories::isValid("HATE_SPEECH")); +} + +TEST(ReportCategoriesTest, UnknownAndEmptyCategoriesAreRejected) +{ + EXPECT_FALSE(ReportCategories::isValid(QString())); + EXPECT_FALSE(ReportCategories::isValid("hate speech")); + EXPECT_FALSE(ReportCategories::isValid("griefing")); +} + +int main(int argc, char **argv) +{ + ::testing::InitGoogleTest(&argc, argv); + return RUN_ALL_TESTS(); +} \ No newline at end of file