Create a common MessageModel and inherit SearchModel and MessageEventModel from it.

Title

src/models/searchmodel.h

@@ -5,11 +5,10 @@
 
 #include <QAbstractListModel>
 #include <QQmlEngine>
-#include <QString>
 
 #include <Quotient/csapi/search.h>
 
-#include "neochatroommember.h"
+#include "messagemodel.h"
 
 namespace Quotient
 {
@@ -23,7 +22,7 @@ class NeoChatRoom;
  *
  * This class defines the model for visualising the results of a room message search.
  */
-class SearchModel : public QAbstractListModel
+class SearchModel : public MessageModel
 {
     Q_OBJECT
     QML_ELEMENT
@@ -33,63 +32,19 @@ class SearchModel : public QAbstractListModel
      */
     Q_PROPERTY(QString searchText READ searchText WRITE setSearchText NOTIFY searchTextChanged)
 
-    /**
-     * @brief The current room that the search is being done from.
-     */
-    Q_PROPERTY(NeoChatRoom *room READ room WRITE setRoom NOTIFY roomChanged)
-
     /**
      * @brief Whether the model is currently searching for messages.
      */
     Q_PROPERTY(bool searching READ searching NOTIFY searchingChanged)
 
 public:
-    /**
-     * @brief Defines the model roles.
-     *
-     * For documentation of the roles, see MessageEventModel.
-     *
-     * Some of the roles exist only for compatibility with the MessageEventModel,
-     * since the same delegates are used.
-     */
-    enum Roles {
-        DelegateTypeRole = Qt::DisplayRole + 1,
-        AuthorRole,
-        ShowSectionRole,
-        SectionRole,
-        EventIdRole,
-        ExcessReadMarkersRole,
-        HighlightRole,
-        ReadMarkersString,
-        VerifiedRole,
-        ShowReactionsRole,
-        ReactionRole,
-        ReadMarkersRole,
-        IsPendingRole,
-        ShowReadMarkersRole,
-        IsThreadedRole,
-        ThreadRootRole,
-        ContentModelRole,
-        IsEditableRole,
-    };
-    Q_ENUM(Roles)
     explicit SearchModel(QObject *parent = nullptr);
 
     QString searchText() const;
     void setSearchText(const QString &searchText);
 
-    NeoChatRoom *room() const;
-    void setRoom(NeoChatRoom *room);
-
     bool searching() const;
 
-    /**
-     * @brief Get the given role value at the given index.
-     *
-     * @sa QAbstractItemModel::data
-     */
-    QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
-
     /**
      * @brief Number of rows in the model.
      *
@@ -97,13 +52,6 @@ public:
      */
     int rowCount(const QModelIndex &parent = QModelIndex()) const override;
 
-    /**
-     * @brief Returns a mapping from Role enum values to role names.
-     *
-     * @sa Roles, QAbstractItemModel::roleNames()
-     */
-    QHash<int, QByteArray> roleNames() const override;
-
     /**
      * @brief Start searching for messages.
      */
@@ -114,17 +62,13 @@ Q_SIGNALS:
     void roomChanged();
     void searchingChanged();
 
-protected:
-    bool event(QEvent *event) override;
-
 private:
+    std::optional<std::reference_wrapper<const Quotient::RoomEvent>> getEventForIndex(QModelIndex index) const override;
+
     void setSearching(bool searching);
 
     QString m_searchText;
-    QPointer<NeoChatRoom> m_room;
     std::optional<Quotient::SearchJob::ResultRoomEvents> m_result = std::nullopt;
     Quotient::SearchJob *m_job = nullptr;
     bool m_searching = false;
-
-    std::map<QString, std::unique_ptr<NeochatRoomMember>> m_memberObjects;
 };