summaryrefslogtreecommitdiff
path: root/src/api/server_server.rs
diff options
context:
space:
mode:
authorTimo Kösters <timo@koesters.xyz>2022-10-05 20:41:05 +0200
committerNyaaori <+@nyaaori.cat>2022-10-10 14:02:01 +0200
commitf47a5cd5d5ce20b5996d28e37415771ee6d8a34b (patch)
treecd3375e45ca7415dbde3e5c4175a8aaec09e6c9b /src/api/server_server.rs
parenta4637e2ba1093065a6fda3fa2ad2b2b9f30eea63 (diff)
downloadconduit-f47a5cd5d5ce20b5996d28e37415771ee6d8a34b.zip
cargo fix
Diffstat (limited to 'src/api/server_server.rs')
-rw-r--r--src/api/server_server.rs27
1 files changed, 9 insertions, 18 deletions
diff --git a/src/api/server_server.rs b/src/api/server_server.rs
index dba4489..c832b0d 100644
--- a/src/api/server_server.rs
+++ b/src/api/server_server.rs
@@ -4,10 +4,10 @@ use crate::{
services, utils, Error, PduEvent, Result, Ruma,
};
use axum::{response::IntoResponse, Json};
-use futures_util::{stream::FuturesUnordered, StreamExt};
+use futures_util::{StreamExt};
use get_profile_information::v1::ProfileField;
use http::header::{HeaderValue, AUTHORIZATION};
-use regex::Regex;
+
use ruma::{
api::{
client::error::{Error as RumaError, ErrorKind},
@@ -16,8 +16,7 @@ use ruma::{
device::get_devices::{self, v1::UserDevice},
directory::{get_public_rooms, get_public_rooms_filtered},
discovery::{
- get_remote_server_keys, get_remote_server_keys_batch,
- get_remote_server_keys_batch::v2::QueryCriteria, get_server_keys,
+ get_server_keys,
get_server_version, ServerSigningKeys, VerifyKey,
},
event::{get_event, get_missing_events, get_room_state, get_room_state_ids},
@@ -40,36 +39,28 @@ use ruma::{
events::{
receipt::{ReceiptEvent, ReceiptEventContent},
room::{
- create::RoomCreateEventContent,
join_rules::{JoinRule, RoomJoinRulesEventContent},
member::{MembershipState, RoomMemberEventContent},
- server_acl::RoomServerAclEventContent,
},
RoomEventType, StateEventType,
},
- int,
receipt::ReceiptType,
serde::{Base64, JsonObject, Raw},
- signatures::{CanonicalJsonObject, CanonicalJsonValue},
- state_res::{self, RoomVersion, StateMap},
- to_device::DeviceIdOrAllDevices,
- uint, EventId, MilliSecondsSinceUnixEpoch, RoomId, RoomVersionId, ServerName,
+ signatures::{CanonicalJsonValue},
+ to_device::DeviceIdOrAllDevices, EventId, MilliSecondsSinceUnixEpoch, RoomId, ServerName,
ServerSigningKeyId,
};
use serde_json::value::{to_raw_value, RawValue as RawJsonValue};
use std::{
- collections::{btree_map, hash_map, BTreeMap, BTreeSet, HashMap, HashSet},
+ collections::{BTreeMap},
fmt::Debug,
- future::Future,
mem,
net::{IpAddr, SocketAddr},
- ops::Deref,
- pin::Pin,
- sync::{Arc, RwLock, RwLockWriteGuard},
+ sync::{Arc, RwLock},
time::{Duration, Instant, SystemTime},
};
-use tokio::sync::{MutexGuard, Semaphore};
-use tracing::{debug, error, info, trace, warn};
+
+use tracing::{info, warn};
/// Wraps either an literal IP address plus port, or a hostname plus complement
/// (colon-plus-port if it was specified).