StarMirror/qTox
1
0
Fork 0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00
Code Issues Projects Releases Wiki Activity

cleanup

Browse Source
This commit is contained in:
apprb 2014-10-22 23:14:42 +09:00
parent 6caa9f1e9f
commit 277605ff17
No known key found for this signature in database
GPG Key ID: B001911B5B22FB9B
4 changed files with 11 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/historykeeper.cpp
View File

@ -37,7 +37,7 @@ HistoryKeeper *HistoryKeeper::getInstance()
{ {
QList<QString> initLst; QList<QString> initLst;
initLst.push_back(QString("CREATE TABLE IF NOT EXISTS history (id INTEGER PRIMARY KEY AUTOINCREMENT, timestamp INTEGER NOT NULL, ") + initLst.push_back(QString("CREATE TABLE IF NOT EXISTS history (id INTEGER PRIMARY KEY AUTOINCREMENT, timestamp INTEGER NOT NULL, ") +
QString("profile_id INTEGER NOT NULL, chat_id INTEGER NOT NULL, sender INTERGER NOT NULL, message TEXT NOT NULL);")); QString("chat_id INTEGER NOT NULL, sender INTERGER NOT NULL, message TEXT NOT NULL);"));
initLst.push_back(QString("CREATE TABLE IF NOT EXISTS aliases (id INTEGER PRIMARY KEY AUTOINCREMENT, user_id TEXT UNIQUE NOT NULL);")); initLst.push_back(QString("CREATE TABLE IF NOT EXISTS aliases (id INTEGER PRIMARY KEY AUTOINCREMENT, user_id TEXT UNIQUE NOT NULL);"));
initLst.push_back(QString("CREATE TABLE IF NOT EXISTS chats (id INTEGER PRIMARY KEY AUTOINCREMENT, name TEXT UNIQUE NOT NULL, ctype INTEGER NOT NULL);")); initLst.push_back(QString("CREATE TABLE IF NOT EXISTS chats (id INTEGER PRIMARY KEY AUTOINCREMENT, name TEXT UNIQUE NOT NULL, ctype INTEGER NOT NULL);"));
@ -102,7 +102,6 @@ HistoryKeeper::HistoryKeeper(GenericDdInterface *db_) :
history: history:
id -- auto-incrementing number id -- auto-incrementing number
timestamp timestamp
profile_id -- profile ID (resolves from aliases table)
chat_id -- current chat ID (resolves from chats table) chat_id -- current chat ID (resolves from chats table)
sender -- sender's ID (resolves from aliases table) sender -- sender's ID (resolves from aliases table)
message message
@ -121,16 +120,14 @@ void HistoryKeeper::addChatEntry(const QString& chat, const QString& message, co
{ {
int chat_id = getChatID(chat, ctSingle).first; int chat_id = getChatID(chat, ctSingle).first;
int sender_id = getAliasID(sender); int sender_id = getAliasID(sender);
int profile_id = getCurrentProfileID();
db->exec(QString("INSERT INTO history (profile_id, timestamp, chat_id, sender, message)") + db->exec(QString("INSERT INTO history (timestamp, chat_id, sender, message)") +
QString("VALUES (%1, %2, %3, %4, '%5');") QString("VALUES (%1, %2, %3, '%4');")
.arg(profile_id).arg(dt.toMSecsSinceEpoch()).arg(chat_id).arg(sender_id).arg(wrapMessage(message))); .arg(dt.toMSecsSinceEpoch()).arg(chat_id).arg(sender_id).arg(wrapMessage(message)));
} }
QList<HistoryKeeper::HistMessage> HistoryKeeper::getChatHistory(HistoryKeeper::ChatType ct, const QString &profile, QList<HistoryKeeper::HistMessage> HistoryKeeper::getChatHistory(HistoryKeeper::ChatType ct, const QString &chat,
const QString &chat, const QDateTime &time_from, const QDateTime &time_from, const QDateTime &time_to)
const QDateTime &time_to)
{ {
QList<HistMessage> res; QList<HistMessage> res;
@ -138,14 +135,13 @@ QList<HistoryKeeper::HistMessage> HistoryKeeper::getChatHistory(HistoryKeeper::C
qint64 time64_to = time_to.toMSecsSinceEpoch(); qint64 time64_to = time_to.toMSecsSinceEpoch();
int chat_id = getChatID(chat, ct).first; int chat_id = getChatID(chat, ct).first;
int profile_id = getAliasID(profile);
QSqlQuery dbAnswer; QSqlQuery dbAnswer;
if (ct == ctSingle) if (ct == ctSingle)
{ {
dbAnswer = db->exec(QString("SELECT timestamp, user_id, message FROM history INNER JOIN aliases ON history.sender = aliases.id ") + dbAnswer = db->exec(QString("SELECT timestamp, user_id, message FROM history INNER JOIN aliases ON history.sender = aliases.id ") +
QString("AND timestamp BETWEEN %1 AND %2 AND chat_id = %3 AND profile_id = %4;") QString("AND timestamp BETWEEN %1 AND %2 AND chat_id = %3;")
.arg(time64_from).arg(time64_to).arg(chat_id).arg(profile_id)); .arg(time64_from).arg(time64_to).arg(chat_id));
} else { } else {
// no groupchats yet // no groupchats yet
} }
@ -248,12 +244,6 @@ void HistoryKeeper::addGroupChatEntry(const QString &chat, const QString &messag
// no groupchats yet // no groupchats yet
} }
int HistoryKeeper::getCurrentProfileID()
{
// for many profiles
return getAliasID(Core::getInstance()->getSelfId().publicKey);
}
HistoryKeeper::ChatType HistoryKeeper::convertToChatType(int ct) HistoryKeeper::ChatType HistoryKeeper::convertToChatType(int ct)
{ {
if (ct < 0 || ct > 1) if (ct < 0 || ct > 1)

4
src/historykeeper.h
View File

@ -46,8 +46,7 @@ public:
void addChatEntry(const QString& chat, const QString& message, const QString& sender, const QDateTime &dt); void addChatEntry(const QString& chat, const QString& message, const QString& sender, const QDateTime &dt);
void addGroupChatEntry(const QString& chat, const QString& message, const QString& sender, const QDateTime &dt); void addGroupChatEntry(const QString& chat, const QString& message, const QString& sender, const QDateTime &dt);
QList<HistMessage> getChatHistory(ChatType ct, const QString &profile, const QString &chat, QList<HistMessage> getChatHistory(ChatType ct, const QString &chat, const QDateTime &time_from, const QDateTime &time_to);
const QDateTime &time_from, const QDateTime &time_to);
private: private:
HistoryKeeper(GenericDdInterface *db_); HistoryKeeper(GenericDdInterface *db_);
@ -58,7 +57,6 @@ private:
void updateAliases(); void updateAliases();
QPair<int, ChatType> getChatID(const QString &id_str, ChatType ct); QPair<int, ChatType> getChatID(const QString &id_str, ChatType ct);
int getAliasID(const QString &id_str); int getAliasID(const QString &id_str);
int getCurrentProfileID();
QString wrapMessage(const QString &str); QString wrapMessage(const QString &str);
QString unWrapMessage(const QString &str); QString unWrapMessage(const QString &str);

3
src/misc/db/encrypteddb.cpp
View File

@ -112,7 +112,6 @@ bool EncryptedDb::pullFileContent()
for (auto line : sqlCmds) for (auto line : sqlCmds)
{ {
QSqlQuery r = PlainDb::exec(line); QSqlQuery r = PlainDb::exec(line);
qDebug() << r.lastError();
} }
return true; return true;
@ -122,7 +121,7 @@ void EncryptedDb::appendToEncrypted(const QString &sql)
{ {
QByteArray b64Str; QByteArray b64Str;
b64Str.append(sql); b64Str.append(sql);
b64Str = b64Str.toBase64(); b64Str = b64Str.toBase64(); // much easier to parse strings like this from file
buffer += b64Str + "\n"; buffer += b64Str + "\n";

3
src/widget/form/chatform.cpp
View File

@ -571,8 +571,7 @@ void ChatForm::onLoadHistory()
} }
} }
auto msgs = HistoryKeeper::getInstance()->getChatHistory(HistoryKeeper::ctSingle, Core::getInstance()->getSelfId().publicKey, auto msgs = HistoryKeeper::getInstance()->getChatHistory(HistoryKeeper::ctSingle, f->userId, fromTime, toTime);
f->userId, fromTime, toTime);
QString storedPrevName = previousName; QString storedPrevName = previousName;
previousName = ""; previousName = "";