char
/
matrix-rust-sdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

appservice: Fixes after rebase

master
Johannes Becker 2021-06-08 11:18:56 +02:00
parent 66551d28e4
commit c634efbe09
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
matrix_sdk_appservice/examples/autojoin.rs
View File

@ -1,7 +1,7 @@
use std::{convert::TryFrom, env}; use std::{convert::TryFrom, env};
use matrix_sdk_appservice::{ use matrix_sdk_appservice::{
sdk::{ matrix_sdk::{
async_trait, async_trait,
events::{ events::{
room::member::{MemberEventContent, MembershipState}, room::member::{MemberEventContent, MembershipState},

5
matrix_sdk_appservice/tests/tests.rs
View File

@ -7,11 +7,10 @@ use matrix_sdk::{
async_trait, async_trait,
events::{room::member::MemberEventContent, SyncStateEvent}, events::{room::member::MemberEventContent, SyncStateEvent},
room::Room, room::Room,
EventHandler, ClientConfig, EventHandler, RequestConfig,
}; };
use matrix_sdk_appservice::*; use matrix_sdk_appservice::*;
use matrix_sdk_test::{appservice::TransactionBuilder, async_test, EventsJson}; use matrix_sdk_test::{appservice::TransactionBuilder, async_test, EventsJson};
use sdk::{ClientConfig, RequestConfig};
use serde_json::json; use serde_json::json;
#[cfg(feature = "warp")] #[cfg(feature = "warp")]
use warp::{Filter, Reply}; use warp::{Filter, Reply};
@ -319,7 +318,7 @@ async fn test_unrelated_path() -> Result<()> {
let status = { let status = {
let consumer_filter = warp::any() let consumer_filter = warp::any()
.and(appservice.warp_filter()) .and(appservice.warp_filter())
.or(warp::get().and(warp::path("unrelated").map(|| warp::reply()))); .or(warp::get().and(warp::path("unrelated").map(warp::reply)));
let response = warp::test::request() let response = warp::test::request()
.method("GET") .method("GET")