X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fcore%2Fpostgresqlstorage.cpp;h=030423f6e409c68a0283e28abd9210a11f888836;hb=0674fae039bbc79bfe3f7e42b12ec9015b9b879b;hp=36301c6b33651c31ca22feb7524553dd52ebb06a;hpb=097f625c4bd147f4127573ad8ab48555f9dc62d3;p=quassel.git diff --git a/src/core/postgresqlstorage.cpp b/src/core/postgresqlstorage.cpp index 36301c6b..030423f6 100644 --- a/src/core/postgresqlstorage.cpp +++ b/src/core/postgresqlstorage.cpp @@ -800,6 +800,8 @@ void PostgreSqlStorage::bindNetworkInfo(QSqlQuery& query, const NetworkInfo& inf query.bindValue(":messagerateburstsize", info.messageRateBurstSize); query.bindValue(":messageratedelay", info.messageRateDelay); query.bindValue(":unlimitedmessagerate", info.unlimitedMessageRate); + query.bindValue(":skipcaps", info.skipCapsToString()); + if (info.networkId.isValid()) query.bindValue(":networkid", info.networkId.toInt()); } @@ -947,6 +949,7 @@ std::vector PostgreSqlStorage::networks(UserId user) net.messageRateBurstSize = networksQuery.value(20).toUInt(); net.messageRateDelay = networksQuery.value(21).toUInt(); net.unlimitedMessageRate = networksQuery.value(22).toBool(); + net.skipCapsFromString(networksQuery.value(23).toString()); serversQuery.bindValue(":networkid", net.networkId.toInt()); safeExec(serversQuery); @@ -1530,7 +1533,7 @@ Message::Types PostgreSqlStorage::bufferActivity(BufferId bufferId, MsgId lastSe query.bindValue(":lastseenmsgid", lastSeenMsgId.toQint64()); safeExec(query); watchQuery(query); - Message::Types result = Message::Types(nullptr); + Message::Types result{}; if (query.first()) result = Message::Types(query.value(0).toInt()); return result; @@ -2424,6 +2427,8 @@ bool PostgreSqlMigrationWriter::writeMo(const NetworkMO& network) bindValue(26, network.messagerateburstsize); bindValue(27, network.messageratedelay); bindValue(28, network.unlimitedmessagerate); + // Skipped IRCv3 caps + bindValue(29, network.skipcaps); return exec(); }