Add checkParamCount() which stops the event if something's wrong

diff --git a/src/common/ircevent.h b/src/common/ircevent.h
index 0f4336d..e8e21ac 100644 (file)
--- a/src/common/ircevent.h
+++ b/src/common/ircevent.h
@@ -22,6 +22,7 @@
 #define IRCEVENT_H
 
 #include "networkevent.h"
+#include "util.h"
 
 class IrcEvent : public NetworkEvent {
 public:
@@ -34,6 +35,8 @@ public:
   inline QString prefix() const { return _prefix; }
   inline void setPrefix(const QString &prefix) { _prefix = prefix; }
 
+  inline QString nick() const { return nickFromMask(prefix()); }
+
   inline QStringList params() const { return _params; }
   inline void setParams(const QStringList &params) { _params = params; }
 

diff --git a/src/core/coresessioneventprocessor.cpp b/src/core/coresessioneventprocessor.cpp
index ebfb007..8599524 100644 (file)
--- a/src/core/coresessioneventprocessor.cpp
+++ b/src/core/coresessioneventprocessor.cpp
@@ -31,6 +31,20 @@ CoreSessionEventProcessor::CoreSessionEventProcessor(CoreSession *session)
 
 }
 
+bool CoreSessionEventProcessor::checkParamCount(IrcEvent *e, int minParams) {
+  if(e->params().count() < minParams) {
+    if(e->type() == EventManager::IrcEventNumeric) {
+      qWarning() << "Command " << static_cast<IrcEventNumeric *>(e)->number() << " requires " << minParams << "params, got: " << e->params();
+    } else {
+      QString name = coreSession()->eventManager()->enumName(e->type());
+      qWarning() << qPrintable(name) << "requires" << minParams << "params, got:" << e->params();
+    }
+    e->stop();
+    return false;
+  }
+  return true;
+}
+
 void CoreSessionEventProcessor::processIrcEventNumeric(IrcEventNumeric *e) {
   switch(e->number()) {
 

diff --git a/src/core/coresessioneventprocessor.h b/src/core/coresessioneventprocessor.h
index fa647d0..4d7559d 100644 (file)
--- a/src/core/coresessioneventprocessor.h
+++ b/src/core/coresessioneventprocessor.h
@@ -24,6 +24,7 @@
 #include <QObject>
 
 class CoreSession;
+class IrcEvent;
 class IrcEventNumeric;
 
 class CoreSessionEventProcessor : public QObject {
@@ -37,6 +38,7 @@ public:
   Q_INVOKABLE void processIrcEventNumeric(IrcEventNumeric *event);
 
 protected:
+  bool checkParamCount(IrcEvent *event, int minParams);
 
 private:
   CoreSession *_coreSession;