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

Merge branch 'master' into kirigami2

Browse Source
This commit is contained in:
Carl Schwan
2020-10-03 17:48:27 +02:00
parent ccece5112f d6009479a5
commit 2532a86e7e
19 changed files with 74 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/spectralroom.cpp
View File

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