Make connections across threads queued in any case

src/ChatPage.cpp

@@ -545,8 +545,12 @@ ChatPage::ChatPage(QSharedPointer<UserSettings> userSettings, QWidget *parent)
                                   emit notificationsRetrieved(std::move(res));
                           });
         });
-        connect(this, &ChatPage::syncRoomlist, room_list_, &RoomList::sync);
+        connect(this, &ChatPage::syncRoomlist, room_list_, &RoomList::sync, Qt::QueuedConnection);
-        connect(this, &ChatPage::syncTags, communitiesList_, &CommunitiesList::syncTags);
+        connect(this,
+                &ChatPage::syncTags,
+                communitiesList_,
+                &CommunitiesList::syncTags,
+                Qt::QueuedConnection);
         connect(
           this, &ChatPage::syncTopBar, this, [this](const std::map<QString, RoomInfo> &updates) {
                   if (updates.find(currentRoom()) != updates.end())
@@ -561,11 +565,15 @@ ChatPage::ChatPage(QSharedPointer<UserSettings> userSettings, QWidget *parent)
                 user_info_widget_->setDisplayName(name);
         });
 
-        connect(this, &ChatPage::tryInitialSyncCb, this, &ChatPage::tryInitialSync);
+        connect(
-        connect(this, &ChatPage::trySyncCb, this, &ChatPage::trySync);
+          this, &ChatPage::tryInitialSyncCb, this, &ChatPage::tryInitialSync, Qt::QueuedConnection);
-        connect(this, &ChatPage::tryDelayedSyncCb, this, [this]() {
+        connect(this, &ChatPage::trySyncCb, this, &ChatPage::trySync, Qt::QueuedConnection);
-                QTimer::singleShot(RETRY_TIMEOUT, this, &ChatPage::trySync);
+        connect(
-        });
+          this,
+          &ChatPage::tryDelayedSyncCb,
+          this,
+          [this]() { QTimer::singleShot(RETRY_TIMEOUT, this, &ChatPage::trySync); },
+          Qt::QueuedConnection);
 
         connect(this, &ChatPage::dropToLoginPageCb, this, &ChatPage::dropToLoginPage);
 

src/timeline/TimelineModel.cpp

