X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcoresession.h;h=f47d175abcee51a5fc42d791fedd7f0ab7b0c5e7;hp=d44a9c49cb871d930596c1cc08a1d02f72a65314;hb=6e3574a163f07c28d44276318f2d9f92e169f491;hpb=edc55b1f86cf613a332eeeb5d85537a54120dfa5

diff --git a/src/core/coresession.h b/src/core/coresession.h
index d44a9c49..f47d175a 100644
--- a/src/core/coresession.h
+++ b/src/core/coresession.h
@@ -21,6 +21,7 @@
 #pragma once
 
 #include <utility>
+#include <vector>
 
 #include <QHash>
 #include <QSet>
@@ -32,6 +33,7 @@
 #include "coreignorelistmanager.h"
 #include "coreinfo.h"
 #include "message.h"
+#include "metricsserver.h"
 #include "peer.h"
 #include "protocol.h"
 #include "storage.h"
@@ -57,8 +59,6 @@ class SignalProxy;
 
 struct NetworkInfo;
 
-class QScriptEngine;
-
 class CoreSession : public QObject
 {
     Q_OBJECT
@@ -66,7 +66,7 @@ class CoreSession : public QObject
 public:
     CoreSession(UserId, bool restoreState, bool strictIdentEnabled, QObject* parent = nullptr);
 
-    QList<BufferInfo> buffers() const;
+    std::vector<BufferInfo> buffers() const;
     inline UserId user() const { return _user; }
     CoreNetwork* network(NetworkId) const;
     CoreIdentity* identity(IdentityId) const;
@@ -172,8 +172,6 @@ signals:
     void displayMsg(Message message);
     void displayStatusMsg(QString, QString);
 
-    void scriptResult(QString result);
-
     //! Identity has been created.
     /** This signal is propagated to the clients to tell them that the given identity has been created.
      *  \param identity The new identity.
@@ -205,8 +203,6 @@ private slots:
 
     void destroyNetwork(NetworkId);
 
-    void scriptRequest(QString script);
-
     void clientsConnected();
     void clientsDisconnected();
 
@@ -220,7 +216,6 @@ private:
     void processMessages();
 
     void loadSettings();
-    void initScriptEngine();
 
     /// Hook for converting events to the old displayMsg() handlers
     Q_INVOKABLE void processMessageEvent(MessageEvent* event);
@@ -252,8 +247,6 @@ private:
     CtcpParser* _ctcpParser;
     IrcParser* _ircParser;
 
-    QScriptEngine* scriptEngine;
-
     /**
      * This method obtains the prefixes of the message's sender within a channel, by looking up their channelmodes, and
      * processing them to prefixes based on the network's settings.
@@ -279,6 +272,7 @@ private:
     bool _processMessages;
     CoreIgnoreListManager _ignoreListManager;
     CoreHighlightRuleManager _highlightRuleManager;
+    MetricsServer* _metricsServer{nullptr};
 };
 
 struct NetworkInternalMessage
@@ -306,6 +300,7 @@ struct NetworkInternalMessage
 
 struct RawMessage
 {
+    QDateTime timestamp;
     NetworkId networkId;
     Message::Type type;
     BufferInfo::Type bufferType;
@@ -314,14 +309,16 @@ struct RawMessage
     QString sender;
     Message::Flags flags;
 
-    RawMessage(NetworkId networkId,
+    RawMessage(QDateTime timestamp,
+               NetworkId networkId,
                Message::Type type,
                BufferInfo::Type bufferType,
                QString target,
                QString text,
                QString sender,
                Message::Flags flags)
-        : networkId(networkId)
+        : timestamp(std::move(timestamp))
+        , networkId(networkId)
         , type(type)
         , bufferType(bufferType)
         , target(std::move(target))
@@ -332,7 +329,8 @@ struct RawMessage
 
     RawMessage(NetworkId networkId,
                const NetworkInternalMessage& msg)
-        : networkId(networkId)
+        : timestamp(QDateTime::currentDateTimeUtc())
+        , networkId(networkId)
         , type(msg.type)
         , bufferType(msg.bufferType)
         , target(msg.target)