magmaus3/continuwuity
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

cargo clippy

Browse source
This commit is contained in:
Nyaaori 2022-10-10 14:09:11 +02:00
parent ca82b2940d
commit f430b87459
No known key found for this signature in database
GPG key ID: E7819C3ED4D1F82E
32 changed files with 139 additions and 166 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/service/sending/mod.rs
View file

@ -110,7 +110,7 @@ impl Service {
}
pub fn start_handler(self: &Arc<Self>) {
let self2 = Arc::clone(&self);
let self2 = Arc::clone(self);
tokio::spawn(async move {
self2.handler().await.unwrap();
});
@ -280,7 +280,7 @@ impl Service {
device_list_changes.extend(
services()
.users
.keys_changed(&room_id.to_string(), since, None)
.keys_changed(room_id.as_ref(), since, None)
.filter_map(|r| r.ok())
.filter(|user_id| user_id.server_name() == services().globals.server_name()),
);
@ -487,7 +487,7 @@ impl Service {
let response = appservice_server::send_request(
services()
.appservice
.get_registration(&id)
.get_registration(id)
.map_err(|e| (kind.clone(), e))?
.ok_or_else(|| {
(
@ -562,7 +562,7 @@ impl Service {
let pusher = match services()
.pusher
.get_pusher(&userid, pushkey)
.get_pusher(userid, pushkey)
.map_err(|e| (OutgoingKind::Push(userid.clone(), pushkey.clone()), e))?
{
Some(pusher) => pusher,
@ -573,18 +573,18 @@ impl Service {
.account_data
.get(
None,
&userid,
userid,
GlobalAccountDataEventType::PushRules.to_string().into(),
)
.unwrap_or_default()
.and_then(|event| serde_json::from_str::<PushRulesEvent>(event.get()).ok())
.map(|ev: PushRulesEvent| ev.content.global)
.unwrap_or_else(|| push::Ruleset::server_default(&userid));
.unwrap_or_else(|| push::Ruleset::server_default(userid));
let unread: UInt = services()
.rooms
.user
.notification_count(&userid, &pdu.room_id)
.notification_count(userid, &pdu.room_id)
.map_err(|e| (kind.clone(), e))?
.try_into()
.expect("notification count can't go that high");
@ -593,7 +593,7 @@ impl Service {
let _response = services()
.pusher
.send_push_notice(&userid, unread, &pusher, rules_for_user, &pdu)
.send_push_notice(userid, unread, &pusher, rules_for_user, &pdu)
.await
.map(|_response| kind.clone())
.map_err(|e| (kind.clone(), e));
@ -638,7 +638,7 @@ impl Service {
let permit = services().sending.maximum_requests.acquire().await;
let response = server_server::send_request(
&*server,
server,
send_transaction_message::v1::Request {
origin: services().globals.server_name(),
pdus: &pdu_jsons,