EventHandler Cleanup

Remove functions from eventhandler and replace with now uplifted functions in libquotient

src/models/messagecontentmodel.cpp

@@ -305,7 +305,7 @@ QVariant MessageContentModel::data(const QModelIndex &index, int role) const
         return component.attributes;
     }
     if (role == EventIdRole) {
-        return EventHandler::id(event.first);
+        return event.first->displayId();
     }
     if (role == TimeRole) {
         const auto pendingIt = std::find_if(m_room->pendingEvents().cbegin(), m_room->pendingEvents().cend(), [event](const PendingEventItem &pendingEvent) {
@@ -348,7 +348,9 @@ QVariant MessageContentModel::data(const QModelIndex &index, int role) const
         return QVariant::fromValue<PollHandler *>(m_room->poll(m_eventId));
     }
     if (role == ReplyEventIdRole) {
-        return EventHandler::replyId(event.first);
+        if (const auto roomMessageEvent = eventCast<const RoomMessageEvent>(event.first)) {
+            return roomMessageEvent->replyEventId();
+        }
     }
     if (role == ReplyAuthorRole) {
         return QVariant::fromValue(EventHandler::replyAuthor(m_room, event.first));
@@ -456,8 +458,8 @@ QList<MessageComponent> MessageContentModel::messageContentComponents(bool isEdi
 
     QList<MessageComponent> newComponents;
 
-    if (eventCast<const Quotient::RoomMessageEvent>(event.first)
-        && eventCast<const Quotient::RoomMessageEvent>(event.first)->rawMsgtype() == QStringLiteral("m.key.verification.request")) {
+    const auto roomMessageEvent = eventCast<const Quotient::RoomMessageEvent>(event.first);
+    if (roomMessageEvent && roomMessageEvent->rawMsgtype() == QStringLiteral("m.key.verification.request")) {
         newComponents += MessageComponent{MessageComponentType::Verification, QString(), {}};
         return newComponents;
     }
@@ -482,7 +484,7 @@ QList<MessageComponent> MessageContentModel::messageContentComponents(bool isEdi
     }
 
     // If the event is already threaded the ThreadModel will handle displaying a chat bar.
-    if (isThreading && !EventHandler::isThreaded(event.first)) {
+    if (isThreading && roomMessageEvent && roomMessageEvent->isThreaded()) {
         newComponents += MessageComponent{MessageComponentType::ChatBar, QString(), {}};
     }
 
@@ -496,7 +498,8 @@ void MessageContentModel::updateReplyModel()
         return;
     }
 
-    if (!EventHandler::hasReply(event.first) || (EventHandler::isThreaded(event.first) && NeoChatConfig::self()->threads())) {
+    const auto roomMessageEvent = eventCast<const Quotient::RoomMessageEvent>(event.first);
+    if (!roomMessageEvent->isReply() || (roomMessageEvent && roomMessageEvent->isThreaded() && NeoChatConfig::self()->threads())) {
         if (m_replyModel) {
             delete m_replyModel;
         }
@@ -507,7 +510,7 @@ void MessageContentModel::updateReplyModel()
         return;
     }
 
-    m_replyModel = new MessageContentModel(m_room, EventHandler::replyId(event.first), true, false, this);
+    m_replyModel = new MessageContentModel(m_room, roomMessageEvent->replyEventId(), true, false, this);
 
     connect(m_replyModel, &MessageContentModel::eventUpdated, this, [this]() {
         Q_EMIT dataChanged(index(0), index(0), {ReplyAuthorRole});

src/models/messageeventmodel.cpp

@@ -501,7 +501,8 @@ QVariant MessageEventModel::data(const QModelIndex &idx, int role) const
             return EventStatus::Hidden;
         }
 
-        if (EventHandler::isThreaded(&evt) && EventHandler::threadRoot(&evt) != EventHandler::id(&evt) && NeoChatConfig::threads()) {
+        auto roomMessageEvent = eventCast<const RoomMessageEvent>(&evt);
+        if (roomMessageEvent && roomMessageEvent->isThreaded() && roomMessageEvent->threadRootEventId() != evt.id() && NeoChatConfig::threads()) {
             return EventStatus::Hidden;
         }
 
@@ -509,7 +510,7 @@ QVariant MessageEventModel::data(const QModelIndex &idx, int role) const
     }
 
     if (role == EventIdRole) {
-        return EventHandler::id(&evt);
+        return evt.displayId();
     }
 
     if (role == ProgressInfoRole) {
@@ -534,11 +535,18 @@ QVariant MessageEventModel::data(const QModelIndex &idx, int role) const
     }
 
     if (role == IsThreadedRole) {
-        return EventHandler::isThreaded(&evt);
+        if (auto roomMessageEvent = eventCast<const RoomMessageEvent>(&evt)) {
+            return roomMessageEvent->isThreaded();
+        }
+        return {};
     }
 
     if (role == ThreadRootRole) {
-        return EventHandler::threadRoot(&evt);
+        auto roomMessageEvent = eventCast<const RoomMessageEvent>(&evt);
+        if (roomMessageEvent && roomMessageEvent->isThreaded()) {
+            return roomMessageEvent->threadRootEventId();
+        }
+        return {};
     }
 
     if (role == ShowSectionRole) {
@@ -654,8 +662,10 @@ void MessageEventModel::createEventObjects(const Quotient::RoomEvent *event, boo
         }
     }
 
-    if (EventHandler::isThreaded(event) && !m_threadModels.contains(EventHandler::threadRoot(event))) {
-        m_threadModels[EventHandler::threadRoot(event)] = QSharedPointer<ThreadModel>(new ThreadModel(EventHandler::threadRoot(event), m_currentRoom));
+    const auto roomMessageEvent = eventCast<const Quotient::RoomMessageEvent>(event);
+    if (roomMessageEvent && roomMessageEvent->isThreaded() && !m_threadModels.contains(roomMessageEvent->threadRootEventId())) {
+        m_threadModels[roomMessageEvent->threadRootEventId()] =
+            QSharedPointer<ThreadModel>(new ThreadModel(roomMessageEvent->threadRootEventId(), m_currentRoom));
     }
 
     // ReadMarkerModel handles updates to add and remove markers, we only need to

src/models/searchmodel.cpp

@@ -108,11 +108,17 @@ QVariant SearchModel::data(const QModelIndex &index, int role) const
     case HighlightRole:
         return EventHandler::isHighlighted(m_room, &event);
     case EventIdRole:
-        return EventHandler::id(&event);
+        return event.displayId();
     case IsThreadedRole:
-        return EventHandler::isThreaded(&event);
+        if (auto roomMessageEvent = eventCast<const RoomMessageEvent>(&event)) {
+            return roomMessageEvent->isThreaded();
+        }
+        return {};
     case ThreadRootRole:
-        return EventHandler::threadRoot(&event);
+        if (auto roomMessageEvent = eventCast<const RoomMessageEvent>(&event); roomMessageEvent->isThreaded()) {
+            return roomMessageEvent->threadRootEventId();
+        }
+        return {};
     case ContentModelRole: {
         if (!event.isStateEvent()) {
             return QVariant::fromValue<MessageContentModel *>(new MessageContentModel(m_room, event.id()));

src/models/threadmodel.cpp

@@ -25,7 +25,7 @@ ThreadModel::ThreadModel(const QString &threadRootId, NeoChatRoom *room)
 
     connect(room, &Quotient::Room::pendingEventAboutToAdd, this, [this](Quotient::RoomEvent *event) {
         if (auto roomEvent = eventCast<const Quotient::RoomMessageEvent>(event)) {
-            if (EventHandler::isThreaded(roomEvent) && EventHandler::threadRoot(roomEvent) == m_threadRootId) {
+            if (roomEvent->isThreaded() && roomEvent->threadRootEventId() == m_threadRootId) {
                 addNewEvent(event);
                 addModels();
             }
@@ -34,7 +34,7 @@ ThreadModel::ThreadModel(const QString &threadRootId, NeoChatRoom *room)
     connect(room, &Quotient::Room::aboutToAddNewMessages, this, [this](Quotient::RoomEventsRange events) {
         for (const auto &event : events) {
             if (auto roomEvent = eventCast<const Quotient::RoomMessageEvent>(event)) {
-                if (EventHandler::isThreaded(roomEvent) && EventHandler::threadRoot(roomEvent) == m_threadRootId) {
+                if (roomEvent->isThreaded() && roomEvent->threadRootEventId() == m_threadRootId) {
                     addNewEvent(roomEvent);
                 }
             }