@@ -144,72 +144,96 @@ TimelineModel::TimelineModel(TimelineViewManager *manager, QString room_id, QObj
   , room_id_(room_id)
   , manager_(manager)
 {
+        connect(this,
+                &TimelineModel::oldMessagesRetrieved,
+                this,
+                &TimelineModel::addBackwardsEvents,
+                Qt::QueuedConnection);
         connect(
-          this, &TimelineModel::oldMessagesRetrieved, this, &TimelineModel::addBackwardsEvents);
+          this,
-        connect(this, &TimelineModel::messageFailed, this, [this](QString txn_id) {
+          &TimelineModel::messageFailed,
-                nhlog::ui()->error("Failed to send {}, retrying", txn_id.toStdString());
+          this,
-
+          [this](QString txn_id) {
-                QTimer::singleShot(5000, this, [this]() { emit nextPendingMessage(); });
+                  nhlog::ui()->error("Failed to send {}, retrying", txn_id.toStdString());
-        });
-        connect(this, &TimelineModel::messageSent, this, [this](QString txn_id, QString event_id) {
-                pending.removeOne(txn_id);
-
-                auto ev = events.value(txn_id);
-
-                if (auto reaction =
-                      std::get_if<mtx::events::RoomEvent<mtx::events::msg::Reaction>>(&ev)) {
-                        QString reactedTo =
-                          QString::fromStdString(reaction->content.relates_to.event_id);
-                        auto &rModel = reactions[reactedTo];
-                        rModel.removeReaction(*reaction);
-                        auto rCopy     = *reaction;
-                        rCopy.event_id = event_id.toStdString();
-                        rModel.addReaction(room_id_.toStdString(), rCopy);
-                }
-
-                int idx = idToIndex(txn_id);
-                if (idx < 0) {
-                        // transaction already received via sync
-                        return;
-                }
-                eventOrder[idx] = event_id;
-                ev              = std::visit(
-                  [event_id](const auto &e) -> mtx::events::collections::TimelineEvents {
-                          auto eventCopy     = e;
-                          eventCopy.event_id = event_id.toStdString();
-                          return eventCopy;
-                  },
-                  ev);
-
-                events.remove(txn_id);
-                events.insert(event_id, ev);
-
-                // mark our messages as read
-                readEvent(event_id.toStdString());
-
-                emit dataChanged(index(idx, 0), index(idx, 0));
-
-                if (pending.size() > 0)
-                        emit nextPendingMessage();
-        });
-        connect(this, &TimelineModel::redactionFailed, this, [](const QString &msg) {
-                emit ChatPage::instance()->showNotification(msg);
-        });
 
+                  QTimer::singleShot(5000, this, [this]() { emit nextPendingMessage(); });
+          },
+          Qt::QueuedConnection);
         connect(
-          this, &TimelineModel::nextPendingMessage, this, &TimelineModel::processOnePendingMessage);
+          this,
-        connect(this, &TimelineModel::newMessageToSend, this, &TimelineModel::addPendingMessage);
+          &TimelineModel::messageSent,
+          this,
+          [this](QString txn_id, QString event_id) {
+                  pending.removeOne(txn_id);
+
+                  auto ev = events.value(txn_id);
+
+                  if (auto reaction =
+                        std::get_if<mtx::events::RoomEvent<mtx::events::msg::Reaction>>(&ev)) {
+                          QString reactedTo =
+                            QString::fromStdString(reaction->content.relates_to.event_id);
+                          auto &rModel = reactions[reactedTo];
+                          rModel.removeReaction(*reaction);
+                          auto rCopy     = *reaction;
+                          rCopy.event_id = event_id.toStdString();
+                          rModel.addReaction(room_id_.toStdString(), rCopy);
+                  }
+
+                  int idx = idToIndex(txn_id);
+                  if (idx < 0) {
+                          // transaction already received via sync
+                          return;
+                  }
+                  eventOrder[idx] = event_id;
+                  ev              = std::visit(
+                    [event_id](const auto &e) -> mtx::events::collections::TimelineEvents {
+                            auto eventCopy     = e;
+                            eventCopy.event_id = event_id.toStdString();
+                            return eventCopy;
+                    },
+                    ev);
+
+                  events.remove(txn_id);
+                  events.insert(event_id, ev);
+
+                  // mark our messages as read
+                  readEvent(event_id.toStdString());
+
+                  emit dataChanged(index(idx, 0), index(idx, 0));
+
+                  if (pending.size() > 0)
+                          emit nextPendingMessage();
+          },
+          Qt::QueuedConnection);
+        connect(
+          this,
+          &TimelineModel::redactionFailed,
+          this,
+          [](const QString &msg) { emit ChatPage::instance()->showNotification(msg); },
+          Qt::QueuedConnection);
 
         connect(this,
-                &TimelineModel::eventFetched,
+                &TimelineModel::nextPendingMessage,
                 this,
-                [this](QString requestingEvent, mtx::events::collections::TimelineEvents event) {
+                &TimelineModel::processOnePendingMessage,
-                        events.insert(QString::fromStdString(mtx::accessors::event_id(event)),
+                Qt::QueuedConnection);
-                                      event);
+        connect(this,
-                        auto idx = idToIndex(requestingEvent);
+                &TimelineModel::newMessageToSend,
-                        if (idx >= 0)
+                this,
-                                emit dataChanged(index(idx, 0), index(idx, 0));
+                &TimelineModel::addPendingMessage,
-                });
+                Qt::QueuedConnection);
+
+        connect(
+          this,
+          &TimelineModel::eventFetched,
+          this,
+          [this](QString requestingEvent, mtx::events::collections::TimelineEvents event) {
+                  events.insert(QString::fromStdString(mtx::accessors::event_id(event)), event);
+                  auto idx = idToIndex(requestingEvent);
+                  if (idx >= 0)
+                          emit dataChanged(index(idx, 0), index(idx, 0));
+          },
+          Qt::QueuedConnection);
 }
 
 QHash<int, QByteArray>