rnhmjoj/nheko
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Rename EventStore::event to get to remove ambiguity with QObject::event

Browse Source
This commit is contained in:
Nicolas Werner 2020-07-26 12:33:30 +02:00
parent 28e7ea40cb
commit a00b11def7
3 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/timeline/EventStore.cpp
View File

@ -264,7 +264,7 @@ EventStore::reactions(const std::string &event_id)
auto self = http::client()->user_id().to_string(); auto self = http::client()->user_id().to_string();
for (const auto &id : event_ids) { for (const auto &id : event_ids) {
auto related_event = event(id, event_id); auto related_event = get(id, event_id);
if (!related_event) if (!related_event)
continue; continue;
@ -313,7 +313,7 @@ EventStore::reactions(const std::string &event_id)
} }
mtx::events::collections::TimelineEvents * mtx::events::collections::TimelineEvents *
EventStore::event(int idx, bool decrypt) EventStore::get(int idx, bool decrypt)
{ {
if (this->thread() != QThread::currentThread()) if (this->thread() != QThread::currentThread())
nhlog::db()->warn("{} called from a different thread!", __func__); nhlog::db()->warn("{} called from a different thread!", __func__);
@ -479,7 +479,7 @@ EventStore::decryptEvent(const IdIndex &idx,
} }
mtx::events::collections::TimelineEvents * mtx::events::collections::TimelineEvents *
EventStore::event(std::string_view id, std::string_view related_to, bool decrypt) EventStore::get(std::string_view id, std::string_view related_to, bool decrypt)
{ {
if (this->thread() != QThread::currentThread()) if (this->thread() != QThread::currentThread())
nhlog::db()->warn("{} called from a different thread!", __func__); nhlog::db()->warn("{} called from a different thread!", __func__);

4
src/timeline/EventStore.h
View File

@ -62,11 +62,11 @@ public:
// optionally returns the event or nullptr and fetches it, after which it emits a // optionally returns the event or nullptr and fetches it, after which it emits a
// relatedFetched event // relatedFetched event
mtx::events::collections::TimelineEvents *event(std::string_view id, mtx::events::collections::TimelineEvents *get(std::string_view id,
std::string_view related_to, std::string_view related_to,
bool decrypt = true); bool decrypt = true);
// always returns a proper event as long as the idx is valid // always returns a proper event as long as the idx is valid
mtx::events::collections::TimelineEvents *event(int idx, bool decrypt = true); mtx::events::collections::TimelineEvents *get(int idx, bool decrypt = true);
QVariantList reactions(const std::string &event_id); QVariantList reactions(const std::string &event_id);

34
src/timeline/TimelineModel.cpp
View File

@ -237,7 +237,7 @@ TimelineModel::rowCount(const QModelIndex &parent) const
QVariantMap QVariantMap
TimelineModel::getDump(QString eventId, QString relatedTo) const TimelineModel::getDump(QString eventId, QString relatedTo) const
{ {
if (auto event = events.event(eventId.toStdString(), relatedTo.toStdString())) if (auto event = events.get(eventId.toStdString(), relatedTo.toStdString()))
return data(*event, Dump).toMap(); return data(*event, Dump).toMap();
return {}; return {};
} }
@ -354,7 +354,7 @@ TimelineModel::data(const mtx::events::collections::TimelineEvents &event, int r
} }
case IsEncrypted: { case IsEncrypted: {
auto id = event_id(event); auto id = event_id(event);
auto encrypted_event = events.event(id, id, false); auto encrypted_event = events.get(id, id, false);
return encrypted_event && return encrypted_event &&
std::holds_alternative< std::holds_alternative<
mtx::events::EncryptedEvent<mtx::events::msg::Encrypted>>( mtx::events::EncryptedEvent<mtx::events::msg::Encrypted>>(
@ -421,7 +421,7 @@ TimelineModel::data(const QModelIndex &index, int role) const
if (index.row() < 0 && index.row() >= rowCount()) if (index.row() < 0 && index.row() >= rowCount())
return QVariant(); return QVariant();
auto event = events.event(rowCount() - index.row() - 1); auto event = events.get(rowCount() - index.row() - 1);
if (!event) if (!event)
return ""; return "";
@ -433,7 +433,7 @@ TimelineModel::data(const QModelIndex &index, int role) const
std::string userId = acc::sender(*event); std::string userId = acc::sender(*event);
for (int r = rowCount() - index.row(); r < events.size(); r++) { for (int r = rowCount() - index.row(); r < events.size(); r++) {
auto tempEv = events.event(r); auto tempEv = events.get(r);
if (!tempEv) if (!tempEv)
break; break;
@ -460,7 +460,7 @@ TimelineModel::canFetchMore(const QModelIndex &) const
{ {
if (!events.size()) if (!events.size())
return true; return true;
if (auto first = events.event(0); if (auto first = events.get(0);
first && first &&
!std::holds_alternative<mtx::events::StateEvent<mtx::events::state::Create>>(*first)) !std::holds_alternative<mtx::events::StateEvent<mtx::events::state::Create>>(*first))
return true; return true;
@ -545,7 +545,7 @@ void
TimelineModel::updateLastMessage() TimelineModel::updateLastMessage()
{ {
for (auto it = events.size() - 1; it >= 0; --it) { for (auto it = events.size() - 1; it >= 0; --it) {
auto event = events.event(it, decryptDescription); auto event = events.get(it, decryptDescription);
if (!event) if (!event)
continue; continue;
@ -633,7 +633,7 @@ TimelineModel::escapeEmoji(QString str) const
void void
TimelineModel::viewRawMessage(QString id) const TimelineModel::viewRawMessage(QString id) const
{ {
auto e = events.event(id.toStdString(), "", false); auto e = events.get(id.toStdString(), "", false);
if (!e) if (!e)
return; return;
std::string ev = mtx::accessors::serialize_event(*e).dump(4); std::string ev = mtx::accessors::serialize_event(*e).dump(4);
@ -644,7 +644,7 @@ TimelineModel::viewRawMessage(QString id) const
void void
TimelineModel::viewDecryptedRawMessage(QString id) const TimelineModel::viewDecryptedRawMessage(QString id) const
{ {
auto e = events.event(id.toStdString(), ""); auto e = events.get(id.toStdString(), "");
if (!e) if (!e)
return; return;
@ -669,7 +669,7 @@ TimelineModel::replyAction(QString id)
RelatedInfo RelatedInfo
TimelineModel::relatedInfo(QString id) TimelineModel::relatedInfo(QString id)
{ {
auto event = events.event(id.toStdString(), ""); auto event = events.get(id.toStdString(), "");
if (!event) if (!event)
return {}; return {};
@ -1096,7 +1096,7 @@ TimelineModel::addPendingMessage(mtx::events::collections::TimelineEvents event)
bool bool
TimelineModel::saveMedia(QString eventId) const TimelineModel::saveMedia(QString eventId) const
{ {
mtx::events::collections::TimelineEvents *event = events.event(eventId.toStdString(), ""); mtx::events::collections::TimelineEvents *event = events.get(eventId.toStdString(), "");
if (!event) if (!event)
return false; return false;
@ -1171,7 +1171,7 @@ TimelineModel::saveMedia(QString eventId) const
void void
TimelineModel::cacheMedia(QString eventId) TimelineModel::cacheMedia(QString eventId)
{ {
mtx::events::collections::TimelineEvents *event = events.event(eventId.toStdString(), ""); mtx::events::collections::TimelineEvents *event = events.get(eventId.toStdString(), "");
if (!event) if (!event)
return; return;
@ -1300,7 +1300,7 @@ TimelineModel::formatTypingUsers(const std::vector<QString> &users, QColor bg)
QString QString
TimelineModel::formatJoinRuleEvent(QString id) TimelineModel::formatJoinRuleEvent(QString id)
{ {
mtx::events::collections::TimelineEvents *e = events.event(id.toStdString(), ""); mtx::events::collections::TimelineEvents *e = events.get(id.toStdString(), "");
if (!e) if (!e)
return ""; return "";
@ -1325,7 +1325,7 @@ TimelineModel::formatJoinRuleEvent(QString id)
QString QString
TimelineModel::formatGuestAccessEvent(QString id) TimelineModel::formatGuestAccessEvent(QString id)
{ {
mtx::events::collections::TimelineEvents *e = events.event(id.toStdString(), ""); mtx::events::collections::TimelineEvents *e = events.get(id.toStdString(), "");
if (!e) if (!e)
return ""; return "";
@ -1349,7 +1349,7 @@ TimelineModel::formatGuestAccessEvent(QString id)
QString QString
TimelineModel::formatHistoryVisibilityEvent(QString id) TimelineModel::formatHistoryVisibilityEvent(QString id)
{ {
mtx::events::collections::TimelineEvents *e = events.event(id.toStdString(), ""); mtx::events::collections::TimelineEvents *e = events.get(id.toStdString(), "");
if (!e) if (!e)
return ""; return "";
@ -1383,7 +1383,7 @@ TimelineModel::formatHistoryVisibilityEvent(QString id)
QString QString
TimelineModel::formatPowerLevelEvent(QString id) TimelineModel::formatPowerLevelEvent(QString id)
{ {
mtx::events::collections::TimelineEvents *e = events.event(id.toStdString(), ""); mtx::events::collections::TimelineEvents *e = events.get(id.toStdString(), "");
if (!e) if (!e)
return ""; return "";
@ -1401,7 +1401,7 @@ TimelineModel::formatPowerLevelEvent(QString id)
QString QString
TimelineModel::formatMemberEvent(QString id) TimelineModel::formatMemberEvent(QString id)
{ {
mtx::events::collections::TimelineEvents *e = events.event(id.toStdString(), ""); mtx::events::collections::TimelineEvents *e = events.get(id.toStdString(), "");
if (!e) if (!e)
return ""; return "";
@ -1412,7 +1412,7 @@ TimelineModel::formatMemberEvent(QString id)
mtx::events::StateEvent<mtx::events::state::Member> *prevEvent = nullptr; mtx::events::StateEvent<mtx::events::state::Member> *prevEvent = nullptr;
if (!event->unsigned_data.replaces_state.empty()) { if (!event->unsigned_data.replaces_state.empty()) {
auto tempPrevEvent = auto tempPrevEvent =
events.event(event->unsigned_data.replaces_state, event->event_id); events.get(event->unsigned_data.replaces_state, event->event_id);
if (tempPrevEvent) { if (tempPrevEvent) {
prevEvent = prevEvent =
std::get_if<mtx::events::StateEvent<mtx::events::state::Member>>( std::get_if<mtx::events::StateEvent<mtx::events::state::Member>>(