X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fctcpparser.h;h=81f18860fd0a4b4c4eda72d1e15e44e3df6eca36;hp=109159692091c03356cb841122506e9063cce11c;hb=cc6e7c08709c4e761e2fd9c2e322751015497003;hpb=283fdb2c49e5efa1d497d8c3e6f624f86d008ff8

diff --git a/src/core/ctcpparser.h b/src/core/ctcpparser.h
index 10915969..81f18860 100644
--- a/src/core/ctcpparser.h
+++ b/src/core/ctcpparser.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2010 by the Quassel Project                        *
+ *   Copyright (C) 2005-2019 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -15,77 +15,95 @@
  *   You should have received a copy of the GNU General Public License     *
  *   along with this program; if not, write to the                         *
  *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
 #ifndef CTCPPARSER_H
 #define CTCPPARSER_H
 
+#include <utility>
+
 #include <QUuid>
 
 #include "corenetwork.h"
+#include "ctcpevent.h"
 #include "eventmanager.h"
 #include "ircevent.h"
 
 class CoreSession;
 class CtcpEvent;
 
-class CtcpParser : public QObject {
-  Q_OBJECT
+class CtcpParser : public QObject
+{
+    Q_OBJECT
 
 public:
-  CtcpParser(CoreSession *coreSession, QObject *parent = 0);
-
-  inline CoreSession *coreSession() const { return _coreSession; }
-
-  void query(CoreNetwork *network, const QString &bufname, const QString &ctcpTag, const QString &message);
-  void reply(CoreNetwork *network, const QString &bufname, const QString &ctcpTag, const QString &message);
+    CtcpParser(CoreSession* coreSession, QObject* parent = nullptr);
 
-  Q_INVOKABLE void processIrcEventRawNotice(IrcEventRawMessage *event);
-  Q_INVOKABLE void processIrcEventRawPrivmsg(IrcEventRawMessage *event);
+    inline CoreSession* coreSession() const { return _coreSession; }
 
-  Q_INVOKABLE void sendCtcpEvent(CtcpEvent *event);
+    void query(CoreNetwork* network, const QString& bufname, const QString& ctcpTag, const QString& message);
+    void reply(CoreNetwork* network, const QString& bufname, const QString& ctcpTag, const QString& message);
 
-protected:
-  inline CoreNetwork *coreNetwork(NetworkEvent *e) const { return qobject_cast<CoreNetwork *>(e->network()); }
-
-  // FIXME duplicates functionality in EventStringifier, maybe want to put that in something common
-  //! Creates and sends a MessageEvent
-  void displayMsg(NetworkEvent *event,
-                  Message::Type msgType,
-                  const QString &msg,
-                  const QString &sender = QString(),
-                  const QString &target = QString(),
-                  Message::Flags msgFlags = Message::None);
+    Q_INVOKABLE void processIrcEventRawNotice(IrcEventRawMessage* event);
+    Q_INVOKABLE void processIrcEventRawPrivmsg(IrcEventRawMessage* event);
 
-  void parse(IrcEventRawMessage *event, Message::Type msgType);
+    Q_INVOKABLE void sendCtcpEvent(CtcpEvent* event);
 
-  QByteArray lowLevelQuote(const QByteArray &);
-  QByteArray lowLevelDequote(const QByteArray &);
-  QByteArray xdelimQuote(const QByteArray &);
-  QByteArray xdelimDequote(const QByteArray &);
+signals:
+    void newEvent(Event* event);
 
-  QByteArray pack(const QByteArray &ctcpTag, const QByteArray &message);
-  void packedReply(CoreNetwork *network, const QString &bufname, const QList<QByteArray> &replies);
+protected:
+    inline CoreNetwork* coreNetwork(NetworkEvent* e) const { return qobject_cast<CoreNetwork*>(e->network()); }
+
+    // FIXME duplicates functionality in EventStringifier, maybe want to put that in something common
+    //! Creates and sends a MessageEvent
+    void displayMsg(NetworkEvent* event,
+                    Message::Type msgType,
+                    const QString& msg,
+                    const QString& sender = QString(),
+                    const QString& target = QString(),
+                    Message::Flags msgFlags = Message::None);
+
+    void parse(IrcEventRawMessage* event, Message::Type msgType);
+    void parseSimple(
+        IrcEventRawMessage* e, Message::Type messagetype, QByteArray dequotedMessage, CtcpEvent::CtcpType ctcptype, Message::Flags flags);
+    void parseStandard(
+        IrcEventRawMessage* e, Message::Type messagetype, QByteArray dequotedMessage, CtcpEvent::CtcpType ctcptype, Message::Flags flags);
+
+    QByteArray lowLevelQuote(const QByteArray&);
+    QByteArray lowLevelDequote(const QByteArray&);
+    QByteArray xdelimQuote(const QByteArray&);
+    QByteArray xdelimDequote(const QByteArray&);
+
+    QByteArray pack(const QByteArray& ctcpTag, const QByteArray& message);
+    void packedReply(CoreNetwork* network, const QString& bufname, const QList<QByteArray>& replies);
+
+private slots:
+    void setStandardCtcp(bool enabled);
 
 private:
-  inline QString targetDecode(IrcEventRawMessage *e, const QByteArray &msg) { return coreNetwork(e)->userDecode(e->target(), msg); }
+    inline QString targetDecode(IrcEventRawMessage* e, const QByteArray& msg) { return coreNetwork(e)->userDecode(e->target(), msg); }
 
-  CoreSession *_coreSession;
+    CoreSession* _coreSession;
 
-  struct CtcpReply {
-    CoreNetwork *network;
-    QString bufferName;
-    QList<QByteArray> replies;
+    struct CtcpReply
+    {
+        CoreNetwork* network{nullptr};
+        QString bufferName;
+        QList<QByteArray> replies;
 
-    CtcpReply() : network(0) {}
-    CtcpReply(CoreNetwork *net, const QString &buf) : network(net), bufferName(buf) {}
-  };
+        CtcpReply() = default;
+        CtcpReply(CoreNetwork* net, QString buf)
+            : network(net)
+            , bufferName(std::move(buf))
+        {}
+    };
 
-  QHash<QUuid, CtcpReply> _replies;
+    QHash<QUuid, CtcpReply> _replies;
 
-  QHash<QByteArray, QByteArray> _ctcpMDequoteHash;
-  QHash<QByteArray, QByteArray> _ctcpXDelimDequoteHash;
+    QHash<QByteArray, QByteArray> _ctcpMDequoteHash;
+    QHash<QByteArray, QByteArray> _ctcpXDelimDequoteHash;
 };
 
 #endif