From 32d4d9f75f0af6dc92b8176e7caf127be08bd3a0 Mon Sep 17 00:00:00 2001
From: James Graham <james.h.graham@protonmail.com>
Date: Tue, 23 Jul 2024 18:29:35 +0100
Subject: [PATCH] Pass NeochatRoomMembers rather than RoomMembers to menus

---
 src/roommanager.cpp | 5 +++--
 src/roommanager.h   | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/roommanager.cpp b/src/roommanager.cpp
index d87b5373b..285321ae0 100644
--- a/src/roommanager.cpp
+++ b/src/roommanager.cpp
@@ -11,6 +11,7 @@
 #include "neochatconfig.h"
 #include "neochatconnection.h"
 #include "neochatroom.h"
+#include "neochatroommember.h"
 #include "spacehierarchycache.h"
 #include "urlhelper.h"
 
@@ -209,7 +210,7 @@ void RoomManager::viewEventMenu(const QString &eventId, NeoChatRoom *room, const
 
     if (eventHandler.getMediaInfo().contains("mimeType"_ls)) {
         Q_EMIT showFileMenu(eventId,
-                            room->member(event.senderId()),
+                            new NeochatRoomMember(room, eventId),
                             eventHandler.messageComponentType(),
                             eventHandler.getPlainBody(),
                             eventHandler.getMediaInfo()["mimeType"_ls].toString(),
@@ -218,7 +219,7 @@ void RoomManager::viewEventMenu(const QString &eventId, NeoChatRoom *room, const
     }
 
     Q_EMIT showMessageMenu(eventId,
-                           room->member(event.senderId()),
+                           new NeochatRoomMember(room, eventId),
                            eventHandler.messageComponentType(),
                            eventHandler.getPlainBody(),
                            eventHandler.getRichBody(),
diff --git a/src/roommanager.h b/src/roommanager.h
index 07de885df..4e908b0d4 100644
--- a/src/roommanager.h
+++ b/src/roommanager.h
@@ -23,6 +23,7 @@
 #include "models/sortfilterspacelistmodel.h"
 #include "models/timelinemodel.h"
 #include "models/userlistmodel.h"
+#include "neochatroommember.h"
 
 class NeoChatRoom;
 class NeoChatConnection;
@@ -303,7 +304,7 @@ Q_SIGNALS:
      * @brief Request to show a menu for the given event.
      */
     void showMessageMenu(const QString &eventId,
-                         const Quotient::RoomMember &author,
+                         const NeochatRoomMember *author,
                          MessageComponentType::Type messageComponentType,
                          const QString &plainText,
                          const QString &htmlText,
@@ -313,7 +314,7 @@ Q_SIGNALS:
      * @brief Request to show a menu for the given media event.
      */
     void showFileMenu(const QString &eventId,
-                      const Quotient::RoomMember &author,
+                      const NeochatRoomMember *author,
                       MessageComponentType::Type messageComponentType,
                       const QString &plainText,
                       const QString &mimeType,