X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcoresession.h;h=3bc7cd0ac4c07f2e8bc1ec8d2005d54f1c56eacf;hp=48d83f88c285e477e10e7b08a34f9e4c1c6af3f1;hb=16f22647e6890d3eb8c3e94f7a0700e12fa29e44;hpb=b9828e0dd235964b8e2e97f844f4bed3476d3bd4 diff --git a/src/core/coresession.h b/src/core/coresession.h index 48d83f88..3bc7cd0a 100644 --- a/src/core/coresession.h +++ b/src/core/coresession.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-09 by the Quassel Project * + * Copyright (C) 2005-2016 by the Quassel Project * * devel@quassel-irc.org * * * * This program is free software; you can redistribute it and/or modify * @@ -15,7 +15,7 @@ * 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 CORESESSION_H @@ -26,152 +26,225 @@ #include "corecoreinfo.h" #include "corealiasmanager.h" +#include "coreignorelistmanager.h" +#include "peer.h" +#include "protocol.h" #include "message.h" #include "storage.h" +#include "corehighlightrulemanager.h" class CoreBacklogManager; class CoreBufferSyncer; class CoreBufferViewManager; -class CoreIrcListHelper; -class Identity; +class CoreDccConfig; class CoreIdentity; -class NetworkConnection; +class CoreIrcListHelper; class CoreNetwork; -struct NetworkInfo; +class CoreNetworkConfig; +class CoreSessionEventProcessor; +class CoreTransferManager; +class CtcpParser; +class EventManager; +class EventStringifier; +class InternalPeer; +class IrcParser; +class MessageEvent; +class NetworkConnection; +class RemotePeer; class SignalProxy; +struct NetworkInfo; + class QScriptEngine; -class CoreSession : public QObject { - Q_OBJECT +class CoreSession : public QObject +{ + Q_OBJECT public: - CoreSession(UserId, bool restoreState, QObject *parent = 0); - ~CoreSession(); + CoreSession(UserId, bool restoreState, QObject *parent = 0); + ~CoreSession(); + + QList buffers() const; + inline UserId user() const { return _user; } + CoreNetwork *network(NetworkId) const; + CoreIdentity *identity(IdentityId) const; + inline CoreNetworkConfig *networkConfig() const { return _networkConfig; } + NetworkConnection *networkConnection(NetworkId) const; - QList buffers() const; - inline UserId user() const { return _user; } - CoreNetwork *network(NetworkId) const; - NetworkConnection *networkConnection(NetworkId) const; - CoreIdentity *identity(IdentityId) const; + Protocol::SessionState sessionState() const; - QVariant sessionState(); + inline SignalProxy *signalProxy() const { return _signalProxy; } - inline SignalProxy *signalProxy() const { return _signalProxy; } + const AliasManager &aliasManager() const { return _aliasManager; } + AliasManager &aliasManager() { return _aliasManager; } - const AliasManager &aliasManager() const { return _aliasManager; } - AliasManager &aliasManager() { return _aliasManager; } + inline EventManager *eventManager() const { return _eventManager; } + inline EventStringifier *eventStringifier() const { return _eventStringifier; } + inline CoreSessionEventProcessor *sessionEventProcessor() const { return _sessionEventProcessor; } + inline CtcpParser *ctcpParser() const { return _ctcpParser; } + inline IrcParser *ircParser() const { return _ircParser; } - inline CoreIrcListHelper *ircListHelper() const { return _ircListHelper; } + inline CoreIrcListHelper *ircListHelper() const { return _ircListHelper; } + + inline CoreIgnoreListManager *ignoreListManager() { return &_ignoreListManager; } + inline HighlightRuleManager *highlightRuleManager() { return &_highlightRuleManager; } + inline CoreTransferManager *transferManager() const { return _transferManager; } + inline CoreDccConfig *dccConfig() const { return _dccConfig; } // void attachNetworkConnection(NetworkConnection *conn); - //! Return necessary data for restoring the session after restarting the core - void saveSessionState() const; - void restoreSessionState(); + //! Return necessary data for restoring the session after restarting the core + void restoreSessionState(); public slots: - void addClient(QIODevice *device); - void addClient(SignalProxy *proxy); + void addClient(RemotePeer *peer); + void addClient(InternalPeer *peer); + + void msgFromClient(BufferInfo, QString message); - void msgFromClient(BufferInfo, QString message); + //! Create an identity and propagate the changes to the clients. + /** \param identity The identity to be created. + */ + void createIdentity(const Identity &identity, const QVariantMap &additional); + void createIdentity(const CoreIdentity &identity); - //! Create an identity and propagate the changes to the clients. - /** \param identity The identity to be created. - */ - void createIdentity(const Identity &identity, const QVariantMap &additional); - void createIdentity(const CoreIdentity &identity); + //! Remove identity and propagate that fact to the clients. + /** \param identity The identity to be removed. + */ + void removeIdentity(IdentityId identity); - //! Remove identity and propagate that fact to the clients. - /** \param identity The identity to be removed. - */ - void removeIdentity(IdentityId identity); + //! Create a network and propagate the changes to the clients. + /** \param info The network's settings. + */ + void createNetwork(const NetworkInfo &info, const QStringList &persistentChannels = QStringList()); - //! Create a network and propagate the changes to the clients. - /** \param info The network's settings. - */ - void createNetwork(const NetworkInfo &info, const QStringList &persistentChannels = QStringList()); + //! Remove network and propagate that fact to the clients. + /** \param network The id of the network to be removed. + */ + void removeNetwork(NetworkId network); - //! Remove network and propagate that fact to the clients. - /** \param network The id of the network to be removed. - */ - void removeNetwork(NetworkId network); + //! Rename a Buffer for a given network + /* \param networkId The id of the network the buffer belongs to + * \param newName The new name of the buffer + * \param oldName The old name of the buffer + */ + void renameBuffer(const NetworkId &networkId, const QString &newName, const QString &oldName); - //! Rename a Buffer for a given network - /* \param networkId The id of the network the buffer belongs to - * \param newName The new name of the buffer - * \param oldName The old name of the buffer - */ - void renameBuffer(const NetworkId &networkId, const QString &newName, const QString &oldName); + void changePassword(PeerPtr peer, const QString &userName, const QString &oldPassword, const QString &newPassword); - QHash persistentChannels(NetworkId) const; + void kickClient(int peerId); + + QHash persistentChannels(NetworkId) const; + + /** + * Marks us away (or unaway) on all networks + * + * @param[in] msg Away message, or blank to set unaway + * @param[in] skipFormatting If true, skip timestamp formatting codes (e.g. if already done) + */ + void globalAway(const QString &msg = QString(), const bool skipFormatting = false); signals: - void initialized(); - void sessionState(const QVariant &); + void initialized(); + void sessionState(const Protocol::SessionState &sessionState); - //void msgFromGui(uint netid, QString buf, QString message); - void displayMsg(Message message); - void displayStatusMsg(QString, QString); + //void msgFromGui(uint netid, QString buf, QString message); + void displayMsg(Message message); + void displayStatusMsg(QString, QString); - void scriptResult(QString result); + 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. - */ - void identityCreated(const Identity &identity); + //! 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. + */ + void identityCreated(const Identity &identity); - //! Identity has been removed. - /** This signal is propagated to the clients to inform them about the removal of the given identity. - * \param identity The identity that has been removed. - */ - void identityRemoved(IdentityId identity); + //! Identity has been removed. + /** This signal is propagated to the clients to inform them about the removal of the given identity. + * \param identity The identity that has been removed. + */ + void identityRemoved(IdentityId identity); - void networkCreated(NetworkId); - void networkRemoved(NetworkId); + void networkCreated(NetworkId); + void networkRemoved(NetworkId); + void networkDisconnected(NetworkId); -private slots: - void removeClient(QIODevice *dev); + void passwordChanged(PeerPtr peer, bool success); - void recvStatusMsgFromServer(QString msg); - void recvMessageFromServer(NetworkId networkId, Message::Type, BufferInfo::Type, const QString &target, const QString &text, const QString &sender = "", Message::Flags flags = Message::None); + void disconnectFromCore(); - void destroyNetwork(NetworkId); +protected: + virtual void customEvent(QEvent *event); - void scriptRequest(QString script); +private slots: + void removeClient(Peer *peer); - void clientsConnected(); - void clientsDisconnected(); + void recvStatusMsgFromServer(QString msg); + void recvMessageFromServer(NetworkId networkId, Message::Type, BufferInfo::Type, const QString &target, const QString &text, const QString &sender = "", Message::Flags flags = Message::None); - void updateIdentityBySender(); + void destroyNetwork(NetworkId); -protected: - virtual void customEvent(QEvent *event); + void scriptRequest(QString script); -private: - void loadSettings(); - void initScriptEngine(); - void processMessages(); + void clientsConnected(); + void clientsDisconnected(); - UserId _user; + void updateIdentityBySender(); - SignalProxy *_signalProxy; - CoreAliasManager _aliasManager; - // QHash _connections; - QHash _networks; - // QHash _networksToRemove; - QHash _identities; + void saveSessionState() const; - CoreBufferSyncer *_bufferSyncer; - CoreBacklogManager *_backlogManager; - CoreBufferViewManager *_bufferViewManager; - CoreIrcListHelper *_ircListHelper; - CoreCoreInfo _coreInfo; +private: + void processMessages(); + + void loadSettings(); + void initScriptEngine(); + + /// Hook for converting events to the old displayMsg() handlers + Q_INVOKABLE void processMessageEvent(MessageEvent *event); + + UserId _user; + + SignalProxy *_signalProxy; + CoreAliasManager _aliasManager; + // QHash _connections; + QHash _networks; + // QHash _networksToRemove; + QHash _identities; + + CoreBufferSyncer *_bufferSyncer; + CoreBacklogManager *_backlogManager; + CoreBufferViewManager *_bufferViewManager; + CoreDccConfig *_dccConfig; + CoreIrcListHelper *_ircListHelper; + CoreNetworkConfig *_networkConfig; + CoreCoreInfo _coreInfo; + CoreTransferManager *_transferManager; + + EventManager *_eventManager; + EventStringifier *_eventStringifier; // should eventually move into client + CoreSessionEventProcessor *_sessionEventProcessor; + 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. + * @param sender The hostmask of the sender + * @param bufferInfo The BufferInfo object of the buffer + */ + QString senderPrefixes(const QString &sender, const BufferInfo &bufferInfo) const; + QList _messageQueue; + bool _processMessages; + CoreIgnoreListManager _ignoreListManager; + CoreHighlightRuleManager _highlightRuleManager; +}; - QScriptEngine *scriptEngine; - struct RawMessage { +struct RawMessage { NetworkId networkId; Message::Type type; BufferInfo::Type bufferType; @@ -180,10 +253,7 @@ private: QString sender; Message::Flags flags; RawMessage(NetworkId networkId, Message::Type type, BufferInfo::Type bufferType, const QString &target, const QString &text, const QString &sender, Message::Flags flags) - : networkId(networkId), type(type), bufferType(bufferType), target(target), text(text), sender(sender), flags(flags) {} - }; - QList _messageQueue; - bool _processMessages; + : networkId(networkId), type(type), bufferType(bufferType), target(target), text(text), sender(sender), flags(flags) {} }; #endif