feat: added chat command for rolling dice

OmegaRPG/OmegaRPG.pro

@@ -4,7 +4,7 @@ include(../version.pri)
 
 RC_FILE = OmegaRPG.rc
 QT += widgets network multimedia xml opengl quickwidgets svg
-CONFIG += c++14
+CONFIG += c++17
 CONFIG += static
 INCLUDEPATH += ..
 # INCLUDEPATH += /usr/include/openssl-1.0/

core/client/core-client.pri

@@ -10,6 +10,7 @@ SOURCES += \
     $$PWD/serversource/metaserversource.cpp \
     $$PWD/clientcore.cpp \
     $$PWD/networkclient.cpp \
+    $$PWD/util/chatcommand.cpp \
     $$PWD/util/distancemeasure.cpp \
     $$PWD/util/sslsettings.cpp \
     $$PWD/util/textformat.cpp \
@@ -58,6 +59,7 @@ HEADERS += \
     $$PWD/serversource/metaserversource.h \
     $$PWD/clientcore.h \
     $$PWD/networkclient.h \
+    $$PWD/util/chatcommand.h \
     $$PWD/util/distancemeasure.h \
     $$PWD/util/sslsettings.h \
     $$PWD/util/textformat.h \

core/client/util/chatcommand.cpp

@@ -0,0 +1,46 @@
+#include "chatcommand.h"
+
+const QString ChatCommand::sCommand = "command";
+const QString ChatCommand::sArguments = "arguments";
+const QRegularExpression ChatCommand::sParserString =
+    QRegularExpression("^"
+                       "\\/(?<"+sCommand+">[a-zA-Z0-9_]+)([\\s\\t](?<"+sArguments+">.*))?"
+                       "$");
+
+ChatCommand::ChatCommand()
+{
+    mType = ChatCommandType::INVALID;
+}
+
+ChatCommand::ChatCommand(ChatCommandType type, const QString& commandString, const QString& argumentString) {
+    mType = type;
+    mCommandString = commandString;
+    mArgumentString = argumentString;
+}
+
+std::optional<ChatCommand> ChatCommand::parse(const QString& chatMessage) {
+    const QRegularExpressionMatch match = sParserString.match(chatMessage);
+
+    if(match.hasMatch()) {
+        ChatCommandType type = ChatCommandType::INVALID;
+        QString commandString = match.captured(sCommand);
+        if(commandString == "roll" || commandString == "dice" || commandString == "diceroll" || commandString == "r") {
+            type = ChatCommandType::DICEROLL;
+        }
+        return ChatCommand(type, commandString, match.captured(sArguments));
+    } else {
+        return std::optional<ChatCommand>();
+    }
+}
+
+ChatCommandType ChatCommand::type() const {
+    return mType;
+}
+
+const QString& ChatCommand::commandString() const {
+    return mCommandString;
+}
+
+const QString& ChatCommand::argumentString() const {
+    return mArgumentString;
+}

core/client/util/chatcommand.h

@@ -0,0 +1,31 @@
+#ifndef CHATCOMMAND_H
+#define CHATCOMMAND_H
+
+#include<QString>
+#include<optional>
+#include<QRegularExpression>
+
+enum class ChatCommandType {
+    DICEROLL,
+    INVALID
+};
+
+class ChatCommand
+{
+    static const QString sCommand;
+    static const QString sArguments;
+    static const QRegularExpression sParserString;
+    ChatCommandType mType;
+    QString mCommandString;
+    QString mArgumentString;
+public:
+    ChatCommand();
+    ChatCommand(ChatCommandType type, const QString& commandString, const QString& argumentString);
+    static std::optional<ChatCommand> parse(const QString& chatMessage);
+
+    ChatCommandType type() const;
+    const QString& commandString() const;
+    const QString& argumentString() const;
+};
+
+#endif // CHATCOMMAND_H

gui/client/widgets/chatareawidget.cpp

@@ -3,6 +3,8 @@
 #include "widgets/squarepushbutton.h"
 #include <QtGlobal>
 #include "core/client/util/dice.h"
+#include "core/client/util/diceroll.h"
+#include "core/client/util/chatcommand.h"
 
 QString ChatAreaWidget::getTo()
 {
@@ -392,8 +394,22 @@ void ChatAreaWidget::updateAlias()
 
 void ChatAreaWidget::chatPrivate(QString text)
 {
-  if(!text.isEmpty())
-    emit chat(text,getTo());
+  if(!text.isEmpty()) {
+    if (auto chatCommand = ChatCommand::parse(text)) {
+      if(chatCommand->type() == ChatCommandType::DICEROLL) {
+          DiceRoll roll(chatCommand->argumentString());
+          if(roll.valid()) {
+              emit chat(roll.roll(), getTo());
+          } else {
+              printStatusMessage("Invalid roll format invalid.");
+          }
+      } else {
+          printStatusMessage("Unknown command: " + chatCommand->commandString());
+      }
+    } else {
+      emit chat(text, getTo());
+    }
+  }
 }
 
 void ChatAreaWidget::macroKey(int index)

version.pri

@@ -1,4 +1,4 @@
-win32:VERSION = 0.5.4.0 # major.minor.patch.build
-else:VERSION = 0.5.4    # major.minor.patch
+win32:VERSION = 0.5.5.0 # major.minor.patch.build
+else:VERSION = 0.5.5    # major.minor.patch
 DEFINES += APP_VERSION="\\\"$$VERSION\\\""
 DEFINES += PROTOCOL_VERSION="\\\"0.2.0\\\""