diff --git a/src/proxy/GmcpMessage.h b/src/proxy/GmcpMessage.h index 806e3b4a1..8cd11b799 100644 --- a/src/proxy/GmcpMessage.h +++ b/src/proxy/GmcpMessage.h @@ -31,6 +31,7 @@ class ParseEvent; X(EVENT_MOVED, EventMoved, "event.moved", "Event.Moved") \ X(EVENT_MOON, EventMoon, "event.moon", "Event.Moon") \ X(EVENT_SUN, EventSun, "event.sun", "Event.Sun") \ + X(EXTERNAL_DISCORD_GET, ExternalDiscordGet, "external.discord.get", "External.Discord.Get") \ X(EXTERNAL_DISCORD_HELLO, \ ExternalDiscordHello, \ "external.discord.hello", \ @@ -66,7 +67,7 @@ enum class NODISCARD GmcpMessageTypeEnum { #define X_COUNT(...) +1 static constexpr const size_t NUM_GMCP_MESSAGES = XFOREACH_GMCP_MESSAGE_TYPE(X_COUNT); #undef X_COUNT -static_assert(NUM_GMCP_MESSAGES == 30); +static_assert(NUM_GMCP_MESSAGES == 31); DEFINE_ENUM_COUNT(GmcpMessageTypeEnum, NUM_GMCP_MESSAGES) namespace tags { diff --git a/src/proxy/proxy.cpp b/src/proxy/proxy.cpp index 0d269daaa..f56eb3027 100644 --- a/src/proxy/proxy.cpp +++ b/src/proxy/proxy.cpp @@ -544,9 +544,7 @@ void Proxy::allocMudTelnet() } void virt_onMumeClientError(const QString &errmsg) final { - qInfo() << errmsg; - getProxy().sendToUser(SendToUserSourceEnum::FromMMapper, - QString("MUME.Client protocol error: %1").arg(errmsg)); + qWarning() << "MUME.Client protocol error:" << errmsg; } }; diff --git a/tests/TestProxy.cpp b/tests/TestProxy.cpp index 077d9b0e4..c39dcf59d 100644 --- a/tests/TestProxy.cpp +++ b/tests/TestProxy.cpp @@ -34,6 +34,12 @@ void TestProxy::gmcpMessageDeserializeTest() GmcpMessage gmcp3 = GmcpMessage::fromRawBytes(R"(External.Discord.Hello)"); QCOMPARE(gmcp3.getName().toQByteArray(), QByteArray("External.Discord.Hello")); QVERIFY(!gmcp3.getJson()); + QVERIFY(gmcp3.isExternalDiscordHello()); + + GmcpMessage gmcp4 = GmcpMessage::fromRawBytes(R"(External.Discord.Get)"); + QCOMPARE(gmcp4.getName().toQByteArray(), QByteArray("External.Discord.Get")); + QVERIFY(!gmcp4.getJson()); + QVERIFY(gmcp4.isExternalDiscordGet()); } void TestProxy::gmcpMessageSerializeTest()