mirror of
https://gitlab.com/famedly/conduit.git
synced 2024-09-12 01:29:12 +02:00
Merge branch 'lib-fix' into 'master'
Export conduits Config struct and fix clippy warnings See merge request famedly/conduit!99
This commit is contained in:
commit
13c0beafa6
4 changed files with 8 additions and 8 deletions
6
Cargo.lock
generated
6
Cargo.lock
generated
|
@ -983,9 +983,9 @@ dependencies = [
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "itertools"
|
name = "itertools"
|
||||||
version = "0.10.0"
|
version = "0.10.1"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "37d572918e350e82412fe766d24b15e6682fb2ed2bbe018280caa810397cb319"
|
checksum = "69ddb889f9d0d08a67338271fa9b62996bc788c7796a5c18cf057420aaed5eaf"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"either",
|
"either",
|
||||||
]
|
]
|
||||||
|
@ -2123,7 +2123,7 @@ name = "ruma-state-res"
|
||||||
version = "0.2.0"
|
version = "0.2.0"
|
||||||
source = "git+https://github.com/ruma/ruma?rev=174555857ef90d49e4b9a672be9e2fe0acdc2687#174555857ef90d49e4b9a672be9e2fe0acdc2687"
|
source = "git+https://github.com/ruma/ruma?rev=174555857ef90d49e4b9a672be9e2fe0acdc2687#174555857ef90d49e4b9a672be9e2fe0acdc2687"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"itertools 0.10.0",
|
"itertools 0.10.1",
|
||||||
"js_int",
|
"js_int",
|
||||||
"maplit",
|
"maplit",
|
||||||
"ruma-common",
|
"ruma-common",
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
use log::{error, warn};
|
use log::warn;
|
||||||
use ruma::{
|
use ruma::{
|
||||||
api::client::{
|
api::client::{
|
||||||
error::{Error as RumaError, ErrorKind},
|
error::{Error as RumaError, ErrorKind},
|
||||||
|
@ -12,6 +12,7 @@ use thiserror::Error;
|
||||||
use {
|
use {
|
||||||
crate::RumaResponse,
|
crate::RumaResponse,
|
||||||
http::StatusCode,
|
http::StatusCode,
|
||||||
|
log::error,
|
||||||
rocket::{
|
rocket::{
|
||||||
response::{self, Responder},
|
response::{self, Responder},
|
||||||
Request,
|
Request,
|
||||||
|
|
|
@ -10,10 +10,10 @@ mod ruma_wrapper;
|
||||||
pub mod server_server;
|
pub mod server_server;
|
||||||
mod utils;
|
mod utils;
|
||||||
|
|
||||||
pub use database::Database;
|
pub use database::{Config, Database};
|
||||||
pub use error::{Error, Result};
|
pub use error::{Error, Result};
|
||||||
pub use pdu::PduEvent;
|
pub use pdu::PduEvent;
|
||||||
pub use rocket::Config;
|
pub use rocket::Config as RocketConfig;
|
||||||
pub use ruma_wrapper::{ConduitResult, Ruma, RumaResponse};
|
pub use ruma_wrapper::{ConduitResult, Ruma, RumaResponse};
|
||||||
use std::ops::Deref;
|
use std::ops::Deref;
|
||||||
|
|
||||||
|
|
|
@ -654,8 +654,7 @@ pub async fn send_transaction_message_route(
|
||||||
for edu in body
|
for edu in body
|
||||||
.edus
|
.edus
|
||||||
.iter()
|
.iter()
|
||||||
.map(|edu| serde_json::from_str::<Edu>(edu.json().get()))
|
.filter_map(|edu| serde_json::from_str::<Edu>(edu.json().get()).ok())
|
||||||
.filter_map(|r| r.ok())
|
|
||||||
{
|
{
|
||||||
match edu {
|
match edu {
|
||||||
Edu::Presence(_) => {}
|
Edu::Presence(_) => {}
|
||||||
|
|
Loading…
Reference in a new issue