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

Adapt to changes in libQuotient API

Browse Source
This commit is contained in:
Tobias Fella
2021-07-31 01:00:58 +02:00
parent 2e1ab639c6
commit de7354f056
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/messageeventmodel.cpp
View File

@@ -68,7 +68,7 @@ MessageEventModel::MessageEventModel(QObject *parent)
return; return;
} }
const auto it = m_currentRoom->findInTimeline(m_currentRoom->readMarkerEventId()); const auto it = m_currentRoom->findInTimeline(m_currentRoom->readMarkerEventId());
if (it == m_currentRoom->timelineEdge()) { if (it == m_currentRoom->historyEdge()) {
m_currentRoom->getPreviousContent(50); m_currentRoom->getPreviousContent(50);
} }
}); });
@@ -235,7 +235,7 @@ void MessageEventModel::refreshEventRoles(int row, const QVector<int> &roles)
void MessageEventModel::moveReadMarker(const QString &toEventId) void MessageEventModel::moveReadMarker(const QString &toEventId)
{ {
const auto timelineIt = m_currentRoom->findInTimeline(toEventId); const auto timelineIt = m_currentRoom->findInTimeline(toEventId);
if (timelineIt == m_currentRoom->timelineEdge()) { if (timelineIt == m_currentRoom->historyEdge()) {
return; return;
} }
int newRow = int(timelineIt - m_currentRoom->messageEvents().rbegin()) + timelineBaseIndex(); int newRow = int(timelineIt - m_currentRoom->messageEvents().rbegin()) + timelineBaseIndex();
@@ -280,7 +280,7 @@ int MessageEventModel::refreshEventRoles(const QString &id, const QVector<int> &
row = int(pendingIt - m_currentRoom->pendingEvents().begin()); row = int(pendingIt - m_currentRoom->pendingEvents().begin());
} else { } else {
const auto timelineIt = m_currentRoom->findInTimeline(id); const auto timelineIt = m_currentRoom->findInTimeline(id);
if (timelineIt == m_currentRoom->timelineEdge()) { if (timelineIt == m_currentRoom->historyEdge()) {
qWarning() << "Trying to refresh inexistent event:" << id; qWarning() << "Trying to refresh inexistent event:" << id;
return -1; return -1;
} }
@@ -622,7 +622,7 @@ QVariant MessageEventModel::data(const QModelIndex &idx, int role) const
return {}; return {};
}; };
const auto replyIt = m_currentRoom->findInTimeline(replyEventId); const auto replyIt = m_currentRoom->findInTimeline(replyEventId);
if (replyIt == m_currentRoom->timelineEdge()) { if (replyIt == m_currentRoom->historyEdge()) {
return {}; return {};
}; };
const auto &replyEvt = **replyIt; const auto &replyEvt = **replyIt;
@@ -745,7 +745,7 @@ QVariant MessageEventModel::data(const QModelIndex &idx, int role) const
int MessageEventModel::eventIDToIndex(const QString &eventID) const int MessageEventModel::eventIDToIndex(const QString &eventID) const
{ {
const auto it = m_currentRoom->findInTimeline(eventID); const auto it = m_currentRoom->findInTimeline(eventID);
if (it == m_currentRoom->timelineEdge()) { if (it == m_currentRoom->historyEdge()) {
//qWarning() << "Trying to find inexistent event:" << eventID; //qWarning() << "Trying to find inexistent event:" << eventID;
return -1; return -1;
} }

10
src/neochatroom.cpp
View File

@@ -234,12 +234,12 @@ QDateTime NeoChatRoom::lastActiveTime()
int NeoChatRoom::savedTopVisibleIndex() const int NeoChatRoom::savedTopVisibleIndex() const
{ {
return firstDisplayedMarker() == timelineEdge() ? 0 : int(firstDisplayedMarker() - messageEvents().rbegin()); return firstDisplayedMarker() == historyEdge() ? 0 : int(firstDisplayedMarker() - messageEvents().rbegin());
} }
int NeoChatRoom::savedBottomVisibleIndex() const int NeoChatRoom::savedBottomVisibleIndex() const
{ {
return lastDisplayedMarker() == timelineEdge() ? 0 : int(lastDisplayedMarker() - messageEvents().rbegin()); return lastDisplayedMarker() == historyEdge() ? 0 : int(lastDisplayedMarker() - messageEvents().rbegin());
} }
void NeoChatRoom::saveViewport(int topIndex, int bottomIndex) void NeoChatRoom::saveViewport(int topIndex, int bottomIndex)
@@ -565,7 +565,7 @@ void NeoChatRoom::postHtmlMessage(const QString &text, const QString &html, Mess
bool isReply = !replyEventId.isEmpty(); bool isReply = !replyEventId.isEmpty();
bool isEdit = !relateToEventId.isEmpty(); bool isEdit = !relateToEventId.isEmpty();
const auto replyIt = findInTimeline(replyEventId); const auto replyIt = findInTimeline(replyEventId);
if (replyIt == timelineEdge()) { if (replyIt == historyEdge()) {
isReply = false; isReply = false;
} }
@@ -631,7 +631,7 @@ void NeoChatRoom::toggleReaction(const QString &eventId, const QString &reaction
} }
const auto eventIt = findInTimeline(eventId); const auto eventIt = findInTimeline(eventId);
if (eventIt == timelineEdge()) { if (eventIt == historyEdge()) {
return; return;
} }
@@ -696,7 +696,7 @@ bool NeoChatRoom::canSendState(const QString &eventType) const
bool NeoChatRoom::readMarkerLoaded() const bool NeoChatRoom::readMarkerLoaded() const
{ {
const auto it = findInTimeline(readMarkerEventId()); const auto it = findInTimeline(readMarkerEventId());
return it != timelineEdge(); return it != historyEdge();
} }
bool NeoChatRoom::isInvite() const bool NeoChatRoom::isInvite() const