Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1,394 changes: 864 additions & 530 deletions Cargo.lock

Large diffs are not rendered by default.

14 changes: 7 additions & 7 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@ members = [
resolver = "2"

[workspace.dependencies]
futures = "0.3.31"
futures = "0.3.32"
http = "1.4.0"
matrix-sdk = { version = "0.16.0", default-features = false, features = ["rustls-tls"] }
regex = "1.12.2"
ruma = { version = "0.14", features = ["events"] }
ruma-common = "0.17.0"
matrix-sdk = { version = "0.17.0", default-features = false }
regex = "1.12.3"
ruma = { version = "0.15", features = ["events"] }
ruma-common = "0.18.0"
serde = { version = "1.0.228", features = ["derive"] }
thiserror = "2.0.17"
tokio = "1.48.0"
thiserror = "2.0.18"
tokio = "1.52.3"
tracing = "0.1.44"
4 changes: 2 additions & 2 deletions microbot/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ use message::{CommandMessageParser, IntoCommand};
use ruma::{
api::client::{filter::FilterDefinition, sync::sync_events::v3::Filter as SyncFilter},
events::{
room::{member::RoomMemberEventContent, message::RoomMessageEventContent},
room::{member::PossiblyRedactedRoomMemberEventContent, message::RoomMessageEventContent},
MessageLikeEventContent, OriginalSyncMessageLikeEvent, StrippedStateEvent,
},
OwnedUserId,
Expand Down Expand Up @@ -225,7 +225,7 @@ impl MatrixMessenger {

/// Handles accepting room invites
async fn handle_autojoin_event(
_event: StrippedStateEvent<RoomMemberEventContent>,
_event: StrippedStateEvent<PossiblyRedactedRoomMemberEventContent>,
room: Room,
_client: Client,
) {
Expand Down
2 changes: 1 addition & 1 deletion test-utils/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ use matrix_sdk::{
Client, RoomState,
};
use microbot::{MatrixMessenger, MatrixMessengerSignals};
use ruma::api::client::{error::ErrorKind, uiaa};
use ruma::api::{client::uiaa, error::ErrorKind};
use tokio::{sync::watch::Receiver, task::JoinHandle};
use tracing::instrument;

Expand Down
4 changes: 2 additions & 2 deletions tests/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,5 @@ tokio = { workspace = true }
tracing = { workspace = true }

[dev-dependencies]
rand = "0.8.5"
tracing-subscriber = { version = "0.3.18", features = ["env-filter"] }
rand = "0.10.1"
tracing-subscriber = { version = "0.3.23", features = ["env-filter"] }
8 changes: 4 additions & 4 deletions tests/tests/bot_conversation.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

use microbot::{CommandArgs, MatrixConfig, MatrixMessenger};
use microbot_test_utils::{setup, spawn_bot};
use rand::{distributions::Alphanumeric, Rng};
use rand::{distr::Alphanumeric, RngExt};
use ruma::events::room::message::RoomMessageEventContent;
use tokio::sync::{
mpsc,
Expand Down Expand Up @@ -46,23 +46,23 @@ async fn test_bot_conversation() {

let sender = format!(
"test-sender-{}",
rand::thread_rng()
rand::rng()
.sample_iter(&Alphanumeric)
.take(24)
.map(|b| char::from(b))
.collect::<String>()
);
let bot1 = format!(
"test-bot1-{}",
rand::thread_rng()
rand::rng()
.sample_iter(&Alphanumeric)
.take(24)
.map(|b| char::from(b))
.collect::<String>()
);
let bot2 = format!(
"test-bot2-{}",
rand::thread_rng()
rand::rng()
.sample_iter(&Alphanumeric)
.take(24)
.map(|b| char::from(b))
Expand Down
6 changes: 3 additions & 3 deletions tests/tests/ignore_old_messages.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

use microbot::{CommandArgs, MatrixConfig, MatrixMessenger};
use microbot_test_utils::{setup, spawn_bot};
use rand::{distributions::Alphanumeric, Rng};
use rand::{distr::Alphanumeric, RngExt};
use tokio::sync::{mpsc, mpsc::Sender};
use tracing_subscriber::filter::EnvFilter;

Expand All @@ -20,15 +20,15 @@ async fn test_ignores_old_messages() {

let sender = format!(
"test-sender-{}",
rand::thread_rng()
rand::rng()
.sample_iter(&Alphanumeric)
.take(24)
.map(|b| char::from(b))
.collect::<String>()
);
let receiver = format!(
"test-receiver-{}",
rand::thread_rng()
rand::rng()
.sample_iter(&Alphanumeric)
.take(24)
.map(|b| char::from(b))
Expand Down
6 changes: 3 additions & 3 deletions tests/tests/receives_command.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

use microbot::{CommandArgs, MatrixConfig, MatrixMessenger};
use microbot_test_utils::{setup, spawn_bot};
use rand::{distributions::Alphanumeric, Rng};
use rand::{distr::Alphanumeric, RngExt};
use tokio::sync::{mpsc, mpsc::Sender};
use tracing_subscriber::filter::EnvFilter;

Expand All @@ -20,15 +20,15 @@ async fn test_receives_command() {

let sender = format!(
"test-sender-{}",
rand::thread_rng()
rand::rng()
.sample_iter(&Alphanumeric)
.take(24)
.map(|b| char::from(b))
.collect::<String>()
);
let receiver = format!(
"test-receiver-{}",
rand::thread_rng()
rand::rng()
.sample_iter(&Alphanumeric)
.take(24)
.map(|b| char::from(b))
Expand Down
Loading