From d4ddd29660d9f51d248119dd6032e68ab29e7d35 Mon Sep 17 00:00:00 2001
From: Slavi Pantaleev <slavi@devture.com>
Date: Sun, 22 Sep 2024 09:34:10 +0300
Subject: [PATCH] Upgrade mxlink to fix missing messages in threads

Reported here https://github.com/etkecc/baibot/issues/13#issuecomment-2365273996

Fixed in https://github.com/etkecc/rust-mxlink/commit/88fabb308c969a0afe75fcdd230c6362b64bbad8
---
 Cargo.lock                           | 5 ++---
 Cargo.toml                           | 2 +-
 src/conversation/matrix/utils/mod.rs | 7 +++++--
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index d528c6d..2655d38 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2132,14 +2132,13 @@ dependencies = [
 
 [[package]]
 name = "mxlink"
-version = "1.2.1"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1aa513435471af3e1131dc18a1f4eb2e6fb42c11308f1be9b4f0316b3809e32"
+checksum = "f5f7234edcd534b11daad1641a148b8bfcae417deb6e6bff564ae69b3d3c4678"
 dependencies = [
  "base64 0.22.1",
  "chacha20poly1305",
  "hex",
- "js_int",
  "matrix-sdk",
  "mime",
  "quick_cache",
diff --git a/Cargo.toml b/Cargo.toml
index 67cfb28..963fff4 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -23,7 +23,7 @@ chrono = { version = "0.4.*", default-features = false, features = ["std", "now"
 # We'd rather not depend on this, but we cannot use the ruma-events EventContent macro without it.
 matrix-sdk = { version = "0.7.1", default-features = false }
 mxidwc = "1.0.*"
-mxlink = ">=1.2.1"
+mxlink = ">=1.3.0"
 etke_openai_api_rust = "0.1.*"
 quick_cache = "0.6.*"
 regex = "1.10.*"
diff --git a/src/conversation/matrix/utils/mod.rs b/src/conversation/matrix/utils/mod.rs
index 8c2c3b2..3f28986 100644
--- a/src/conversation/matrix/utils/mod.rs
+++ b/src/conversation/matrix/utils/mod.rs
@@ -13,7 +13,7 @@ use mxlink::matrix_sdk::{
     },
     Room,
 };
-use mxlink::{MatrixLink, ThreadInfo};
+use mxlink::{MatrixLink, ThreadGetMessagesParams, ThreadInfo};
 
 use super::{MatrixMessage, MatrixMessageProcessingParams, MatrixMessageType, RoomEventFetcher};
 use crate::entity::{MessagePayload, ThreadContext, ThreadContextFirstMessage};
@@ -23,7 +23,10 @@ pub async fn get_matrix_messages_in_thread(
     room: &Room,
     thread_id: OwnedEventId,
 ) -> Result<Vec<MatrixMessage>, mxlink::matrix_sdk::Error> {
-    let messages_native = matrix_link.threads().get_messages(room, thread_id).await?;
+    let messages_native = matrix_link
+        .threads()
+        .get_messages(room, thread_id, ThreadGetMessagesParams::default())
+        .await?;
 
     let mut messages: Vec<MatrixMessage> = Vec::new();