Fix Connection::accountData<>()

The template version has never worked, to the point where instantiating
it would immediately lead to FTBFS. The new version returns an event
pointer as a simpler fix that would make it usable - in particular,
there's no more need to have separate
Connection::Private::unpackAccountData(). To simplify the fix,
eventCast() has been made more tolerating - passing nullptr to it is
processed in an expected (no-op) way now.

1 files changed, 1 insertions, 10 deletions

diff --git a/lib/connection.cpp b/lib/connection.cpp
index 6e04883e..9e4444df 100644
--- a/lib/connection.cpp
+++ b/lib/connection.cpp
@@ -175,15 +175,6 @@ public:
     void consumeToDeviceEvents(Events&& toDeviceEvents);
     void consumeDevicesList(DevicesList&& devicesList);
 
-    template <typename EventT>
-    EventT* unpackAccountData() const
-    {
-        const auto& eventIt = accountData.find(EventT::matrixTypeId());
-        return eventIt == accountData.end()
-                   ? nullptr
-                   : weakPtrCast<EventT>(eventIt->second);
-    }
-
     void packAndSendAccountData(EventPtr&& event)
     {
         const auto eventType = event->matrixType();
@@ -1665,7 +1656,7 @@ bool Connection::isIgnored(const User* user) const
 
 IgnoredUsersList Connection::ignoredUsers() const
 {
-    const auto* event = d->unpackAccountData<IgnoredUsersEvent>();
+    const auto* event = accountData<IgnoredUsersEvent>();
     return event ? event->ignored_users() : IgnoredUsersList();
 }