fix to dice roll regex, added error output when invalid dice roll

strings are sent by plugins

Author: R-Rudolph

OmegaRPG/omegarpgmainwindow.cpp

@@ -187,6 +187,7 @@ OmegaRpgMainWindow::OmegaRpgMainWindow()
   connect(playerList,&PlayerListAreaWidget::openWhisper,chat,&ChatAreaWidget::openWhisperTab);
   connect(playerList,&PlayerListAreaWidget::bootFromRoom,control,&orpg::ClientControl::kick);
   connect(playerList,&PlayerListAreaWidget::chat,chat,&ChatAreaWidget::chatPrivate);
+  connect(playerList,&PlayerListAreaWidget::error,chat,&ChatAreaWidget::printErrorMessage);
 
   //settings window signals
   connect(settingsWindow,&OmegaRpgSettingsWindow::demandSettings,this,&OmegaRpgMainWindow::updateSettingsWindow);

core/client/util/diceroll.cpp

@@ -14,7 +14,7 @@ const QRegularExpression DiceRoll::completeStringRegEx_ =
                          "(?<"+signString_+">[+-]?)[\\s\\t]*"                                                   /// sign of first roll
                          "(((?<"+numString_+">\\d+)?(?<"+diceString_+">d))?(?<"+valueString_+">\\d+))[\\s\\t]*" /// dice of first roll
                          "(\\((?<"+nameString_+">.*?)\\))?[\\s\\t]*"                                            /// name of first roll
-                         "(?<"+remainingString_+">([+-][\\s\\t]*((\\d+)?(d))?(\\d+)[\\s\\t]*(.*?)[\\s\\t]*?)*)"   ///remaining rolls
+                         "(?<"+remainingString_+">([+-][\\s\\t]*((\\d+)?(d))?(\\d+)[\\s\\t]*(\\(.*?\\))?[\\s\\t]*)*)"   ///remaining rolls
                          "$");
 
 QString DiceRoll::rawString() const

gui/client/plugins/plugin.cpp

@@ -1,5 +1,6 @@
 #include "plugin.h"
 #include "core/client/util/diceroll.h"
+#include "core/client/util/dice.h"
 
 Plugin::Plugin(QQuickItem *parent) : QQuickItem(parent)
 {
@@ -51,7 +52,14 @@ void Plugin::setEditable(bool editable)
 void Plugin::roll(const QString& rollString)
 {
   DiceRoll diceRoll(rollString);
-  chat(diceRoll.roll());
+  if(diceRoll.valid())
+  {
+    chat(diceRoll.roll());
+  }
+  else
+  {
+    error("Malformed dice roll string: "+diceRoll.rawString());
+  }
 }
 
 

gui/client/plugins/plugin.h

@@ -28,6 +28,7 @@ class Plugin : public QQuickItem
   void pluginDataSet();
   void pluginDataChanged(const QJsonObject& data);
   void chat(const QString& text);
+  void error(const QString& text);
 public slots:
 private:
   bool editable_;

gui/client/widgets/alias/aliassheetbinderwidget.cpp

@@ -57,6 +57,7 @@ void AliasSheetBinderWidget::addSheetWidget(AliasSheetWidget *sheet)
     tabs->addTab(sheet,sheet->getSheetName());
     sheet->setNightMode(nightMode);
     connect(sheet,&AliasSheetWidget::chat,this,&AliasSheetBinderWidget::chat);
+    connect(sheet,&AliasSheetWidget::error,this,&AliasSheetBinderWidget::error);
     connect(sheet,&AliasSheetWidget::changed,this,&AliasSheetBinderWidget::changed);
   }
 }

gui/client/widgets/alias/aliassheetpluginwidget.cpp

@@ -20,6 +20,7 @@ AliasSheetPluginWidget::AliasSheetPluginWidget(const AliasSheetPlugin* sheet, bo
       data_ = sheet_->pluginData();
       connect(pluginWidget,&Plugin::pluginDataChanged,this,&AliasSheetPluginWidget::pluginDataChanged);
       connect(pluginWidget,&Plugin::chat,this,&AliasSheetWidget::chat);
+      connect(pluginWidget,&Plugin::error,this,&AliasSheetWidget::error);
     }
   }
   else

gui/client/widgets/alias/aliassheetreadwidget.cpp

@@ -44,6 +44,7 @@ void AliasSheetReadWidget::currentChanged(const Alias *alias)
     updateNightMode();
     connect(binder,&AliasSheetBinderWidget::changed,this,&AliasSheetReadWidget::changed);
     connect(binder,&AliasSheetBinderWidget::chat,this,&AliasSheetReadWidget::chat);
+    connect(binder,&AliasSheetBinderWidget::error,this,&AliasSheetReadWidget::error);
   }
 }
 

gui/client/widgets/alias/aliassheetreadwidget.h

@@ -22,6 +22,7 @@ class AliasSheetReadWidget : public QWidget
 signals:
   void editedAlias(Alias* alias);
   void chat(const QString& text);
+  void error(const QString& text);
 public slots:
   void setNightMode(bool value);
 private slots:

gui/client/widgets/alias/aliassheetwidget.h

@@ -23,6 +23,7 @@ class AliasSheetWidget : public QWidget
 signals:
   void changed();
   void chat(const QString& text);
+  void error(const QString& text);
 public slots:
   void exportSheet();
   virtual void setNightMode(bool value);

gui/client/widgets/chatareawidget.cpp

@@ -474,7 +474,7 @@ void ChatAreaWidget::printStatusMessage(QString text)
 void ChatAreaWidget::printChatMessage(const orpg::ChatMessage& chatMessage)
 {
   QTextBrowser* tb = getChatBrowser(chatMessage.senderId(),chatMessage.to());
-  if(tb==NULL)
+  if(tb==nullptr)
     return;
   QString idpart;
   if(chatMessage.hasSenderId())