X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcore.h;h=8047598a8a28ad325d505fcb8e658df33bb17b9f;hp=bb1adf01ab6ed76c379d9edfc3227f24f86ad364;hb=f9c4125d5da21eac006eaa2558f87705ddefff4f;hpb=bd1a18355495899b5ce3003599a67e1ea7ca01cc diff --git a/src/core/core.h b/src/core/core.h index bb1adf01..8047598a 100644 --- a/src/core/core.h +++ b/src/core/core.h @@ -26,8 +26,14 @@ #include #include #include -#include + +#ifndef QT_NO_OPENSSL +#include +#include "sslserver.h" +#else #include +#include +#endif #include "bufferinfo.h" #include "message.h" @@ -53,6 +59,24 @@ class Core : public QObject { /*** Storage access ***/ // These methods are threadsafe. + //! Store a user setting persistently + /** + * \param userId The users Id + * \param settingName The Name of the Setting + * \param data The Value + */ + static void setUserSetting(UserId userId, const QString &settingName, const QVariant &data); + + //! Retrieve a persistent user setting + /** + * \param userId The users Id + * \param settingName The Name of the Setting + * \param default Value to return in case it's unset. + * \return the Value of the Setting or the default value if it is unset. + */ + static QVariant getUserSetting(UserId userId, const QString &settingName, const QVariant &data = QVariant()); + + //! Create a Network in the Storage and store it's Id in the given NetworkInfo /** \note This method is thredsafe. * @@ -97,6 +121,52 @@ class Core : public QObject { */ static NetworkId networkId(UserId user, const QString &network); + //! Get a list of Networks to restore + /** Return a list of networks the user was connected at the time of core shutdown + * \note This method is threadsafe. + * + * \param user The User Id in question + */ + static QList connectedNetworks(UserId user); + + //! Update the connected state of a network + /** \note This method is threadsafe + * + * \param user The Id of the networks owner + * \param networkId The Id of the network + * \param isConnected whether the network is connected or not + */ + static void setNetworkConnected(UserId user, const NetworkId &networkId, bool isConnected); + + //! Get a hash of channels with their channel keys for a given network + /** The keys are channel names and values are passwords (possibly empty) + * \note This method is threadsafe + * + * \param user The id of the networks owner + * \param networkId The Id of the network + */ + static QHash persistentChannels(UserId user, const NetworkId &networkId); + + //! Update the connected state of a channel + /** \note This method is threadsafe + * + * \param user The Id of the networks owner + * \param networkId The Id of the network + * \param channel The name of the channel + * \param isJoined whether the channel is connected or not + */ + static void setChannelPersistent(UserId user, const NetworkId &networkId, const QString &channel, bool isJoined); + + //! Update the key of a channel + /** \note This method is threadsafe + * + * \param user The Id of the networks owner + * \param networkId The Id of the network + * \param channel The name of the channel + * \param key The key of the channel (possibly empty) + */ + static void setPersistentChannelKey(UserId user, const NetworkId &networkId, const QString &channel, const QString &key); + //! Get the unique BufferInfo for the given combination of network and buffername for a user. /** \note This method is threadsafe. * @@ -133,7 +203,7 @@ class Core : public QObject { * \param offset Do not return (but DO count) messages with MsgId >= offset, if offset >= 0 * \return The requested list of messages */ - static QList requestMsgs(BufferInfo buffer, int lastmsgs = -1, int offset = -1); + static QList requestMsgs(UserId user, BufferId buffer, int lastmsgs = -1, int offset = -1); //! Request messages stored in a given buffer since a certain point in time. /** \note This method is threadsafe. @@ -143,7 +213,7 @@ class Core : public QObject { * \param offset Do not return messages with MsgId >= offset, if offset >= 0 * \return The requested list of messages */ - static QList requestMsgs(BufferInfo buffer, QDateTime since, int offset = -1); + static QList requestMsgs(UserId user, BufferId buffer, QDateTime since, int offset = -1); //! Request a range of messages stored in a given buffer. /** \note This method is threadsafe. @@ -153,19 +223,16 @@ class Core : public QObject { * \param last Return messages with first <= MsgId <= last * \return The requested list of messages */ - static QList requestMsgRange(BufferInfo buffer, int first, int last); + static QList requestMsgRange(UserId user, BufferId buffer, int first, int last); - //! Request a list of all buffers known to a user since a certain point in time. + //! Request a list of all buffers known to a user. /** This method is used to get a list of all buffers we have stored a backlog from. - * Optionally, a QDateTime can be given, so that only buffers are listed that were active - * since that point in time. * \note This method is threadsafe. * * \param user The user whose buffers we request - * \param since If this is defined, older buffers will be ignored * \return A list of the BufferInfos for all buffers as requested */ - static QList requestBuffers(UserId user, QDateTime since = QDateTime()); + static QList requestBuffers(UserId user); //! Remove permanently a buffer and it's content from the storage backend /** This call cannot be reverted! @@ -193,17 +260,17 @@ class Core : public QObject { * * \param user The Owner of that Buffer * \param bufferId The buffer id - * \param seenDate Time the Buffer has been visited the last time + * \param MsgId The Message id of the message that has been just seen */ - static void setBufferLastSeen(UserId user, const BufferId &bufferId, const QDateTime &seenDate); + static void setBufferLastSeenMsg(UserId user, const BufferId &bufferId, const MsgId &msgId); - //! Get a Hash of all last seen dates. - /** This Method is called when the Quassel Core is started to restore the lastSeenDates + //! Get a Hash of all last seen message ids + /** This Method is called when the Quassel Core is started to restore the lastSeenMsgIds * \note This method is threadsafe. * * \param user The Owner of the buffers */ - static QHash bufferLastSeenDates(UserId user); + static QHash bufferLastSeenMsgIds(UserId user); public slots: //! Make storage data persistent @@ -224,6 +291,11 @@ class Core : public QObject { bool initStorage(QVariantMap dbSettings, bool setup = false); +#ifndef QT_NO_OPENSSL + void sslErrors(const QList &errors); +#endif + void socketError(QAbstractSocket::SocketError); + private: Core(); ~Core(); @@ -243,7 +315,12 @@ class Core : public QObject { Storage *storage; QTimer _storageSyncTimer; - QTcpServer server; // TODO: implement SSL +#ifndef QT_NO_OPENSSL + SslServer server; +#else + QTcpServer server; +#endif + QHash blocksizes; QHash clientInfo;