Mirrors/continuwuity
1
0
Fork 0
mirror of https://forgejo.ellis.link/continuwuation/continuwuity.git synced 2026-05-26 20:49:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: Fix errors in admin/query/

Browse Source
This commit is contained in:
Ginger
2026-04-28 09:16:56 -04:00
parent 9d39321deb
commit 54fefb421b
4 changed files with 3 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/admin/query/resolver.rs
+2 -2
View File
@@ -50,7 +50,7 @@ async fn destinations_cache(&self, server_name: Option<OwnedServerName>) -> Resu
while let Some((name, CachedDest { dest, host, expire })) = destinations.next().await { while let Some((name, CachedDest { dest, host, expire })) = destinations.next().await {
if let Some(server_name) = server_name.as_ref() { if let Some(server_name) = server_name.as_ref() {
if name != server_name { if name != *server_name {
continue; continue;
} }
} }
@@ -76,7 +76,7 @@ async fn overrides_cache(&self, server_name: Option<String>) -> Result {
overrides.next().await overrides.next().await
{ {
if let Some(server_name) = server_name.as_ref() { if let Some(server_name) = server_name.as_ref() {
if name != server_name { if name != *server_name {
continue; continue;
} }
} }
src/admin/query/room_alias.rs
-1
View File
@@ -41,7 +41,6 @@ pub(super) async fn process(subcommand: RoomAliasCommand, context: &Context<'_>)
.rooms .rooms
.alias .alias
.local_aliases_for_room(&room_id) .local_aliases_for_room(&room_id)
.map(ToOwned::to_owned)
.collect() .collect()
.await; .await;
let query_time = timer.elapsed(); let query_time = timer.elapsed();
src/admin/query/room_state_cache.rs
-8
View File
@@ -101,7 +101,6 @@ pub(super) async fn process(subcommand: RoomStateCacheCommand, context: &Context
.rooms .rooms
.state_cache .state_cache
.room_servers(&room_id) .room_servers(&room_id)
.map(ToOwned::to_owned)
.collect() .collect()
.await; .await;
let query_time = timer.elapsed(); let query_time = timer.elapsed();
@@ -118,7 +117,6 @@ pub(super) async fn process(subcommand: RoomStateCacheCommand, context: &Context
.rooms .rooms
.state_cache .state_cache
.server_rooms(&server) .server_rooms(&server)
.map(ToOwned::to_owned)
.collect() .collect()
.await; .await;
let query_time = timer.elapsed(); let query_time = timer.elapsed();
@@ -135,7 +133,6 @@ pub(super) async fn process(subcommand: RoomStateCacheCommand, context: &Context
.rooms .rooms
.state_cache .state_cache
.room_members(&room_id) .room_members(&room_id)
.map(ToOwned::to_owned)
.collect() .collect()
.await; .await;
let query_time = timer.elapsed(); let query_time = timer.elapsed();
@@ -152,7 +149,6 @@ pub(super) async fn process(subcommand: RoomStateCacheCommand, context: &Context
.rooms .rooms
.state_cache .state_cache
.local_users_in_room(&room_id) .local_users_in_room(&room_id)
.map(ToOwned::to_owned)
.collect() .collect()
.await; .await;
let query_time = timer.elapsed(); let query_time = timer.elapsed();
@@ -169,7 +165,6 @@ pub(super) async fn process(subcommand: RoomStateCacheCommand, context: &Context
.rooms .rooms
.state_cache .state_cache
.active_local_users_in_room(&room_id) .active_local_users_in_room(&room_id)
.map(ToOwned::to_owned)
.collect() .collect()
.await; .await;
let query_time = timer.elapsed(); let query_time = timer.elapsed();
@@ -212,7 +207,6 @@ pub(super) async fn process(subcommand: RoomStateCacheCommand, context: &Context
.rooms .rooms
.state_cache .state_cache
.room_useroncejoined(&room_id) .room_useroncejoined(&room_id)
.map(ToOwned::to_owned)
.collect() .collect()
.await; .await;
let query_time = timer.elapsed(); let query_time = timer.elapsed();
@@ -229,7 +223,6 @@ pub(super) async fn process(subcommand: RoomStateCacheCommand, context: &Context
.rooms .rooms
.state_cache .state_cache
.room_members_invited(&room_id) .room_members_invited(&room_id)
.map(ToOwned::to_owned)
.collect() .collect()
.await; .await;
let query_time = timer.elapsed(); let query_time = timer.elapsed();
@@ -276,7 +269,6 @@ pub(super) async fn process(subcommand: RoomStateCacheCommand, context: &Context
.rooms .rooms
.state_cache .state_cache
.rooms_joined(&user_id) .rooms_joined(&user_id)
.map(ToOwned::to_owned)
.collect() .collect()
.await; .await;
let query_time = timer.elapsed(); let query_time = timer.elapsed();
src/admin/query/users.rs
+1 -4
View File
@@ -104,7 +104,6 @@ async fn get_shared_rooms(&self, user_a: OwnedUserId, user_b: OwnedUserId) -> Re
.rooms .rooms
.state_cache .state_cache
.get_shared_rooms(&user_a, &user_b) .get_shared_rooms(&user_a, &user_b)
.map(ToOwned::to_owned)
.collect() .collect()
.await; .await;
let query_time = timer.elapsed(); let query_time = timer.elapsed();
@@ -217,8 +216,7 @@ async fn iter_users2(&self) -> Result {
let result: Vec<_> = self.services.users.stream().collect().await; let result: Vec<_> = self.services.users.stream().collect().await;
let result: Vec<_> = result let result: Vec<_> = result
.into_iter() .into_iter()
.map(ruma::UserId::as_bytes) .map(|user_id| String::from_utf8_lossy(user_id.as_bytes()).into_owned())
.map(String::from_utf8_lossy)
.collect(); .collect();
let query_time = timer.elapsed(); let query_time = timer.elapsed();
@@ -254,7 +252,6 @@ async fn list_devices(&self, user_id: OwnedUserId) -> Result {
.services .services
.users .users
.all_device_ids(&user_id) .all_device_ids(&user_id)
.map(ToOwned::to_owned)
.collect::<Vec<_>>() .collect::<Vec<_>>()
.await; .await;