From bf5401753432533b31e7d18519c2031c84e774b7 Mon Sep 17 00:00:00 2001 From: Kitsune Ral Date: Sun, 16 Dec 2018 14:10:05 +0900 Subject: Room::getAllMembers: revert off-by-one "bugfix" It actually introduces an off-by-one error; the original code was correct. #qmatrixclient:matrix.org is used instead of #test:matrix.org to check lazy-loading (see https://github.com/matrix-org/synapse/issues/4300) --- examples/qmc-example.cpp | 6 +++--- lib/room.cpp | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/examples/qmc-example.cpp b/examples/qmc-example.cpp index 48787e44..5c05d44b 100644 --- a/examples/qmc-example.cpp +++ b/examples/qmc-example.cpp @@ -163,9 +163,9 @@ void QMCTest::loadMembers() { running.push_back("Loading members"); // The dedicated qmc-test room is too small to test - // lazy-loading-then-full-loading; use #test:matrix.org instead. + // lazy-loading-then-full-loading; use #qmatrixclient:matrix.org instead. // TODO: #264 - auto* r = c->room(QStringLiteral("!vfFxDRtZSSdspfTSEr:matrix.org")); + auto* r = c->room(QStringLiteral("!PCzUtxtOjUySxSelof:matrix.org")); if (!r) { cout << "#test:matrix.org is not found in the test user's rooms" << endl; @@ -184,7 +184,7 @@ void QMCTest::loadMembers() r->setDisplayed(); connect(r, &Room::allMembersLoaded, [this,r] { QMC_CHECK("Loading members", - r->memberNames().size() + 1 >= r->joinedCount()); + r->memberNames().size() >= r->joinedCount()); }); } diff --git a/lib/room.cpp b/lib/room.cpp index 8f9095dd..7232741a 100644 --- a/lib/room.cpp +++ b/lib/room.cpp @@ -595,7 +595,7 @@ Room::rev_iter_t Room::findInTimeline(const QString& evtId) const void Room::Private::getAllMembers() { // If already loaded or already loading, there's nothing to do here. - if (q->joinedCount() - 1 <= membersMap.size() || isJobRunning(allMembersJob)) + if (q->joinedCount() <= membersMap.size() || isJobRunning(allMembersJob)) return; allMembersJob = connection->callApi( -- cgit v1.2.3