diff --git a/src/api/client_server/account.rs b/src/api/client_server/account.rs
index 673bbb4214263e7e2ff6bae53616401c2ecd0eee..17b2920a3b862a24d0ec5d2fe9cfb480b37ab651 100644
--- a/src/api/client_server/account.rs
+++ b/src/api/client_server/account.rs
@@ -333,7 +333,7 @@ pub async fn whoami_route(body: Ruma<whoami::v3::Request>) -> Result<whoami::v3:
Ok(whoami::v3::Response {
user_id: sender_user.clone(),
device_id,
- is_guest: services().users.is_deactivated(&sender_user)?,
+ is_guest: services().users.is_deactivated(sender_user)?,
})
}
@@ -383,7 +383,7 @@ pub async fn deactivate_route(
}
// Make the user leave all rooms before deactivation
- client_server::leave_all_rooms(&sender_user).await?;
+ client_server::leave_all_rooms(sender_user).await?;
// Remove devices and mark account as deactivated
services().users.deactivate_account(sender_user)?;
diff --git a/src/api/client_server/keys.rs b/src/api/client_server/keys.rs
index ef4e455db37bb20f529e823deead3256201f4c5c..9a21dd604ae40562b3dbb0538277354dc12a85fa 100644
--- a/src/api/client_server/keys.rs
+++ b/src/api/client_server/keys.rs
@@ -234,7 +234,7 @@ pub async fn get_key_changes_route(
services()
.users
.keys_changed(
- &room_id.to_string(),
+ room_id.as_ref(),
body.from.parse().map_err(|_| {
Error::BadRequest(ErrorKind::InvalidParam, "Invalid `from`.")
})?,
@@ -264,7 +264,7 @@ pub(crate) async fn get_keys_helper<F: Fn(&UserId) -> bool>(
let mut get_over_federation = HashMap::new();
for (user_id, device_ids) in device_keys_input {
- let user_id: &UserId = &**user_id;
+ let user_id: &UserId = user_id;
if user_id.server_name() != services().globals.server_name() {
get_over_federation
diff --git a/src/api/client_server/membership.rs b/src/api/client_server/membership.rs
index 4f791c71f4adb6374aefc509e9846696270f244f..b69a6d1f56cc613e3edec92089acb2dd28ea8da5 100644
--- a/src/api/client_server/membership.rs
+++ b/src/api/client_server/membership.rs
@@ -62,15 +62,13 @@ pub async fn join_room_by_id_route(
servers.push(body.room_id.server_name().to_owned());
- let ret = join_room_by_id_helper(
+ join_room_by_id_helper(
body.sender_user.as_deref(),
&body.room_id,
&servers,
body.third_party_signed.as_ref(),
)
- .await;
-
- ret
+ .await
}
/// # `POST /_matrix/client/r0/join/{roomIdOrAlias}`
@@ -171,7 +169,7 @@ pub async fn kick_user_route(
.room_state_get(
&body.room_id,
&StateEventType::RoomMember,
- &body.user_id.to_string(),
+ body.user_id.as_ref(),
)?
.ok_or(Error::BadRequest(
ErrorKind::BadState,
@@ -230,7 +228,7 @@ pub async fn ban_user_route(
.room_state_get(
&body.room_id,
&StateEventType::RoomMember,
- &body.user_id.to_string(),
+ body.user_id.as_ref(),
)?
.map_or(
Ok(RoomMemberEventContent {
@@ -297,7 +295,7 @@ pub async fn unban_user_route(
.room_state_get(
&body.room_id,
&StateEventType::RoomMember,
- &body.user_id.to_string(),
+ body.user_id.as_ref(),
)?
.ok_or(Error::BadRequest(
ErrorKind::BadState,
@@ -408,7 +406,7 @@ pub async fn get_member_events_route(
.await?
.iter()
.filter(|(key, _)| key.0 == StateEventType::RoomMember)
- .map(|(_, pdu)| pdu.to_member_event().into())
+ .map(|(_, pdu)| pdu.to_member_event())
.collect(),
})
}
@@ -864,7 +862,7 @@ pub(crate) async fn invite_helper<'a>(
"${}",
ruma::signatures::reference_hash(
&pdu_json,
- &services().rooms.state.get_room_version(&room_id)?
+ &services().rooms.state.get_room_version(room_id)?
)
.expect("ruma can calculate reference hashes")
);
@@ -878,7 +876,7 @@ pub(crate) async fn invite_helper<'a>(
create_invite::v2::Request {
room_id,
event_id: expected_event_id,
- room_version: &services().rooms.state.get_room_version(&room_id)?,
+ room_version: &services().rooms.state.get_room_version(room_id)?,
event: &PduEvent::convert_to_outgoing_federation_event(pdu_json.clone()),
invite_room_state: &invite_room_state,
},
@@ -938,7 +936,7 @@ pub(crate) async fn invite_helper<'a>(
if !services()
.rooms
.state_cache
- .is_joined(sender_user, &room_id)?
+ .is_joined(sender_user, room_id)?
{
return Err(Error::BadRequest(
ErrorKind::Forbidden,
diff --git a/src/api/client_server/room.rs b/src/api/client_server/room.rs
index 43b2e8e63bfecb39ca70e22ce05317c11c291d01..097f0e14255656f1331b968fc778d98222177511 100644
--- a/src/api/client_server/room.rs
+++ b/src/api/client_server/room.rs
@@ -1,8 +1,6 @@
use crate::{
api::client_server::invite_helper, service::pdu::PduBuilder, services, Error, Result, Ruma,
};
-use ruma::serde::JsonObject;
-use ruma::OwnedRoomAliasId;
use ruma::{
api::client::{
error::ErrorKind,
@@ -23,7 +21,9 @@
},
RoomEventType, StateEventType,
},
- int, CanonicalJsonObject, RoomAliasId, RoomId,
+ int,
+ serde::JsonObject,
+ CanonicalJsonObject, OwnedRoomAliasId, RoomAliasId, RoomId,
};
use serde_json::{json, value::to_raw_value};
use std::{cmp::max, collections::BTreeMap, sync::Arc};
@@ -213,14 +213,11 @@ pub async fn create_room_route(
// 3. Power levels
// Figure out preset. We need it for preset specific events
- let preset = body
- .preset
- .clone()
- .unwrap_or_else(|| match &body.visibility {
- room::Visibility::Private => RoomPreset::PrivateChat,
- room::Visibility::Public => RoomPreset::PublicChat,
- _ => RoomPreset::PrivateChat, // Room visibility should not be custom
- });
+ let preset = body.preset.clone().unwrap_or(match &body.visibility {
+ room::Visibility::Private => RoomPreset::PrivateChat,
+ room::Visibility::Public => RoomPreset::PublicChat,
+ _ => RoomPreset::PrivateChat, // Room visibility should not be custom
+ });
let mut users = BTreeMap::new();
users.insert(sender_user.clone(), int!(100));
diff --git a/src/api/client_server/session.rs b/src/api/client_server/session.rs
index 618251675e4d4965409384bedbe18857d4609280..f62ccbb6c5eabb86ff382040829b0547737c7849 100644
--- a/src/api/client_server/session.rs
+++ b/src/api/client_server/session.rs
@@ -53,11 +53,11 @@ pub async fn login_route(body: Ruma<login::v3::IncomingRequest>) -> Result<login
} else {
return Err(Error::BadRequest(ErrorKind::Forbidden, "Bad login type."));
};
- let user_id = UserId::parse_with_server_name(
- username.to_owned(),
- services().globals.server_name(),
- )
- .map_err(|_| Error::BadRequest(ErrorKind::InvalidUsername, "Username is invalid."))?;
+ let user_id =
+ UserId::parse_with_server_name(username, services().globals.server_name())
+ .map_err(|_| {
+ Error::BadRequest(ErrorKind::InvalidUsername, "Username is invalid.")
+ })?;
let hash = services()
.users
.password_hash(&user_id)?
diff --git a/src/api/client_server/sync.rs b/src/api/client_server/sync.rs
index f7907ce253e3ffd29cc00b8d4084ced88058b0d3..d876a92699775c638f94285cfadbfc0084f1f2f7 100644
--- a/src/api/client_server/sync.rs
+++ b/src/api/client_server/sync.rs
@@ -207,7 +207,7 @@ async fn sync_helper(
device_list_updates.extend(
services()
.users
- .keys_changed(&sender_user.to_string(), since, None)
+ .keys_changed(sender_user.as_ref(), since, None)
.filter_map(|r| r.ok()),
);
@@ -673,7 +673,7 @@ async fn sync_helper(
device_list_updates.extend(
services()
.users
- .keys_changed(&room_id.to_string(), since, None)
+ .keys_changed(room_id.as_ref(), since, None)
.filter_map(|r| r.ok()),
);
@@ -951,8 +951,8 @@ async fn sync_helper(
},
presence: Presence {
events: presence_updates
- .into_iter()
- .map(|(_, v)| Raw::new(&v).expect("PresenceEvent always serializes successfully"))
+ .into_values()
+ .map(|v| Raw::new(&v).expect("PresenceEvent always serializes successfully"))
.collect(),
},
account_data: GlobalAccountData {
diff --git a/src/api/client_server/to_device.rs b/src/api/client_server/to_device.rs
index 34db3f98ef38a360a2cd51c0d61e1850fbe1dff2..f84d54f0c2595acb12be295433b691b71f1377a4 100644
--- a/src/api/client_server/to_device.rs
+++ b/src/api/client_server/to_device.rs
@@ -58,7 +58,7 @@ pub async fn send_event_to_device_route(
services().users.add_to_device_event(
sender_user,
target_user_id,
- &target_device_id,
+ target_device_id,
&body.event_type,
event.deserialize_as().map_err(|_| {
Error::BadRequest(ErrorKind::InvalidParam, "Event is invalid")
diff --git a/src/api/client_server/user_directory.rs b/src/api/client_server/user_directory.rs
index 9d7a8289409f328559d6e6b74a1a4716ead27562..518daa5e38c9e5f0e29019aeb67c7e4702a6d484 100644
--- a/src/api/client_server/user_directory.rs
+++ b/src/api/client_server/user_directory.rs
@@ -75,7 +75,7 @@ pub async fn search_users_route(
let user_is_in_shared_rooms = services()
.rooms
.user
- .get_shared_rooms(vec![sender_user.clone(), user_id.clone()])
+ .get_shared_rooms(vec![sender_user.clone(), user_id])
.ok()?
.next()
.is_some();
diff --git a/src/api/server_server.rs b/src/api/server_server.rs
index 513a07691afd7be9c520f73d3c0f617b1de6f525..3750598359bef7871c9f01369c51a9e4c620855f 100644
--- a/src/api/server_server.rs
+++ b/src/api/server_server.rs
@@ -75,7 +75,7 @@
/// # Ok(())
/// # }
/// ```
-#[derive(Clone, Debug, PartialEq)]
+#[derive(Clone, Debug, PartialEq, Eq)]
pub enum FedDest {
Literal(SocketAddr),
Named(String, String),
@@ -686,7 +686,7 @@ pub async fn send_transaction_message_route(
services()
.rooms
.event_handler
- .acl_check(&sender_servername, &room_id)?;
+ .acl_check(sender_servername, &room_id)?;
let mutex = Arc::clone(
services()
@@ -705,7 +705,7 @@ pub async fn send_transaction_message_route(
.rooms
.event_handler
.handle_incoming_pdu(
- &sender_servername,
+ sender_servername,
&event_id,
&room_id,
value,
@@ -974,7 +974,7 @@ pub async fn get_missing_events_route(
services()
.rooms
.event_handler
- .acl_check(&sender_servername, &body.room_id)?;
+ .acl_check(sender_servername, &body.room_id)?;
let mut queued_events = body.latest_events.clone();
let mut events = Vec::new();
@@ -1053,7 +1053,7 @@ pub async fn get_event_authorization_route(
services()
.rooms
.event_handler
- .acl_check(&sender_servername, &body.room_id)?;
+ .acl_check(sender_servername, &body.room_id)?;
let event = services()
.rooms
@@ -1112,7 +1112,7 @@ pub async fn get_room_state_route(
services()
.rooms
.event_handler
- .acl_check(&sender_servername, &body.room_id)?;
+ .acl_check(sender_servername, &body.room_id)?;
let shortstatehash = services()
.rooms
@@ -1128,8 +1128,8 @@ pub async fn get_room_state_route(
.state_accessor
.state_full_ids(shortstatehash)
.await?
- .into_iter()
- .map(|(_, id)| {
+ .into_values()
+ .map(|id| {
PduEvent::convert_to_outgoing_federation_event(
services()
.rooms
@@ -1193,7 +1193,7 @@ pub async fn get_room_state_ids_route(
services()
.rooms
.event_handler
- .acl_check(&sender_servername, &body.room_id)?;
+ .acl_check(sender_servername, &body.room_id)?;
let shortstatehash = services()
.rooms
@@ -1209,8 +1209,8 @@ pub async fn get_room_state_ids_route(
.state_accessor
.state_full_ids(shortstatehash)
.await?
- .into_iter()
- .map(|(_, id)| (*id).to_owned())
+ .into_values()
+ .map(|id| (*id).to_owned())
.collect();
let auth_chain_ids = services()
@@ -1250,7 +1250,7 @@ pub async fn create_join_event_template_route(
services()
.rooms
.event_handler
- .acl_check(&sender_servername, &body.room_id)?;
+ .acl_check(sender_servername, &body.room_id)?;
let mutex_state = Arc::clone(
services()
@@ -1354,7 +1354,7 @@ async fn create_join_event(
services()
.rooms
.event_handler
- .acl_check(&sender_servername, room_id)?;
+ .acl_check(sender_servername, room_id)?;
// TODO: Conduit does not implement restricted join rules yet, we always reject
let join_rules_event = services().rooms.state_accessor.room_state_get(
@@ -1448,10 +1448,7 @@ async fn create_join_event(
let auth_chain_ids = services()
.rooms
.auth_chain
- .get_auth_chain(
- room_id,
- state_ids.iter().map(|(_, id)| id.clone()).collect(),
- )
+ .get_auth_chain(room_id, state_ids.values().cloned().collect())
.await?;
let servers = services()
@@ -1527,7 +1524,7 @@ pub async fn create_invite_route(
services()
.rooms
.event_handler
- .acl_check(&sender_servername, &body.room_id)?;
+ .acl_check(sender_servername, &body.room_id)?;
if !services()
.globals
diff --git a/src/config/mod.rs b/src/config/mod.rs
index 2c31b6b11e58c9af70a0b378a7f900cab989bf5b..b60b9cff32e18df07258ea9370980196a3e92a64 100644
--- a/src/config/mod.rs
+++ b/src/config/mod.rs
@@ -232,7 +232,7 @@ fn default_pdu_cache_capacity() -> u32 {
}
fn default_cleanup_second_interval() -> u32 {
- 1 * 60 // every minute
+ 60 // every minute
}
fn default_max_request_size() -> u32 {
diff --git a/src/database/abstraction/rocksdb.rs b/src/database/abstraction/rocksdb.rs
index 96027f6a10d5a02fdf91e499811208d047ab346f..34d91d2957f3e6f59f94022ac47710431c4feb45 100644
--- a/src/database/abstraction/rocksdb.rs
+++ b/src/database/abstraction/rocksdb.rs
@@ -193,7 +193,7 @@ fn iter_from<'a>(
fn increment(&self, key: &[u8]) -> Result<Vec<u8>> {
let lock = self.write_lock.write().unwrap();
- let old = self.db.rocks.get_cf(&self.cf(), &key)?;
+ let old = self.db.rocks.get_cf(&self.cf(), key)?;
let new = utils::increment(old.as_deref()).unwrap();
self.db.rocks.put_cf(&self.cf(), key, &new)?;
diff --git a/src/database/abstraction/sqlite.rs b/src/database/abstraction/sqlite.rs
index 02d4dbd6cdaf76f2489bc94647835a79a7243d3a..4961fd7441d51a1ae1128011729b5125c2dacaa0 100644
--- a/src/database/abstraction/sqlite.rs
+++ b/src/database/abstraction/sqlite.rs
@@ -48,13 +48,13 @@ pub struct Engine {
impl Engine {
fn prepare_conn(path: &Path, cache_size_kb: u32) -> Result<Connection> {
- let conn = Connection::open(&path)?;
+ let conn = Connection::open(path)?;
- conn.pragma_update(Some(Main), "page_size", &2048)?;
- conn.pragma_update(Some(Main), "journal_mode", &"WAL")?;
- conn.pragma_update(Some(Main), "synchronous", &"NORMAL")?;
- conn.pragma_update(Some(Main), "cache_size", &(-i64::from(cache_size_kb)))?;
- conn.pragma_update(Some(Main), "wal_autocheckpoint", &0)?;
+ conn.pragma_update(Some(Main), "page_size", 2048)?;
+ conn.pragma_update(Some(Main), "journal_mode", "WAL")?;
+ conn.pragma_update(Some(Main), "synchronous", "NORMAL")?;
+ conn.pragma_update(Some(Main), "cache_size", -i64::from(cache_size_kb))?;
+ conn.pragma_update(Some(Main), "wal_autocheckpoint", 0)?;
Ok(conn)
}
@@ -75,7 +75,7 @@ fn read_lock_iterator(&self) -> &Connection {
pub fn flush_wal(self: &Arc<Self>) -> Result<()> {
self.write_lock()
- .pragma_update(Some(Main), "wal_checkpoint", &"RESTART")?;
+ .pragma_update(Some(Main), "wal_checkpoint", "RESTART")?;
Ok(())
}
}
diff --git a/src/database/key_value/globals.rs b/src/database/key_value/globals.rs
index 4332930f3988e17eb2577993876010903e7738d8..7b7675ca92cca3a848246c83017e63d294bbf12e 100644
--- a/src/database/key_value/globals.rs
+++ b/src/database/key_value/globals.rs
@@ -134,7 +134,7 @@ fn load_keypair(&self) -> Result<Ed25519KeyPair> {
let mut parts = keypair_bytes.splitn(2, |&b| b == 0xff);
- let keypair = utils::string_from_bytes(
+ utils::string_from_bytes(
// 1. version
parts
.next()
@@ -151,9 +151,7 @@ fn load_keypair(&self) -> Result<Ed25519KeyPair> {
.and_then(|(version, key)| {
Ed25519KeyPair::from_der(key, version)
.map_err(|_| Error::bad_database("Private or public keys are invalid."))
- });
-
- keypair
+ })
}
fn remove_keypair(&self) -> Result<()> {
self.global.remove(b"keypair")
diff --git a/src/database/key_value/pusher.rs b/src/database/key_value/pusher.rs
index 42d4030b37b81d4bdf614a2572080d43ea3983a6..3dfceb6ab4ecc5cec58084a46f8d0fb7578444a4 100644
--- a/src/database/key_value/pusher.rs
+++ b/src/database/key_value/pusher.rs
@@ -40,7 +40,7 @@ fn get_pusher(
self.senderkey_pusher
.get(&senderkey)?
.map(|push| {
- serde_json::from_slice(&*push)
+ serde_json::from_slice(&push)
.map_err(|_| Error::bad_database("Invalid Pusher in db."))
})
.transpose()
@@ -53,7 +53,7 @@ fn get_pushers(&self, sender: &UserId) -> Result<Vec<get_pushers::v3::Pusher>> {
self.senderkey_pusher
.scan_prefix(prefix)
.map(|(_, push)| {
- serde_json::from_slice(&*push)
+ serde_json::from_slice(&push)
.map_err(|_| Error::bad_database("Invalid Pusher in db."))
})
.collect()
diff --git a/src/database/key_value/rooms/alias.rs b/src/database/key_value/rooms/alias.rs
index c0f6de89e7d100cf18599f183f4871b6cb467c46..6f2303231b0eb3bc6d54fa5897bd320490a99d57 100644
--- a/src/database/key_value/rooms/alias.rs
+++ b/src/database/key_value/rooms/alias.rs
@@ -9,7 +9,7 @@ fn set_alias(&self, alias: &RoomAliasId, room_id: &RoomId) -> Result<()> {
let mut aliasid = room_id.as_bytes().to_vec();
aliasid.push(0xff);
aliasid.extend_from_slice(&services().globals.next_count()?.to_be_bytes());
- self.aliasid_alias.insert(&aliasid, &*alias.as_bytes())?;
+ self.aliasid_alias.insert(&aliasid, alias.as_bytes())?;
Ok(())
}
diff --git a/src/database/key_value/rooms/edus/presence.rs b/src/database/key_value/rooms/edus/presence.rs
index 5259beff2d1d766617c2cb12258aa8fc3f004d21..904b1c44b74090e771409219f7fdf3331a4f574d 100644
--- a/src/database/key_value/rooms/edus/presence.rs
+++ b/src/database/key_value/rooms/edus/presence.rs
@@ -88,7 +88,7 @@ fn presence_since(
for (key, value) in self
.presenceid_presence
- .iter_from(&*first_possible_edu, false)
+ .iter_from(&first_possible_edu, false)
.take_while(|(key, _)| key.starts_with(&prefix))
{
let user_id = UserId::parse(
diff --git a/src/database/key_value/rooms/edus/typing.rs b/src/database/key_value/rooms/edus/typing.rs
index 4e6c86b4b14c811eb8609bdaf91a49f368e092cb..4a2f0f9606d6c71acd8903ccd070f401acc14f6d 100644
--- a/src/database/key_value/rooms/edus/typing.rs
+++ b/src/database/key_value/rooms/edus/typing.rs
@@ -17,7 +17,7 @@ fn typing_add(&self, user_id: &UserId, room_id: &RoomId, timeout: u64) -> Result
room_typing_id.extend_from_slice(&count);
self.typingid_userid
- .insert(&room_typing_id, &*user_id.as_bytes())?;
+ .insert(&room_typing_id, user_id.as_bytes())?;
self.roomid_lasttypingupdate
.insert(room_id.as_bytes(), &count)?;
diff --git a/src/database/key_value/rooms/search.rs b/src/database/key_value/rooms/search.rs
index 788c2965d445ceef0ffddb73eeeb4e5c4b222554..19ae57b429c2b108944e6d9e1c899591d82f5c09 100644
--- a/src/database/key_value/rooms/search.rs
+++ b/src/database/key_value/rooms/search.rs
@@ -15,7 +15,7 @@ fn index_pdu<'a>(&self, shortroomid: u64, pdu_id: &[u8], message_body: &str) ->
let mut key = shortroomid.to_be_bytes().to_vec();
key.extend_from_slice(word.as_bytes());
key.push(0xff);
- key.extend_from_slice(&pdu_id);
+ key.extend_from_slice(pdu_id);
(key, Vec::new())
});
diff --git a/src/database/key_value/rooms/timeline.rs b/src/database/key_value/rooms/timeline.rs
index 0c6c2dde3ba31f018cca7fb26d2b907b41d0a027..336317da0edd33c2551d6ddc5de314be5c7dd718 100644
--- a/src/database/key_value/rooms/timeline.rs
+++ b/src/database/key_value/rooms/timeline.rs
@@ -39,7 +39,7 @@ fn last_timeline_count(&self, sender_user: &UserId, room_id: &RoomId) -> Result<
{
hash_map::Entry::Vacant(v) => {
if let Some(last_count) = self
- .pdus_until(&sender_user, &room_id, u64::MAX)?
+ .pdus_until(sender_user, room_id, u64::MAX)?
.filter_map(|r| {
// Filter out buggy events
if r.is_err() {
@@ -205,8 +205,7 @@ fn append_pdu(
.unwrap()
.insert(pdu.room_id.clone(), count);
- self.eventid_pduid
- .insert(pdu.event_id.as_bytes(), &pdu_id)?;
+ self.eventid_pduid.insert(pdu.event_id.as_bytes(), pdu_id)?;
self.eventid_outlierpdu.remove(pdu.event_id.as_bytes())?;
Ok(())
diff --git a/src/database/key_value/rooms/user.rs b/src/database/key_value/rooms/user.rs
index e678c878b8693e55c0d99fb9a5e0f3db739bf2fb..3d8d1c85e28b891281d7fe734628052b5afbc8e0 100644
--- a/src/database/key_value/rooms/user.rs
+++ b/src/database/key_value/rooms/user.rs
@@ -114,7 +114,7 @@ fn get_shared_rooms<'a>(
utils::common_elements(iterators, Ord::cmp)
.expect("users is not empty")
.map(|bytes| {
- RoomId::parse(utils::string_from_bytes(&*bytes).map_err(|_| {
+ RoomId::parse(utils::string_from_bytes(&bytes).map_err(|_| {
Error::bad_database("Invalid RoomId bytes in userroomid_joined")
})?)
.map_err(|_| Error::bad_database("Invalid RoomId in userroomid_joined."))
diff --git a/src/database/key_value/sending.rs b/src/database/key_value/sending.rs
index fddbd67d9c1958f05783168f301b258a83a8c7ab..5424e8c5d76713ecbe668247795549809c352914 100644
--- a/src/database/key_value/sending.rs
+++ b/src/database/key_value/sending.rs
@@ -38,7 +38,7 @@ fn delete_active_request(&self, key: Vec<u8>) -> Result<()> {
fn delete_all_active_requests_for(&self, outgoing_kind: &OutgoingKind) -> Result<()> {
let prefix = outgoing_kind.get_prefix();
- for (key, _) in self.servercurrentevent_data.scan_prefix(prefix.clone()) {
+ for (key, _) in self.servercurrentevent_data.scan_prefix(prefix) {
self.servercurrentevent_data.remove(&key)?;
}
@@ -51,7 +51,7 @@ fn delete_all_requests_for(&self, outgoing_kind: &OutgoingKind) -> Result<()> {
self.servercurrentevent_data.remove(&key).unwrap();
}
- for (key, _) in self.servernameevent_data.scan_prefix(prefix.clone()) {
+ for (key, _) in self.servernameevent_data.scan_prefix(prefix) {
self.servernameevent_data.remove(&key).unwrap();
}
@@ -67,7 +67,7 @@ fn queue_requests(
for (outgoing_kind, event) in requests {
let mut key = outgoing_kind.get_prefix();
key.extend_from_slice(if let SendingEventType::Pdu(value) = &event {
- &**value
+ value
} else {
&[]
});
@@ -91,7 +91,7 @@ fn queued_requests<'a>(
let prefix = outgoing_kind.get_prefix();
return Box::new(
self.servernameevent_data
- .scan_prefix(prefix.clone())
+ .scan_prefix(prefix)
.map(|(k, v)| parse_servercurrentevent(&k, v).map(|(_, ev)| (ev, k))),
);
}
@@ -155,7 +155,7 @@ fn parse_servercurrentevent(
let mut parts = key[1..].splitn(3, |&b| b == 0xff);
let user = parts.next().expect("splitn always returns one element");
- let user_string = utils::string_from_bytes(&user)
+ let user_string = utils::string_from_bytes(user)
.map_err(|_| Error::bad_database("Invalid user string in servercurrentevent"))?;
let user_id = UserId::parse(user_string)
.map_err(|_| Error::bad_database("Invalid user id in servercurrentevent"))?;
diff --git a/src/database/key_value/users.rs b/src/database/key_value/users.rs
index f7ee07cfbd19c984e3e0ffedd82193504acf3a95..cd5a535265ed15bc77fbc7bd0c743c598866b209 100644
--- a/src/database/key_value/users.rs
+++ b/src/database/key_value/users.rs
@@ -5,10 +5,9 @@
encryption::{CrossSigningKey, DeviceKeys, OneTimeKey},
events::{AnyToDeviceEvent, StateEventType},
serde::Raw,
- DeviceId, DeviceKeyAlgorithm, DeviceKeyId, MilliSecondsSinceUnixEpoch, OwnedUserId, UInt,
- UserId,
+ DeviceId, DeviceKeyAlgorithm, DeviceKeyId, MilliSecondsSinceUnixEpoch, OwnedDeviceId,
+ OwnedDeviceKeyId, OwnedMxcUri, OwnedUserId, UInt, UserId,
};
-use ruma::{OwnedDeviceId, OwnedDeviceKeyId, OwnedMxcUri};
use tracing::warn;
use crate::{
@@ -380,13 +379,12 @@ fn take_one_time_key(
Ok((
serde_json::from_slice(
- &*key
- .rsplit(|&b| b == 0xff)
+ key.rsplit(|&b| b == 0xff)
.next()
.ok_or_else(|| Error::bad_database("OneTimeKeyId in db is invalid."))?,
)
.map_err(|_| Error::bad_database("OneTimeKeyId in db is invalid."))?,
- serde_json::from_slice(&*value)
+ serde_json::from_slice(&value)
.map_err(|_| Error::bad_database("OneTimeKeys in db are invalid."))?,
))
})
@@ -410,7 +408,7 @@ fn count_one_time_keys(
.map(|(bytes, _)| {
Ok::<_, Error>(
serde_json::from_slice::<OwnedDeviceKeyId>(
- &*bytes.rsplit(|&b| b == 0xff).next().ok_or_else(|| {
+ bytes.rsplit(|&b| b == 0xff).next().ok_or_else(|| {
Error::bad_database("OneTimeKey ID in db is invalid.")
})?,
)
diff --git a/src/database/mod.rs b/src/database/mod.rs
index 9f893d6f9336bb8b7712accf7c7b865bea4cfec9..15ee1373c36889aad80569658519bbd8d4ebcd51 100644
--- a/src/database/mod.rs
+++ b/src/database/mod.rs
@@ -2,22 +2,17 @@
pub mod key_value;
use crate::{services, utils, Config, Error, PduEvent, Result, Services, SERVICES};
-use abstraction::KeyValueDatabaseEngine;
-use abstraction::KvTree;
+use abstraction::{KeyValueDatabaseEngine, KvTree};
use directories::ProjectDirs;
use lru_cache::LruCache;
-use ruma::CanonicalJsonValue;
-use ruma::OwnedDeviceId;
-use ruma::OwnedEventId;
-use ruma::OwnedRoomId;
-use ruma::OwnedUserId;
use ruma::{
events::{
push_rules::PushRulesEventContent, room::message::RoomMessageEventContent,
GlobalAccountDataEvent, GlobalAccountDataEventType, StateEventType,
},
push::Ruleset,
- EventId, RoomId, UserId,
+ CanonicalJsonValue, EventId, OwnedDeviceId, OwnedEventId, OwnedRoomId, OwnedUserId, RoomId,
+ UserId,
};
use std::{
collections::{BTreeMap, HashMap, HashSet},
diff --git a/src/lib.rs b/src/lib.rs
index 541b8c8d4142ce97949db9d407b0b40c8ae895d7..3d7f7ae990830a1569b42444410f3d93f0274766 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -24,7 +24,7 @@
pub static SERVICES: RwLock<Option<&'static Services>> = RwLock::new(None);
pub fn services<'a>() -> &'static Services {
- &SERVICES
+ SERVICES
.read()
.unwrap()
.expect("SERVICES should be initialized when this is called")
diff --git a/src/main.rs b/src/main.rs
index 0bba2aba3110a9aced0b050c33e401c14ae8df9f..bdbeaa6abdfffd23a5636d16a5744dcfc8755d26 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -444,7 +444,7 @@ fn add_to_router(self, mut router: Router) -> Router {
impl_ruma_handler!(T1, T2, T3, T4, T5, T6, T7, T8);
fn method_to_filter(method: Method) -> MethodFilter {
- let method_filter = match method {
+ match method {
Method::DELETE => MethodFilter::DELETE,
Method::GET => MethodFilter::GET,
Method::HEAD => MethodFilter::HEAD,
@@ -454,6 +454,5 @@ fn method_to_filter(method: Method) -> MethodFilter {
Method::PUT => MethodFilter::PUT,
Method::TRACE => MethodFilter::TRACE,
m => panic!("Unsupported HTTP method: {:?}", m),
- };
- method_filter
+ }
}
diff --git a/src/service/admin/mod.rs b/src/service/admin/mod.rs
index 9e3f586a17f558bbbe42f961593d3e2931b06674..b14ce2b1f74bad823c54bc639470a69367fb07bd 100644
--- a/src/service/admin/mod.rs
+++ b/src/service/admin/mod.rs
@@ -179,7 +179,7 @@ pub fn build() -> Arc<Self> {
}
pub fn start_handler(self: &Arc<Self>) {
- let self2 = Arc::clone(&self);
+ let self2 = Arc::clone(self);
tokio::spawn(async move {
self2.handler().await;
});
@@ -270,13 +270,11 @@ async fn process_admin_message(&self, room_message: String) -> RoomMessageEventC
let command_line = lines.next().expect("each string has at least one line");
let body: Vec<_> = lines.collect();
- let admin_command = match self.parse_admin_command(&command_line) {
+ let admin_command = match self.parse_admin_command(command_line) {
Ok(command) => command,
Err(error) => {
let server_name = services().globals.server_name();
- let message = error
- .to_string()
- .replace("server.name", server_name.as_str());
+ let message = error.replace("server.name", server_name.as_str());
let html_message = self.usage_to_html(&message, server_name);
return RoomMessageEventContent::text_html(message, html_message);
@@ -316,8 +314,8 @@ fn parse_admin_command(&self, command_line: &str) -> std::result::Result<AdminCo
// Backwards compatibility with `register_appservice`-style commands
let command_with_dashes;
- if argv.len() > 1 && argv[1].contains("_") {
- command_with_dashes = argv[1].replace("_", "-");
+ if argv.len() > 1 && argv[1].contains('_') {
+ command_with_dashes = argv[1].replace('_', "-");
argv[1] = &command_with_dashes;
}
@@ -631,7 +629,7 @@ async fn process_admin_command(
let displayname = format!("{} âš¡ï¸", user_id.localpart());
services()
.users
- .set_displayname(&user_id, Some(displayname.clone()))?;
+ .set_displayname(&user_id, Some(displayname))?;
// Initial account data
services().account_data.update(
@@ -771,7 +769,7 @@ fn usage_to_html(&self, text: &str, server_name: &ServerName) -> String {
let text = text.replace("subcommand", "command");
// Escape option names (e.g. `<element-id>`) since they look like HTML tags
- let text = text.replace("<", "<").replace(">", ">");
+ let text = text.replace('<', "<").replace('>', ">");
// Italicize the first line (command name and version text)
let re = Regex::new("^(.*?)\n").expect("Regex compilation should not fail");
@@ -799,7 +797,7 @@ fn usage_to_html(&self, text: &str, server_name: &ServerName) -> String {
while text_lines
.get(line_index)
- .map(|line| line.starts_with("#"))
+ .map(|line| line.starts_with('#'))
.unwrap_or(false)
{
command_body += if text_lines[line_index].starts_with("# ") {
@@ -830,12 +828,10 @@ fn usage_to_html(&self, text: &str, server_name: &ServerName) -> String {
};
// Add HTML line-breaks
- let text = text
- .replace("\n\n\n", "\n\n")
- .replace("\n", "<br>\n")
- .replace("[nobr]<br>", "");
- text
+ text.replace("\n\n\n", "\n\n")
+ .replace('\n', "<br>\n")
+ .replace("[nobr]<br>", "")
}
/// Create the admin room.
@@ -1110,7 +1106,7 @@ pub(crate) async fn make_user_admin(
state_key: Some(user_id.to_string()),
redacts: None,
},
- &user_id,
+ user_id,
&room_id,
&state_lock,
)?;
@@ -1142,8 +1138,8 @@ pub(crate) async fn make_user_admin(
PduBuilder {
event_type: RoomEventType::RoomMessage,
content: to_raw_value(&RoomMessageEventContent::text_html(
- format!("## Thank you for trying out Conduit!\n\nConduit is currently in Beta. This means you can join and participate in most Matrix rooms, but not all features are supported and you might run into bugs from time to time.\n\nHelpful links:\n> Website: https://conduit.rs\n> Git and Documentation: https://gitlab.com/famedly/conduit\n> Report issues: https://gitlab.com/famedly/conduit/-/issues\n\nFor a list of available commands, send the following message in this room: `@conduit:{}: --help`\n\nHere are some rooms you can join (by typing the command):\n\nConduit room (Ask questions and get notified on updates):\n`/join #conduit:fachschaften.org`\n\nConduit lounge (Off-topic, only Conduit users are allowed to join)\n`/join #conduit-lounge:conduit.rs`", services().globals.server_name()).to_owned(),
- format!("<h2>Thank you for trying out Conduit!</h2>\n<p>Conduit is currently in Beta. This means you can join and participate in most Matrix rooms, but not all features are supported and you might run into bugs from time to time.</p>\n<p>Helpful links:</p>\n<blockquote>\n<p>Website: https://conduit.rs<br>Git and Documentation: https://gitlab.com/famedly/conduit<br>Report issues: https://gitlab.com/famedly/conduit/-/issues</p>\n</blockquote>\n<p>For a list of available commands, send the following message in this room: <code>@conduit:{}: --help</code></p>\n<p>Here are some rooms you can join (by typing the command):</p>\n<p>Conduit room (Ask questions and get notified on updates):<br><code>/join #conduit:fachschaften.org</code></p>\n<p>Conduit lounge (Off-topic, only Conduit users are allowed to join)<br><code>/join #conduit-lounge:conduit.rs</code></p>\n", services().globals.server_name()).to_owned(),
+ format!("## Thank you for trying out Conduit!\n\nConduit is currently in Beta. This means you can join and participate in most Matrix rooms, but not all features are supported and you might run into bugs from time to time.\n\nHelpful links:\n> Website: https://conduit.rs\n> Git and Documentation: https://gitlab.com/famedly/conduit\n> Report issues: https://gitlab.com/famedly/conduit/-/issues\n\nFor a list of available commands, send the following message in this room: `@conduit:{}: --help`\n\nHere are some rooms you can join (by typing the command):\n\nConduit room (Ask questions and get notified on updates):\n`/join #conduit:fachschaften.org`\n\nConduit lounge (Off-topic, only Conduit users are allowed to join)\n`/join #conduit-lounge:conduit.rs`", services().globals.server_name()),
+ format!("<h2>Thank you for trying out Conduit!</h2>\n<p>Conduit is currently in Beta. This means you can join and participate in most Matrix rooms, but not all features are supported and you might run into bugs from time to time.</p>\n<p>Helpful links:</p>\n<blockquote>\n<p>Website: https://conduit.rs<br>Git and Documentation: https://gitlab.com/famedly/conduit<br>Report issues: https://gitlab.com/famedly/conduit/-/issues</p>\n</blockquote>\n<p>For a list of available commands, send the following message in this room: <code>@conduit:{}: --help</code></p>\n<p>Here are some rooms you can join (by typing the command):</p>\n<p>Conduit room (Ask questions and get notified on updates):<br><code>/join #conduit:fachschaften.org</code></p>\n<p>Conduit lounge (Off-topic, only Conduit users are allowed to join)<br><code>/join #conduit-lounge:conduit.rs</code></p>\n", services().globals.server_name()),
))
.expect("event is valid, we just created it"),
unsigned: None,
diff --git a/src/service/pusher/mod.rs b/src/service/pusher/mod.rs
index 2d2fa1f9d5690e6125c1b80b5c10a36b06b2da8b..8f8610c2e315ce4cf3f7a7729e901e8a55c4883d 100644
--- a/src/service/pusher/mod.rs
+++ b/src/service/pusher/mod.rs
@@ -4,7 +4,6 @@
use crate::{services, Error, PduEvent, Result};
use bytes::BytesMut;
-use ruma::api::IncomingResponse;
use ruma::{
api::{
client::push::{get_pushers, set_pusher, PusherKind},
@@ -12,7 +11,7 @@
self,
v1::{Device, Notification, NotificationCounts, NotificationPriority},
},
- MatrixVersion, OutgoingRequest, SendAccessToken,
+ IncomingResponse, MatrixVersion, OutgoingRequest, SendAccessToken,
},
events::{
room::{name::RoomNameEventContent, power_levels::RoomPowerLevelsEventContent},
diff --git a/src/service/rooms/event_handler/mod.rs b/src/service/rooms/event_handler/mod.rs
index ae63d9a14ef18a27b877c27039295c1008f782f4..cd270c7cbe887f7a9e0c310b043638fc4745738d 100644
--- a/src/service/rooms/event_handler/mod.rs
+++ b/src/service/rooms/event_handler/mod.rs
@@ -284,7 +284,7 @@ fn handle_outlier_pdu<'a>(
RoomVersion::new(room_version_id).expect("room version is supported");
let mut val = match ruma::signatures::verify_event(
- &*pub_key_map.read().expect("RwLock is poisoned."),
+ &pub_key_map.read().expect("RwLock is poisoned."),
&value,
room_version_id,
) {
@@ -1198,7 +1198,7 @@ async fn fetch_unknown_prev_events(
.fetch_and_handle_outliers(
origin,
&[prev_event_id.clone()],
- &create_event,
+ create_event,
room_id,
pub_key_map,
)
@@ -1224,7 +1224,7 @@ async fn fetch_unknown_prev_events(
amount += 1;
for prev_prev in &pdu.prev_events {
if !graph.contains_key(prev_prev) {
- todo_outlier_stack.push(dbg!(prev_prev.clone()));
+ todo_outlier_stack.push(prev_prev.clone());
}
}
@@ -1248,7 +1248,7 @@ async fn fetch_unknown_prev_events(
}
}
- let sorted = state_res::lexicographical_topological_sort(dbg!(&graph), |event_id| {
+ let sorted = state_res::lexicographical_topological_sort(&graph, |event_id| {
// This return value is the key used for sorting events,
// events are then sorted by power level, time,
// and lexically by event_id.
@@ -1482,8 +1482,8 @@ pub(crate) async fn fetch_join_signing_keys(
}
let mut futures: FuturesUnordered<_> = servers
- .into_iter()
- .map(|(server, _)| async move {
+ .into_keys()
+ .map(|server| async move {
(
services()
.sending
diff --git a/src/service/rooms/state/data.rs b/src/service/rooms/state/data.rs
index 19a1e30abd24f5c6145e8a39b71aadc9ade9e7b6..f52ea72bea049c485535eac436531f67a90298f0 100644
--- a/src/service/rooms/state/data.rs
+++ b/src/service/rooms/state/data.rs
@@ -1,7 +1,6 @@
use crate::Result;
use ruma::{EventId, OwnedEventId, RoomId};
-use std::collections::HashSet;
-use std::sync::Arc;
+use std::{collections::HashSet, sync::Arc};
use tokio::sync::MutexGuard;
pub trait Data: Send + Sync {
diff --git a/src/service/rooms/state/mod.rs b/src/service/rooms/state/mod.rs
index 2c49c35a23097425b36eb621e56070d613ffb41e..0e4503229ab8606ef9bb8d87780a765213f46adb 100644
--- a/src/service/rooms/state/mod.rs
+++ b/src/service/rooms/state/mod.rs
@@ -93,7 +93,7 @@ struct ExtractMembership {
services().rooms.state_cache.update_joined_count(room_id)?;
self.db
- .set_room_state(room_id, shortstatehash, &state_lock)?;
+ .set_room_state(room_id, shortstatehash, state_lock)?;
Ok(())
}
@@ -331,7 +331,7 @@ pub fn get_room_version(&self, room_id: &RoomId) -> Result<RoomVersionId> {
.transpose()?;
let room_version = create_event_content
.map(|create_event| create_event.room_version)
- .ok_or_else(|| Error::BadDatabase("Invalid room version"))?;
+ .ok_or(Error::BadDatabase("Invalid room version"))?;
Ok(room_version)
}
diff --git a/src/service/rooms/timeline/mod.rs b/src/service/rooms/timeline/mod.rs
index dc859d8f996cabd9141944bb11d9c6463048139f..619dca28fa61499b161262999d9f39ebd5553158 100644
--- a/src/service/rooms/timeline/mod.rs
+++ b/src/service/rooms/timeline/mod.rs
@@ -2,29 +2,29 @@
use std::collections::HashMap;
-use std::collections::HashSet;
-use std::sync::{Arc, Mutex};
+use std::{
+ collections::HashSet,
+ sync::{Arc, Mutex},
+};
pub use data::Data;
use regex::Regex;
-use ruma::canonical_json::to_canonical_value;
-use ruma::events::room::power_levels::RoomPowerLevelsEventContent;
-use ruma::push::Ruleset;
-use ruma::state_res::RoomVersion;
-use ruma::CanonicalJsonObject;
-use ruma::CanonicalJsonValue;
-use ruma::OwnedEventId;
-use ruma::OwnedRoomId;
-use ruma::OwnedServerName;
use ruma::{
api::client::error::ErrorKind,
+ canonical_json::to_canonical_value,
events::{
push_rules::PushRulesEvent,
- room::{create::RoomCreateEventContent, member::MembershipState},
+ room::{
+ create::RoomCreateEventContent, member::MembershipState,
+ power_levels::RoomPowerLevelsEventContent,
+ },
GlobalAccountDataEventType, RoomEventType, StateEventType,
},
- push::{Action, Tweak},
- state_res, uint, EventId, RoomAliasId, RoomId, UserId,
+ push::{Action, Ruleset, Tweak},
+ state_res,
+ state_res::RoomVersion,
+ uint, CanonicalJsonObject, CanonicalJsonValue, EventId, OwnedEventId, OwnedRoomId,
+ OwnedServerName, RoomAliasId, RoomId, UserId,
};
use serde::Deserialize;
use serde_json::value::to_raw_value;
@@ -267,7 +267,7 @@ pub fn append_pdu<'a>(
.account_data
.get(
None,
- &user,
+ user,
GlobalAccountDataEventType::PushRules.to_string().into(),
)?
.map(|event| {
@@ -276,13 +276,13 @@ pub fn append_pdu<'a>(
})
.transpose()?
.map(|ev: PushRulesEvent| ev.content.global)
- .unwrap_or_else(|| Ruleset::server_default(&user));
+ .unwrap_or_else(|| Ruleset::server_default(user));
let mut highlight = false;
let mut notify = false;
for action in services().pusher.get_actions(
- &user,
+ user,
&rules_for_user,
&power_levels,
&sync_pdu,
@@ -307,10 +307,8 @@ pub fn append_pdu<'a>(
highlights.push(user.clone());
}
- for push_key in services().pusher.get_pushkeys(&user) {
- services()
- .sending
- .send_push_pdu(&*pdu_id, &user, push_key?)?;
+ for push_key in services().pusher.get_pushkeys(user) {
+ services().sending.send_push_pdu(&pdu_id, user, push_key?)?;
}
}
@@ -388,7 +386,7 @@ struct ExtractBody {
&& services().globals.emergency_password().is_none();
if to_conduit && !from_conduit && admin_room.as_ref() == Some(&pdu.room_id) {
- services().admin.process_message(body.to_string());
+ services().admin.process_message(body);
}
}
}
@@ -583,8 +581,8 @@ pub fn create_hash_and_sign_event(
prev_events,
depth,
auth_events: auth_events
- .iter()
- .map(|(_, pdu)| pdu.event_id.clone())
+ .values()
+ .map(|pdu| pdu.event_id.clone())
.collect(),
redacts,
unsigned: if unsigned.is_empty() {
@@ -683,7 +681,7 @@ pub fn build_and_append_pdu(
state_lock: &MutexGuard<'_, ()>, // Take mutex guard to make sure users get the room state mutex
) -> Result<Arc<EventId>> {
let (pdu, pdu_json) =
- self.create_hash_and_sign_event(pdu_builder, sender, room_id, &state_lock)?;
+ self.create_hash_and_sign_event(pdu_builder, sender, room_id, state_lock)?;
// We append to state before appending the pdu, so we don't have a moment in time with the
// pdu without it's state. This is okay because append_pdu can't fail.
diff --git a/src/service/sending/mod.rs b/src/service/sending/mod.rs
index 20c652f583d770c513ffd79d7c0fa0fd73a4149a..adaf7c0ceac0d955acae13dbcbb71244bd1a8b1c 100644
--- a/src/service/sending/mod.rs
+++ b/src/service/sending/mod.rs
@@ -110,7 +110,7 @@ pub fn build(db: &'static dyn Data, config: &Config) -> Arc<Self> {
}
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 @@ pub fn select_edus(&self, server_name: &ServerName) -> Result<(Vec<Vec<u8>>, u64
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 @@ async fn handle_events(
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 @@ async fn handle_events(
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 @@ async fn handle_events(
.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 @@ async fn handle_events(
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 @@ async fn handle_events(
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,