ESCA111/neochat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update to libQuotient 0.6.

Browse Source
This commit is contained in:
Black
2020-07-25 16:45:48 -07:00
parent c8b75202c0
commit 675ec40a63
3 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/libQuotient

Submodule include/libQuotient updated: 58dfe74390...55d8d9c073

9
src/publicroomlistmodel.cpp
View File

@@ -110,15 +110,14 @@ void PublicRoomListModel::next(int count) {
attempted = true; attempted = true;
if (job->status() == BaseJob::Success) { if (job->status() == BaseJob::Success) {
auto resp = job->data(); nextBatch = job->nextBatch();
nextBatch = resp.nextBatch;
this->beginInsertRows({}, rooms.count(), this->beginInsertRows({}, rooms.count(),
rooms.count() + resp.chunk.count() - 1); rooms.count() + job->chunk().count() - 1);
rooms.append(resp.chunk); rooms.append(job->chunk());
this->endInsertRows(); this->endInsertRows();
if (resp.nextBatch.isEmpty()) { if (job->nextBatch().isEmpty()) {
emit hasMoreChanged(); emit hasMoreChanged();
} }
} }

20
src/spectralroom.cpp
View File

@@ -397,30 +397,30 @@ void SpectralRoom::changeAvatar(QUrl localFile) {
const auto job = connection()->uploadFile(localFile.toLocalFile()); const auto job = connection()->uploadFile(localFile.toLocalFile());
if (isJobRunning(job)) { if (isJobRunning(job)) {
connect(job, &BaseJob::success, this, [this, job] { connect(job, &BaseJob::success, this, [this, job] {
connection()->callApi<SetRoomStateJob>( connection()->callApi<SetRoomStateWithKeyJob>(
id(), "m.room.avatar", QJsonObject{{"url", job->contentUri()}}); id(), "m.room.avatar", localUser()->id(), QJsonObject{{"url", job->contentUri()}});
}); });
} }
} }
void SpectralRoom::addLocalAlias(const QString& alias) { void SpectralRoom::addLocalAlias(const QString& alias) {
auto aliases = localAliases(); auto a = aliases();
if (aliases.contains(alias)) if (a.contains(alias))
return; return;
aliases += alias; a += alias;
setLocalAliases(aliases); setLocalAliases(a);
} }
void SpectralRoom::removeLocalAlias(const QString& alias) { void SpectralRoom::removeLocalAlias(const QString& alias) {
auto aliases = localAliases(); auto a = aliases();
if (!aliases.contains(alias)) if (!a.contains(alias))
return; return;
aliases.removeAll(alias); a.removeAll(alias);
setLocalAliases(aliases); setLocalAliases(a);
} }
QString SpectralRoom::markdownToHTML(const QString& markdown) { QString SpectralRoom::markdownToHTML(const QString& markdown) {