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

Remove some useless checks

Browse Source
This commit is contained in:
Tobias Fella
2023-06-06 20:47:39 +02:00
parent 357b148944
commit 09025fa16d
2 changed files with 25 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/controller.cpp
View File

@@ -341,15 +341,9 @@ bool Controller::saveAccessTokenToKeyChain(const AccountSettings &account, const
void Controller::changeAvatar(Connection *conn, const QUrl &localFile) void Controller::changeAvatar(Connection *conn, const QUrl &localFile)
{ {
auto job = conn->uploadFile(localFile.toLocalFile()); auto job = conn->uploadFile(localFile.toLocalFile());
#ifdef QUOTIENT_07 connect(job, &BaseJob::success, this, [conn, job] {
if (isJobPending(job)) { conn->callApi<SetAvatarUrlJob>(conn->userId(), job->contentUri());
#else });
if (isJobRunning(job)) {
#endif
connect(job, &BaseJob::success, this, [conn, job] {
conn->callApi<SetAvatarUrlJob>(conn->userId(), job->contentUri());
});
}
} }
void Controller::markAllMessagesAsRead(Connection *conn) void Controller::markAllMessagesAsRead(Connection *conn)

52
src/models/customemojimodel.cpp
View File

@@ -16,12 +16,6 @@
using namespace Quotient; using namespace Quotient;
#ifdef QUOTIENT_07
#define running isJobPending
#else
#define running isJobRunning
#endif
void CustomEmojiModel::fetchEmojis() void CustomEmojiModel::fetchEmojis()
{ {
if (!Controller::instance().activeConnection()) { if (!Controller::instance().activeConnection()) {
@@ -62,37 +56,35 @@ void CustomEmojiModel::addEmoji(const QString &name, const QUrl &location)
auto job = Controller::instance().activeConnection()->uploadFile(location.toLocalFile()); auto job = Controller::instance().activeConnection()->uploadFile(location.toLocalFile());
if (running(job)) { connect(job, &BaseJob::success, this, [name, location, job] {
connect(job, &BaseJob::success, this, [name, location, job] { const auto &data = Controller::instance().activeConnection()->accountData("im.ponies.user_emotes");
const auto &data = Controller::instance().activeConnection()->accountData("im.ponies.user_emotes"); auto json = data != nullptr ? data->contentJson() : QJsonObject();
auto json = data != nullptr ? data->contentJson() : QJsonObject(); auto emojiData = json["images"].toObject();
auto emojiData = json["images"].toObject();
QString url; QString url;
#ifdef QUOTIENT_07 #ifdef QUOTIENT_07
url = job->contentUri().toString(); url = job->contentUri().toString();
#else #else
url = job->contentUri(); url = job->contentUri();
#endif #endif
QImage image(location.toLocalFile()); QImage image(location.toLocalFile());
QJsonObject imageInfo; QJsonObject imageInfo;
imageInfo["w"] = image.width(); imageInfo["w"] = image.width();
imageInfo["h"] = image.height(); imageInfo["h"] = image.height();
imageInfo["mimetype"] = QMimeDatabase().mimeTypeForFile(location.toLocalFile()).name(); imageInfo["mimetype"] = QMimeDatabase().mimeTypeForFile(location.toLocalFile()).name();
imageInfo["size"] = image.sizeInBytes(); imageInfo["size"] = image.sizeInBytes();
emojiData[QStringLiteral("%1").arg(name)] = QJsonObject({ emojiData[QStringLiteral("%1").arg(name)] = QJsonObject({
{QStringLiteral("url"), url}, {QStringLiteral("url"), url},
{QStringLiteral("info"), imageInfo}, {QStringLiteral("info"), imageInfo},
{QStringLiteral("body"), location.fileName()}, {QStringLiteral("body"), location.fileName()},
{"usage"_ls, "emoticon"_ls}, {"usage"_ls, "emoticon"_ls},
});
json["images"] = emojiData;
Controller::instance().activeConnection()->setAccountData("im.ponies.user_emotes", json);
}); });
}
json["images"] = emojiData;
Controller::instance().activeConnection()->setAccountData("im.ponies.user_emotes", json);
});
} }
void CustomEmojiModel::removeEmoji(const QString &name) void CustomEmojiModel::removeEmoji(const QString &name)