Don't spam pending invites every time NeoChat is started

Currently the way we show invite notifications is sub-optimal. We did it
during the initial room state load, which meant it shows an invite
notification *every time* you opened NeoChat. This gets annoying very
quickly if you have any pending invitations you don't want to take
action on just yet.

Instead, let's handle this in NotificationsManager directly, and also
remove some scaffolding now that it isn't plumbed through
NeoChatRoom/NeoChatConnection.


(cherry picked from commit d542033125)

Co-authored-by: Joshua Goins <josh@redstrate.com>

src/controller.cpp

@@ -168,7 +168,6 @@ void Controller::addConnection(NeoChatConnection *c)
     connect(c, &NeoChatConnection::syncDone, this, [this, c]() {
         m_notificationsManager.handleNotifications(c);
     });
-    connect(c, &NeoChatConnection::showInviteNotification, &m_notificationsManager, &NotificationsManager::postInviteNotification);
 
     c->sync();
 

src/neochatconnection.cpp

@@ -109,10 +109,6 @@ void NeoChatConnection::connectSignals()
             Q_EMIT homeHaveHighlightNotificationsChanged();
         });
     });
-    connect(this, &NeoChatConnection::invitedRoom, this, [this](Quotient::Room *room) {
-        auto r = dynamic_cast<NeoChatRoom *>(room);
-        connect(r, &NeoChatRoom::showInviteNotification, this, &NeoChatConnection::showInviteNotification);
-    });
     connect(this, &NeoChatConnection::leftRoom, this, [this](Room *room, Room *prev) {
         Q_UNUSED(room)
         if (prev && prev->isDirectChat()) {

src/neochatconnection.h

@@ -205,11 +205,6 @@ Q_SIGNALS:
      */
     void errorOccured(const QString &error);
 
-    /**
-     * @brief Request a notification be shown for an invite to this room.
-     */
-    void showInviteNotification(NeoChatRoom *room);
-
 private:
     bool m_isOnline = true;
     void setIsOnline(bool isOnline);

src/neochatroom.cpp

@@ -124,9 +124,6 @@ NeoChatRoom::NeoChatRoom(Connection *connection, QString roomId, JoinState joinS
             updatePushNotificationState(QStringLiteral("m.push_rules"));
 
             Q_EMIT canEncryptRoomChanged();
-            if (this->joinState() == JoinState::Invite) {
-                Q_EMIT showInviteNotification(this);
-            }
         },
         Qt::SingleShotConnection);
     connect(this, &Room::changed, this, [this] {

src/neochatroom.h

@@ -654,14 +654,6 @@ Q_SIGNALS:
      */
     void showMessage(MessageType::Type messageType, const QString &message);
 
-    /**
-     * @brief Request a notification be shown for an invite to this room.
-     *
-     * @note This may later be blocked if there are any rules on where invites can
-     * come from, but this is not NeoChatRoom's responsibility.
-     */
-    void showInviteNotification(NeoChatRoom *room);
-
 public Q_SLOTS:
     /**
      * @brief Upload a file to the matrix server and post the file to the room.

src/notificationsmanager.cpp

@@ -127,9 +127,8 @@ void NotificationsManager::processNotificationJob(QPointer<NeoChatConnection> co
         }
         auto sender = room->member(notification["event"_ls]["sender"_ls].toString());
 
-        // Don't display notifications for events in invited rooms
-        // This should prevent empty notifications from appearing when they shouldn't
         if (room->joinState() == JoinState::Invite) {
+            postInviteNotification(qobject_cast<NeoChatRoom *>(room));
             continue;
         }