jeka/utun2
1
0 Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Allow avatar replacement alongside downloads and correct join fixtures

Browse Source
This commit is contained in:
evgeny committed 2026-10-06 12:51:22 +02:00
1 parent dc156c7f2b
commit 9bfdf3ea41
3 files changed
+10 -6
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

tools/chatgui/src/avatars/avatarmanager.cpp
+2 -2
View File
@@ -241,9 +241,9 @@ void AvatarManager::scheduleOwn(quint64 group) {
}
void AvatarManager::enqueue(const Job& job) {
for (const auto& old : m_jobs) if ((old.ref.group == job.ref.group && old.ref.owner == job.ref.owner) ||
for (const auto& old : m_jobs) if ((old.upload == job.upload && old.ref.group == job.ref.group && old.ref.owner == job.ref.owner) ||
(!job.upload && !old.upload && old.ref.hash == job.ref.hash)) return;
for (const auto& old : m_queue) if ((old.ref.group == job.ref.group && old.ref.owner == job.ref.owner) ||
for (const auto& old : m_queue) if ((old.upload == job.upload && old.ref.group == job.ref.group && old.ref.owner == job.ref.owner) ||
(!job.upload && !old.upload && old.ref.hash == job.ref.hash)) return;
if (job.upload) m_queue.prepend(job); else m_queue.enqueue(job);
}
tools/chatgui/tests/test_avatars.cpp
+5 -1
View File
@@ -160,8 +160,12 @@ private slots:
QCOMPARE(downloads, 1u);
const QString replacement = directory.path() + "/replacement.png"; image.fill(Qt::red); QVERIFY(image.save(replacement));
manager.uploadDefault(replacement, testInstance->node_id);
auto isRed = [&manager, &db](const QString& channel) {
const QImage current = manager.image(channel, db.myNodeId());
return !current.isNull() && current.pixelColor(128, 128) == QColor(Qt::red);
};
for (const auto& channel : channels)
QTRY_VERIFY_WITH_TIMEOUT(manager.image(channel.channelId, testInstance->node_id).pixelColor(128, 128) == QColor(Qt::red), 10000);
QTRY_VERIFY_WITH_TIMEOUT(isRed(channel.channelId), 10000);
deferDownload = false; manager.onTransfer((const uint8_t*)delayedDownload.constData(), delayedDownload.size());
QTRY_VERIFY_WITH_TIMEOUT(QFile::exists(cached), 5000);
for (const auto& channel : channels) QCOMPARE(manager.image(channel.channelId, testInstance->node_id).pixelColor(128, 128), QColor(Qt::red));