X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcore.h;h=c0916c9b92d11691e105d67c731ecfb40e7d2f30;hp=1c2e0db08b77da23e69ae035ae6a34147d1c75e2;hb=dc2aa39d20b60e7cd8e0ba66ca6c9ed729add008;hpb=4bb7c6540eb44dc47b2b93051a46c5bdc9a7f5ba diff --git a/src/core/core.h b/src/core/core.h index 1c2e0db0..c0916c9b 100644 --- a/src/core/core.h +++ b/src/core/core.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-08 by the Quassel Project * + * Copyright (C) 2005-09 by the Quassel Project * * devel@quassel-irc.org * * * * This program is free software; you can redistribute it and/or modify * @@ -79,6 +79,19 @@ class Core : public QObject { return instance()->storage->getUserSetting(userId, settingName, data); } + /* Identity handling */ + static inline IdentityId createIdentity(UserId user, CoreIdentity &identity) { + return instance()->storage->createIdentity(user, identity); + } + static bool updateIdentity(UserId user, const CoreIdentity &identity) { + return instance()->storage->updateIdentity(user, identity); + } + static void removeIdentity(UserId user, IdentityId identityId) { + instance()->storage->removeIdentity(user, identityId); + } + static QList identities(UserId user) { + return instance()->storage->identities(user); + } //! Create a Network in the Storage and store it's Id in the given NetworkInfo /** \note This method is thredsafe. @@ -188,6 +201,48 @@ class Core : public QObject { return instance()->storage->setPersistentChannelKey(user, networkId, channel, key); } + //! retrieve last known away message for session restore + /** \note This method is threadsafe + * + * \param user The Id of the networks owner + * \param networkId The Id of the network + */ + static inline QString awayMessage(UserId user, NetworkId networkId) { + return instance()->storage->awayMessage(user, networkId); + } + + //! Make away message persistent for session restore + /** \note This method is threadsafe + * + * \param user The Id of the networks owner + * \param networkId The Id of the network + * \param awayMsg The current away message of own user + */ + static inline void setAwayMessage(UserId user, NetworkId networkId, const QString &awayMsg) { + return instance()->storage->setAwayMessage(user, networkId, awayMsg); + } + + //! retrieve last known user mode for session restore + /** \note This method is threadsafe + * + * \param user The Id of the networks owner + * \param networkId The Id of the network + */ + static inline QString userModes(UserId user, NetworkId networkId) { + return instance()->storage->userModes(user, networkId); + } + + //! Make our user modes persistent for session restore + /** \note This method is threadsafe + * + * \param user The Id of the networks owner + * \param networkId The Id of the network + * \param userModes The current user modes of own user + */ + static inline void setUserModes(UserId user, NetworkId networkId, const QString &userModes) { + return instance()->storage->setUserModes(user, networkId, userModes); + } + //! Get the unique BufferInfo for the given combination of network and buffername for a user. /** \note This method is threadsafe. * @@ -195,10 +250,11 @@ class Core : public QObject { * \param networkId The network id * \param type The type of the buffer (StatusBuffer, Channel, etc.) * \param buffer The buffer name (if empty, the net's status buffer is returned) + * \param create Whether or not the buffer should be created if it doesnt exist * \return The BufferInfo corresponding to the given network and buffer name, or 0 if not found */ - static inline BufferInfo bufferInfo(UserId user, const NetworkId &networkId, BufferInfo::Type type, const QString &buffer = "") { - return instance()->storage->getBufferInfo(user, networkId, type, buffer); + static inline BufferInfo bufferInfo(UserId user, const NetworkId &networkId, BufferInfo::Type type, const QString &buffer = "", bool create = true) { + return instance()->storage->bufferInfo(user, networkId, type, buffer, create); } //! Get the unique BufferInfo for a bufferId @@ -221,40 +277,25 @@ class Core : public QObject { return instance()->storage->logMessage(message); } - //! Request a certain number (or all) messages stored in a given buffer. - /** \note This method is threadsafe. - * - * \param buffer The buffer we request messages from - * \param limit The number of messages we would like to receive, or -1 if we'd like all messages from that buffername - * \param offset Do not return (but DO count) messages with MsgId >= offset, if offset >= 0 + //! Request a certain number messages stored in a given buffer. + /** \param buffer The buffer we request messages from + * \param first if != -1 return only messages with a MsgId >= first + * \param last if != -1 return only messages with a MsgId < last + * \param limit if != -1 limit the returned list to a max of \limit entries * \return The requested list of messages */ - static inline QList requestMsgs(UserId user, BufferId buffer, int limit = -1, int offset = -1) { - return instance()->storage->requestMsgs(user, buffer, limit, offset); + static inline QList requestMsgs(UserId user, BufferId bufferId, MsgId first = -1, MsgId last = -1, int limit = -1) { + return instance()->storage->requestMsgs(user, bufferId, first, last, limit); } - //! Request messages stored in a given buffer since a certain point in time. - /** \note This method is threadsafe. - * - * \param buffer The buffer we request messages from - * \param since Only return messages newer than this point in time - * \param offset Do not return messages with MsgId >= offset, if offset >= 0 + //! Request a certain number of messages across all buffers + /** \param first if != -1 return only messages with a MsgId >= first + * \param last if != -1 return only messages with a MsgId < last + * \param limit Max amount of messages * \return The requested list of messages */ - static inline QList requestMsgs(UserId user, BufferId buffer, QDateTime since, int offset = -1) { - return instance()->storage->requestMsgs(user, buffer, since, offset); - } - - //! Request a range of messages stored in a given buffer. - /** \note This method is threadsafe. - * - * \param buffer The buffer we request messages from - * \param first Return messages with first <= MsgId <= last - * \param last Return messages with first <= MsgId <= last - * \return The requested list of messages - */ - static inline QList requestMsgRange(UserId user, BufferId buffer, int first, int last) { - return instance()->storage->requestMsgRange(user, buffer, first, last); + static inline QList requestAllMsgs(UserId user, MsgId first = -1, MsgId last = -1, int limit = -1) { + return instance()->storage->requestAllMsgs(user, first, last, limit); } //! Request a list of all buffers known to a user. @@ -294,13 +335,23 @@ class Core : public QObject { //! Rename a Buffer /** \note This method is threadsafe. * \param user The id of the buffer owner - * \param networkId The id of the network the buffer belongs to + * \param bufferId The bufferId * \param newName The new name of the buffer - * \param oldName The previous name of the buffer - * \return the BufferId of the affected buffer or an invalid BufferId if not successfull + * \return true if successfull */ - static inline BufferId renameBuffer(const UserId &user, const NetworkId &networkId, const QString &newName, const QString &oldName) { - return instance()->storage->renameBuffer(user, networkId, newName, oldName); + static inline bool renameBuffer(const UserId &user, const BufferId &bufferId, const QString &newName) { + return instance()->storage->renameBuffer(user, bufferId, newName); + } + + //! Merge the content of two Buffers permanently. This cannot be reversed! + /** \note This method is threadsafe. + * \param user The id of the buffer owner + * \param bufferId1 The bufferId of the remaining buffer + * \param bufferId2 The buffer that is about to be removed + * \return true if successfulln + */ + static inline bool mergeBuffersPermanently(const UserId &user, const BufferId &bufferId1, const BufferId &bufferId2) { + return instance()->storage->mergeBuffersPermanently(user, bufferId1, bufferId2); } //! Update the LastSeenDate for a Buffer @@ -327,6 +378,8 @@ class Core : public QObject { const QDateTime &startTime() const { return _startTime; } + static inline QTimer &syncTimer() { return instance()->_storageSyncTimer; } + public slots: //! Make storage data persistent /** \note This method is threadsafe.