pimhwang
/
qTox
mirror of https://github.com/qTox/qTox.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

refactor(history): Move History APIs from Friend-based to Chat-based 

Makes it more clear when we're talking about an author (ToxPK) or a chat
(Chat). Prepares for group chat history which will use the same APIs.
reviewable/pr6561/r48
Anthony Bilinski 3 years ago
parent
cfe18f8340
commit
e4fefccff8
No known key found for this signature in database
GPG Key ID: 2AA8E0DA1B31FB3C
3 changed files with 99 additions and 72 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 11
      src/model/chathistory.cpp
  2. 99
      src/persistence/history.cpp
  3. 61
      src/persistence/history.h

11
src/model/chathistory.cpp
Unescape View File

@ -19,6 +19,7 @@
#include "chathistory.h" #include "chathistory.h"
#include "src/persistence/settings.h" #include "src/persistence/settings.h"
#include "src/core/chatid.h"
#include "src/widget/form/chatform.h" #include "src/widget/form/chatform.h"
namespace { namespace {
@ -161,7 +162,7 @@ SearchResult ChatHistory::searchBackward(SearchPos startIdx, const QString& phra
history->getDateWhereFindPhrase(f.getPublicKey(), earliestMessageDate, phrase, history->getDateWhereFindPhrase(f.getPublicKey(), earliestMessageDate, phrase,
parameter); parameter);
auto loadIdx = history->getNumMessagesForFriendBeforeDate(f.getPublicKey(), dateWherePhraseFound); auto loadIdx = history->getNumMessagesForChatBeforeDate(f.getPublicKey(), dateWherePhraseFound);
loadHistoryIntoSessionChatLog(ChatLogIdx(loadIdx)); loadHistoryIntoSessionChatLog(ChatLogIdx(loadIdx));
// Reset search pos to the message we just loaded to avoid a double search // Reset search pos to the message we just loaded to avoid a double search
@ -188,7 +189,7 @@ std::vector<IChatLog::DateChatLogIdxPair> ChatHistory::getDateIdxs(const QDate&
size_t maxDates) const size_t maxDates) const
{ {
if (canUseHistory()) { if (canUseHistory()) {
auto counts = history->getNumMessagesForFriendBeforeDateBoundaries(f.getPublicKey(), auto counts = history->getNumMessagesForChatBeforeDateBoundaries(f.getPublicKey(),
startDate, maxDates); startDate, maxDates);
std::vector<IChatLog::DateChatLogIdxPair> ret; std::vector<IChatLog::DateChatLogIdxPair> ret;
@ -353,7 +354,7 @@ void ChatHistory::loadHistoryIntoSessionChatLog(ChatLogIdx start) const
// We know that both history and us have a start index of 0 so the type // We know that both history and us have a start index of 0 so the type
// conversion should be safe // conversion should be safe
assert(getFirstIdx() == ChatLogIdx(0)); assert(getFirstIdx() == ChatLogIdx(0));
auto messages = history->getMessagesForFriend(f.getPublicKey(), start.get(), end.get()); auto messages = history->getMessagesForChat(f.getPublicKey(), start.get(), end.get());
assert(messages.size() == static_cast<int>(end.get() - start.get())); assert(messages.size() == static_cast<int>(end.get() - start.get()));
ChatLogIdx nextIdx = start; ChatLogIdx nextIdx = start;
@ -424,7 +425,7 @@ void ChatHistory::loadHistoryIntoSessionChatLog(ChatLogIdx start) const
*/ */
void ChatHistory::dispatchUnsentMessages(IMessageDispatcher& messageDispatcher) void ChatHistory::dispatchUnsentMessages(IMessageDispatcher& messageDispatcher)
{ {
auto unsentMessages = history->getUndeliveredMessagesForFriend(f.getPublicKey()); auto unsentMessages = history->getUndeliveredMessagesForChat(f.getPublicKey());
auto requiredExtensions = std::accumulate( auto requiredExtensions = std::accumulate(
unsentMessages.begin(), unsentMessages.end(), unsentMessages.begin(), unsentMessages.end(),
@ -520,7 +521,7 @@ bool ChatHistory::canUseHistory() const
ChatLogIdx ChatHistory::getInitialChatLogIdx() const ChatLogIdx ChatHistory::getInitialChatLogIdx() const
{ {
if (canUseHistory()) { if (canUseHistory()) {
return ChatLogIdx(history->getNumMessagesForFriend(f.getPublicKey())); return ChatLogIdx(history->getNumMessagesForChat(f.getPublicKey()));
} }
return ChatLogIdx(0); return ChatLogIdx(0);
} }

99
src/persistence/history.cpp
Unescape View File

@ -26,6 +26,7 @@
#include "db/upgrades/dbupgrader.h" #include "db/upgrades/dbupgrader.h"
#include "db/rawdatabase.h" #include "db/rawdatabase.h"
#include "src/core/toxpk.h" #include "src/core/toxpk.h"
#include "src/core/chatid.h"
namespace { namespace {
MessageState getMessageState(bool isPending, bool isBroken) MessageState getMessageState(bool isPending, bool isBroken)
@ -55,10 +56,10 @@ void addChatIdSubQuery(QString& queryString, QVector<QByteArray>& boundParams, c
queryString += "(SELECT id FROM chats WHERE uuid = ?)"; queryString += "(SELECT id FROM chats WHERE uuid = ?)";
} }
RawDatabase::Query generateEnsurePkInChats(ToxPk const& pk) RawDatabase::Query generateEnsurePkInChats(ChatId const& id)
{ {
return RawDatabase::Query{QStringLiteral("INSERT OR IGNORE INTO chats (uuid) " return RawDatabase::Query{QStringLiteral("INSERT OR IGNORE INTO chats (uuid) "
"VALUES (?)"), {pk.getByteArray()}}; "VALUES (?)"), {id.getByteArray()}};
} }
RawDatabase::Query generateEnsurePkInAuthors(ToxPk const& pk) RawDatabase::Query generateEnsurePkInAuthors(ToxPk const& pk)
@ -78,21 +79,21 @@ RawDatabase::Query generateUpdateAlias(ToxPk const& pk, QString const& dispName)
return RawDatabase::Query{queryString, boundParams}; return RawDatabase::Query{queryString, boundParams};
} }
RawDatabase::Query generateHistoryTableInsertion(char type, const QDateTime& time, const ToxPk& friendPk) RawDatabase::Query generateHistoryTableInsertion(char type, const QDateTime& time, const ChatId& chatId)
{ {
QVector<QByteArray> boundParams; QVector<QByteArray> boundParams;
QString queryString = QStringLiteral("INSERT INTO history (message_type, timestamp, chat_id) " QString queryString = QStringLiteral("INSERT INTO history (message_type, timestamp, chat_id) "
"VALUES ('%1', %2, ") "VALUES ('%1', %2, ")
.arg(type) .arg(type)
.arg(time.toMSecsSinceEpoch()); .arg(time.toMSecsSinceEpoch());
addChatIdSubQuery(queryString, boundParams, friendPk); addChatIdSubQuery(queryString, boundParams, chatId);
queryString += ");"; queryString += ");";
return RawDatabase::Query(queryString, boundParams); return RawDatabase::Query(queryString, boundParams);
} }
/** /**
* @brief Generate query to insert new message in database * @brief Generate query to insert new message in database
* @param friendPk Friend publick key to save. * @param ChatId Chat ID to save.
* @param message Message to save. * @param message Message to save.
* @param sender Sender to save. * @param sender Sender to save.
* @param time Time of message sending. * @param time Time of message sending.
@ -101,16 +102,16 @@ RawDatabase::Query generateHistoryTableInsertion(char type, const QDateTime& tim
* @param insertIdCallback Function, called after query execution. * @param insertIdCallback Function, called after query execution.
*/ */
QVector<RawDatabase::Query> QVector<RawDatabase::Query>
generateNewTextMessageQueries(const ToxPk& friendPk, const QString& message, const ToxPk& sender, generateNewTextMessageQueries(const ChatId& chatId, const QString& message, const ToxPk& sender,
const QDateTime& time, bool isDelivered, ExtensionSet extensionSet, const QDateTime& time, bool isDelivered, ExtensionSet extensionSet,
QString dispName, std::function<void(RowId)> insertIdCallback) QString dispName, std::function<void(RowId)> insertIdCallback)
{ {
QVector<RawDatabase::Query> queries; QVector<RawDatabase::Query> queries;
queries += generateEnsurePkInChats(friendPk); queries += generateEnsurePkInChats(chatId);
queries += generateEnsurePkInAuthors(sender); queries += generateEnsurePkInAuthors(sender);
queries += generateUpdateAlias(sender, dispName); queries += generateUpdateAlias(sender, dispName);
queries += generateHistoryTableInsertion('T', time, friendPk); queries += generateHistoryTableInsertion('T', time, chatId);
QVector<QByteArray> boundParams; QVector<QByteArray> boundParams;
QString queryString = QStringLiteral( QString queryString = QStringLiteral(
@ -138,13 +139,13 @@ generateNewTextMessageQueries(const ToxPk& friendPk, const QString& message, con
return queries; return queries;
} }
QVector<RawDatabase::Query> generateNewSystemMessageQueries(const ToxPk& friendPk, QVector<RawDatabase::Query> generateNewSystemMessageQueries(const ChatId& chatId,
const SystemMessage& systemMessage) const SystemMessage& systemMessage)
{ {
QVector<RawDatabase::Query> queries; QVector<RawDatabase::Query> queries;
queries += generateEnsurePkInChats(friendPk); queries += generateEnsurePkInChats(chatId);
queries += generateHistoryTableInsertion('S', systemMessage.timestamp, friendPk); queries += generateHistoryTableInsertion('S', systemMessage.timestamp, chatId);
QVector<QByteArray> blobs; QVector<QByteArray> blobs;
std::transform(systemMessage.args.begin(), systemMessage.args.end(), std::back_inserter(blobs), std::transform(systemMessage.args.begin(), systemMessage.args.end(), std::back_inserter(blobs),
@ -225,17 +226,17 @@ bool History::isValid()
} }
/** /**
* @brief Checks if a friend has chat history * @brief Checks if a chat has history
* @param friendPk * @param chatId
* @return True if has, false otherwise. * @return True if it does, false otherwise.
*/ */
bool History::historyExists(const ToxPk& friendPk) bool History::historyExists(const ChatId& chatId)
{ {
if (historyAccessBlocked()) { if (historyAccessBlocked()) {
return false; return false;
} }
return !getMessagesForFriend(friendPk, 0, 1).empty(); return !getMessagesForChat(chatId, 0, 1).empty();
} }
/** /**
@ -260,8 +261,8 @@ void History::eraseHistory()
} }
/** /**
* @brief Erases the chat history with one friend. * @brief Erases the chat history of one chat.
* @param friendPk Friend public key to erase. * @param chatId Chat ID to erase.
*/ */
void History::removeFriendHistory(const ToxPk& friendPk) void History::removeFriendHistory(const ToxPk& friendPk)
{ {
@ -340,16 +341,16 @@ void History::onFileInserted(RowId dbId, QByteArray fileId)
} }
QVector<RawDatabase::Query> QVector<RawDatabase::Query>
History::generateNewFileTransferQueries(const ToxPk& friendPk, const ToxPk& sender, History::generateNewFileTransferQueries(const ChatId& chatId, const ToxPk& sender,
const QDateTime& time, const QString& dispName, const QDateTime& time, const QString& dispName,
const FileDbInsertionData& insertionData) const FileDbInsertionData& insertionData)
{ {
QVector<RawDatabase::Query> queries; QVector<RawDatabase::Query> queries;
queries += generateEnsurePkInChats(friendPk); queries += generateEnsurePkInChats(chatId);
queries += generateEnsurePkInAuthors(sender); queries += generateEnsurePkInAuthors(sender);
queries += generateUpdateAlias(sender, dispName); queries += generateUpdateAlias(sender, dispName);
queries += generateHistoryTableInsertion('F', time, friendPk); queries += generateHistoryTableInsertion('F', time, chatId);
std::weak_ptr<History> weakThis = shared_from_this(); std::weak_ptr<History> weakThis = shared_from_this();
auto fileId = insertionData.fileId; auto fileId = insertionData.fileId;
@ -409,7 +410,7 @@ RawDatabase::Query History::generateFileFinished(RowId id, bool success, const Q
} }
} }
void History::addNewFileMessage(const ToxPk& friendPk, const QByteArray& fileId, void History::addNewFileMessage(const ChatId& chatId, const QByteArray& fileId,
const QString& fileName, const QString& filePath, int64_t size, const QString& fileName, const QString& filePath, int64_t size,
const ToxPk& sender, const QDateTime& time, QString const& dispName) const ToxPk& sender, const QDateTime& time, QString const& dispName)
{ {
@ -431,7 +432,7 @@ void History::addNewFileMessage(const ToxPk& friendPk, const QByteArray& fileId,
// the data to have our newly inserted file_id as well // the data to have our newly inserted file_id as well
ToxFile::FileDirection direction; ToxFile::FileDirection direction;
if (sender == friendPk) { if (sender == chatId) {
direction = ToxFile::RECEIVING; direction = ToxFile::RECEIVING;
} else { } else {
direction = ToxFile::SENDING; direction = ToxFile::SENDING;
@ -445,24 +446,24 @@ void History::addNewFileMessage(const ToxPk& friendPk, const QByteArray& fileId,
insertionData.size = size; insertionData.size = size;
insertionData.direction = direction; insertionData.direction = direction;
auto queries = generateNewFileTransferQueries(friendPk, sender, time, dispName, insertionData); auto queries = generateNewFileTransferQueries(chatId, sender, time, dispName, insertionData);
db->execLater(queries); db->execLater(queries);
} }
void History::addNewSystemMessage(const ToxPk& friendPk, const SystemMessage& systemMessage) void History::addNewSystemMessage(const ChatId& chatId, const SystemMessage& systemMessage)
{ {
if (historyAccessBlocked()) if (historyAccessBlocked())
return; return;
const auto queries = generateNewSystemMessageQueries(friendPk, systemMessage); const auto queries = generateNewSystemMessageQueries(chatId, systemMessage);
db->execLater(queries); db->execLater(queries);
} }
/** /**
* @brief Saves a chat message in the database. * @brief Saves a chat message in the database.
* @param friendPk Friend publick key to save. * @param chatId Chat ID to save.
* @param message Message to save. * @param message Message to save.
* @param sender Sender to save. * @param sender Sender to save.
* @param time Time of message sending. * @param time Time of message sending.
@ -470,7 +471,7 @@ void History::addNewSystemMessage(const ToxPk& friendPk, const SystemMessage& sy
* @param dispName Name, which should be displayed. * @param dispName Name, which should be displayed.
* @param insertIdCallback Function, called after query execution. * @param insertIdCallback Function, called after query execution.
*/ */
void History::addNewMessage(const ToxPk& friendPk, const QString& message, const ToxPk& sender, void History::addNewMessage(const ChatId& chatId, const QString& message, const ToxPk& sender,
const QDateTime& time, bool isDelivered, ExtensionSet extensionSet, const QDateTime& time, bool isDelivered, ExtensionSet extensionSet,
QString dispName, const std::function<void(RowId)>& insertIdCallback) QString dispName, const std::function<void(RowId)>& insertIdCallback)
{ {
@ -478,7 +479,7 @@ void History::addNewMessage(const ToxPk& friendPk, const QString& message, const
return; return;
} }
db->execLater(generateNewTextMessageQueries(friendPk, message, sender, time, isDelivered, db->execLater(generateNewTextMessageQueries(chatId, message, sender, time, isDelivered,
extensionSet, dispName, insertIdCallback)); extensionSet, dispName, insertIdCallback));
} }
@ -502,16 +503,16 @@ void History::setFileFinished(const QByteArray& fileId, bool success, const QStr
fileInfos.remove(fileId); fileInfos.remove(fileId);
} }
size_t History::getNumMessagesForFriend(const ToxPk& friendPk) size_t History::getNumMessagesForChat(const ChatId& chatId)
{ {
if (historyAccessBlocked()) { if (historyAccessBlocked()) {
return 0; return 0;
} }
return getNumMessagesForFriendBeforeDate(friendPk, QDateTime()); return getNumMessagesForChatBeforeDate(chatId, QDateTime());
} }
size_t History::getNumMessagesForFriendBeforeDate(const ToxPk& friendPk, const QDateTime& date) size_t History::getNumMessagesForChatBeforeDate(const ChatId& chatId, const QDateTime& date)
{ {
if (historyAccessBlocked()) { if (historyAccessBlocked()) {
return 0; return 0;
@ -533,12 +534,12 @@ size_t History::getNumMessagesForFriendBeforeDate(const ToxPk& friendPk, const Q
numMessages = row[0].toLongLong(); numMessages = row[0].toLongLong();
}; };
db->execNow({queryText, {friendPk.getByteArray()}, rowCallback}); db->execNow({queryText, {chatId.getByteArray()}, rowCallback});
return numMessages; return numMessages;
} }
QList<History::HistMessage> History::getMessagesForFriend(const ToxPk& friendPk, size_t firstIdx, QList<History::HistMessage> History::getMessagesForChat(const ChatId& chatId, size_t firstIdx,
size_t lastIdx) size_t lastIdx)
{ {
if (historyAccessBlocked()) { if (historyAccessBlocked()) {
@ -547,7 +548,7 @@ QList<History::HistMessage> History::getMessagesForFriend(const ToxPk& friendPk,
QList<HistMessage> messages; QList<HistMessage> messages;
auto rowCallback = [&friendPk, &messages](const QVector<QVariant>& row) { auto rowCallback = [&chatId, &messages](const QVector<QVariant>& row) {
// If the select statement is changed please update these constants // If the select statement is changed please update these constants
constexpr auto messageOffset = 6; constexpr auto messageOffset = 6;
constexpr auto fileOffset = 7; constexpr auto fileOffset = 7;
@ -577,7 +578,7 @@ QList<History::HistMessage> History::getMessagesForFriend(const ToxPk& friendPk,
const auto senderKey = ToxPk{(*it++).toByteArray()}; const auto senderKey = ToxPk{(*it++).toByteArray()};
const auto senderName = QString::fromUtf8((*it++).toByteArray().replace('\0', "")); const auto senderName = QString::fromUtf8((*it++).toByteArray().replace('\0', ""));
messages += HistMessage(id, messageState, requiredExtensions, timestamp, messages += HistMessage(id, messageState, requiredExtensions, timestamp,
friendPk, senderName, senderKey, messageContent); chatId.clone(), senderName, senderKey, messageContent);
break; break;
} }
case 'F': { case 'F': {
@ -599,7 +600,7 @@ QList<History::HistMessage> History::getMessagesForFriend(const ToxPk& friendPk,
it = std::next(row.begin(), senderOffset); it = std::next(row.begin(), senderOffset);
const auto senderKey = ToxPk{(*it++).toByteArray()}; const auto senderKey = ToxPk{(*it++).toByteArray()};
const auto senderName = QString::fromUtf8((*it++).toByteArray().replace('\0', "")); const auto senderName = QString::fromUtf8((*it++).toByteArray().replace('\0', ""));
messages += HistMessage(id, messageState, timestamp, friendPk, senderName, messages += HistMessage(id, messageState, timestamp, chatId.clone(), senderName,
senderKey, file); senderKey, file);
break; break;
} }
@ -616,7 +617,7 @@ QList<History::HistMessage> History::getMessagesForFriend(const ToxPk& friendPk,
}); });
it = argEnd; it = argEnd;
messages += HistMessage(id, timestamp, friendPk, systemMessage); messages += HistMessage(id, timestamp, chatId.clone(), systemMessage);
break; break;
} }
}; };
@ -641,7 +642,7 @@ QList<History::HistMessage> History::getMessagesForFriend(const ToxPk& friendPk,
"LEFT JOIN broken_messages ON broken_messages.id = history.id " "LEFT JOIN broken_messages ON broken_messages.id = history.id "
"WHERE history.chat_id = "); "WHERE history.chat_id = ");
QVector<QByteArray> boundParams; QVector<QByteArray> boundParams;
addChatIdSubQuery(queryString, boundParams, friendPk); addChatIdSubQuery(queryString, boundParams, chatId);
queryString += QStringLiteral( queryString += QStringLiteral(
" LIMIT %1 OFFSET %2;") " LIMIT %1 OFFSET %2;")
.arg(lastIdx - firstIdx) .arg(lastIdx - firstIdx)
@ -651,14 +652,14 @@ QList<History::HistMessage> History::getMessagesForFriend(const ToxPk& friendPk,
return messages; return messages;
} }
QList<History::HistMessage> History::getUndeliveredMessagesForFriend(const ToxPk& friendPk) QList<History::HistMessage> History::getUndeliveredMessagesForChat(const ChatId& chatId)
{ {
if (historyAccessBlocked()) { if (historyAccessBlocked()) {
return {}; return {};
} }
QList<History::HistMessage> ret; QList<History::HistMessage> ret;
auto rowCallback = [&friendPk, &ret](const QVector<QVariant>& row) { auto rowCallback = [&chatId, &ret](const QVector<QVariant>& row) {
auto it = row.begin(); auto it = row.begin();
// dispName and message could have null bytes, QString::fromUtf8 // dispName and message could have null bytes, QString::fromUtf8
// truncates on null bytes so we strip them // truncates on null bytes so we strip them
@ -673,7 +674,7 @@ QList<History::HistMessage> History::getUndeliveredMessagesForFriend(const ToxPk
MessageState messageState = getMessageState(isPending, isBroken); MessageState messageState = getMessageState(isPending, isBroken);
ret += {id, messageState, extensionSet, timestamp, friendPk, ret += {id, messageState, extensionSet, timestamp, chatId.clone(),
displayName, senderKey, messageContent}; displayName, senderKey, messageContent};
}; };
@ -690,7 +691,7 @@ QList<History::HistMessage> History::getUndeliveredMessagesForFriend(const ToxPk
"LEFT JOIN broken_messages ON broken_messages.id = history.id " "LEFT JOIN broken_messages ON broken_messages.id = history.id "
"WHERE history.chat_id = "); "WHERE history.chat_id = ");
QVector<QByteArray> boundParams; QVector<QByteArray> boundParams;
addChatIdSubQuery(queryString, boundParams, friendPk); addChatIdSubQuery(queryString, boundParams, chatId);
queryString += QStringLiteral(" AND history.message_type = 'T';"); queryString += QStringLiteral(" AND history.message_type = 'T';");
db->execNow({queryString, boundParams, rowCallback}); db->execNow({queryString, boundParams, rowCallback});
@ -699,13 +700,13 @@ QList<History::HistMessage> History::getUndeliveredMessagesForFriend(const ToxPk
/** /**
* @brief Search phrase in chat messages * @brief Search phrase in chat messages
* @param friendPk Friend public key * @param chatId Chat ID
* @param from a date message where need to start a search * @param from a date message where need to start a search
* @param phrase what need to find * @param phrase what need to find
* @param parameter for search * @param parameter for search
* @return date of the message where the phrase was found * @return date of the message where the phrase was found
*/ */
QDateTime History::getDateWhereFindPhrase(const ToxPk& friendPk, const QDateTime& from, QDateTime History::getDateWhereFindPhrase(const ChatId& chatId, const QDateTime& from,
QString phrase, const ParameterSearch& parameter) QString phrase, const ParameterSearch& parameter)
{ {
if (historyAccessBlocked()) { if (historyAccessBlocked()) {
@ -788,7 +789,7 @@ QDateTime History::getDateWhereFindPhrase(const ToxPk& friendPk, const QDateTime
"%2") "%2")
.arg(message) .arg(message)
.arg(period), .arg(period),
{friendPk.getByteArray()}, {chatId.getByteArray()},
rowCallback); rowCallback);
db->execNow(query); db->execNow(query);
@ -800,7 +801,7 @@ QDateTime History::getDateWhereFindPhrase(const ToxPk& friendPk, const QDateTime
* @brief Gets date boundaries in conversation with friendPk. History doesn't model conversation indexes, * @brief Gets date boundaries in conversation with friendPk. History doesn't model conversation indexes,
* but we can count messages between us and friendPk to effectively give us an index. This function * but we can count messages between us and friendPk to effectively give us an index. This function
* returns how many messages have happened between us <-> friendPk each time the date changes * returns how many messages have happened between us <-> friendPk each time the date changes
* @param[in] friendPk ToxPk of conversation to retrieve * @param[in] chatId ChatId of conversation to retrieve
* @param[in] from Start date to look from * @param[in] from Start date to look from
* @param[in] maxNum Maximum number of date boundaries to retrieve * @param[in] maxNum Maximum number of date boundaries to retrieve
* @note This API may seem a little strange, why not use QDate from and QDate to? The intent is to * @note This API may seem a little strange, why not use QDate from and QDate to? The intent is to
@ -808,7 +809,7 @@ QDateTime History::getDateWhereFindPhrase(const ToxPk& friendPk, const QDateTime
* of date changes (for loadHistory). We could write two separate queries but the query is fairly * of date changes (for loadHistory). We could write two separate queries but the query is fairly
* intricate compared to our other ones so reducing duplication of it is preferable. * intricate compared to our other ones so reducing duplication of it is preferable.
*/ */
QList<History::DateIdx> History::getNumMessagesForFriendBeforeDateBoundaries(const ToxPk& friendPk, QList<History::DateIdx> History::getNumMessagesForChatBeforeDateBoundaries(const ChatId& chatId,
const QDate& from, const QDate& from,
size_t maxNum) size_t maxNum)
{ {
@ -854,7 +855,7 @@ QList<History::DateIdx> History::getNumMessagesForFriendBeforeDateBoundaries(con
.arg(QDateTime(from).toMSecsSinceEpoch()) .arg(QDateTime(from).toMSecsSinceEpoch())
#endif #endif
.arg(limitString), .arg(limitString),
{friendPk.getByteArray(), friendPk.getByteArray()}, {chatId.getByteArray(), chatId.getByteArray()},
rowCallback); rowCallback);
db->execNow(query); db->execNow(query);

61
src/persistence/history.h
Unescape View File

@ -39,6 +39,7 @@
class Profile; class Profile;
class HistoryKeeper; class HistoryKeeper;
class Settings; class Settings;
class ChatId;
enum class HistMessageContentType enum class HistMessageContentType
{ {
@ -138,9 +139,9 @@ class History : public QObject, public std::enable_shared_from_this<History>
public: public:
struct HistMessage struct HistMessage
{ {
HistMessage(RowId id_, MessageState state_, ExtensionSet extensionSet_, QDateTime timestamp_, ToxPk chat_, QString dispName_, HistMessage(RowId id_, MessageState state_, ExtensionSet extensionSet_, QDateTime timestamp_, std::unique_ptr<ChatId> chat_, QString dispName_,
ToxPk sender_, QString message) ToxPk sender_, QString message)
: chat{chat_} : chat{std::move(chat_)}
, sender{sender_} , sender{sender_}
, dispName{dispName_} , dispName{dispName_}
, timestamp{timestamp_} , timestamp{timestamp_}
@ -150,9 +151,9 @@ public:
, content(std::move(message)) , content(std::move(message))
{} {}
HistMessage(RowId id_, MessageState state_, QDateTime timestamp_, ToxPk chat_, QString dispName_, HistMessage(RowId id_, MessageState state_, QDateTime timestamp_, std::unique_ptr<ChatId> chat_, QString dispName_,
ToxPk sender_, ToxFile file) ToxPk sender_, ToxFile file)
: chat{chat_} : chat{std::move(chat_)}
, sender{sender_} , sender{sender_}
, dispName{dispName_} , dispName{dispName_}
, timestamp{timestamp_} , timestamp{timestamp_}
@ -161,15 +162,39 @@ public:
, content(std::move(file)) , content(std::move(file))
{} {}
HistMessage(RowId id_, QDateTime timestamp_, ToxPk chat_, SystemMessage systemMessage) HistMessage(RowId id_, QDateTime timestamp_, std::unique_ptr<ChatId> chat_, SystemMessage systemMessage)
: chat{chat_} : chat{std::move(chat_)}
, timestamp{timestamp_} , timestamp{timestamp_}
, id{id_} , id{id_}
, state(MessageState::complete) , state(MessageState::complete)
, content(std::move(systemMessage)) , content(std::move(systemMessage))
{} {}
ToxPk chat; HistMessage(const History::HistMessage& other)
: chat{other.chat->clone()}
, sender{other.sender}
, dispName{other.dispName}
, timestamp{other.timestamp}
, id{other.id}
, state{other.state}
, extensionSet{other.extensionSet}
, content{other.content}
{}
HistMessage& operator=(const HistMessage& other)
{
chat = other.chat->clone();
sender = other.sender;
dispName = other.dispName;
timestamp = other.timestamp;
id = other.id;
state = other.state;
extensionSet = other.extensionSet;
content = other.content;
return *this;
}
std::unique_ptr<ChatId> chat;
ToxPk sender; ToxPk sender;
QString dispName; QString dispName;
QDateTime timestamp; QDateTime timestamp;
@ -191,28 +216,28 @@ public:
bool isValid(); bool isValid();
bool historyExists(const ToxPk& friendPk); bool historyExists(const ChatId& chatId);
void eraseHistory(); void eraseHistory();
void removeFriendHistory(const ToxPk& friendPk); void removeFriendHistory(const ToxPk& friendPk);
void addNewMessage(const ToxPk& friendPk, const QString& message, const ToxPk& sender, void addNewMessage(const ChatId& chatId, const QString& message, const ToxPk& sender,
const QDateTime& time, bool isDelivered, ExtensionSet extensions, const QDateTime& time, bool isDelivered, ExtensionSet extensions,
QString dispName, const std::function<void(RowId)>& insertIdCallback = {}); QString dispName, const std::function<void(RowId)>& insertIdCallback = {});
void addNewFileMessage(const ToxPk& friendPk, const QByteArray& fileId, void addNewFileMessage(const ChatId& chatId, const QByteArray& fileId,
const QString& fileName, const QString& filePath, int64_t size, const QString& fileName, const QString& filePath, int64_t size,
const ToxPk& sender, const QDateTime& time, QString const& dispName); const ToxPk& sender, const QDateTime& time, QString const& dispName);
void addNewSystemMessage(const ToxPk& friendPk, const SystemMessage& systemMessage); void addNewSystemMessage(const ChatId& chatId, const SystemMessage& systemMessage);
void setFileFinished(const QByteArray& fileId, bool success, const QString& filePath, const QByteArray& fileHash); void setFileFinished(const QByteArray& fileId, bool success, const QString& filePath, const QByteArray& fileHash);
size_t getNumMessagesForFriend(const ToxPk& friendPk); size_t getNumMessagesForChat(const ChatId& chatId);
size_t getNumMessagesForFriendBeforeDate(const ToxPk& friendPk, const QDateTime& date); size_t getNumMessagesForChatBeforeDate(const ChatId& chatId, const QDateTime& date);
QList<HistMessage> getMessagesForFriend(const ToxPk& friendPk, size_t firstIdx, size_t lastIdx); QList<HistMessage> getMessagesForChat(const ChatId& chatId, size_t firstIdx, size_t lastIdx);
QList<HistMessage> getUndeliveredMessagesForFriend(const ToxPk& friendPk); QList<HistMessage> getUndeliveredMessagesForChat(const ChatId& chatId);
QDateTime getDateWhereFindPhrase(const ToxPk& friendPk, const QDateTime& from, QString phrase, QDateTime getDateWhereFindPhrase(const ChatId& chatId, const QDateTime& from, QString phrase,
const ParameterSearch& parameter); const ParameterSearch& parameter);
QList<DateIdx> getNumMessagesForFriendBeforeDateBoundaries(const ToxPk& friendPk, QList<DateIdx> getNumMessagesForChatBeforeDateBoundaries(const ChatId& chatId,
const QDate& from, size_t maxNum); const QDate& from, size_t maxNum);
void markAsDelivered(RowId messageId); void markAsDelivered(RowId messageId);
@ -226,7 +251,7 @@ private slots:
private: private:
QVector<RawDatabase::Query> QVector<RawDatabase::Query>
generateNewFileTransferQueries(const ToxPk& friendPk, const ToxPk& sender, const QDateTime& time, generateNewFileTransferQueries(const ChatId& chatId, const ToxPk& sender, const QDateTime& time,
const QString& dispName, const FileDbInsertionData& insertionData); const QString& dispName, const FileDbInsertionData& insertionData);
bool historyAccessBlocked(); bool historyAccessBlocked();
static RawDatabase::Query generateFileFinished(RowId fileId, bool success, static RawDatabase::Query generateFileFinished(RowId fileId, bool success,

Write Preview
Loading…
Cancel
Save