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

use string::EMPTY; minor formatting and misc cleanups

Browse source 
Signed-off-by: Jason Volk <jason@zemos.net>
This commit is contained in:
Jason Volk 2024-10-13 00:57:08 +00:00 • committed by strawberry
parent 89b5c4ee1c
commit 1a09eb0f02
2 changed files with 15 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/admin/debug/commands.rs
View file

@ -6,7 +6,7 @@ use std::{
}; };
use api::client::validate_and_add_event_id; use api::client::validate_and_add_event_id;
use conduit::{debug, debug_error, err, info, trace, utils, warn, Error, PduEvent, Result}; use conduit::{debug, debug_error, err, info, trace, utils, utils::string::EMPTY, warn, Error, PduEvent, Result};
use futures::StreamExt; use futures::StreamExt;
use ruma::{ use ruma::{
api::{client::error::ErrorKind, federation::event::get_room_state}, api::{client::error::ErrorKind, federation::event::get_room_state},
@ -57,7 +57,9 @@ pub(super) async fn get_auth_chain(&self, event_id: Box<EventId>) -> Result<Room
#[admin_command] #[admin_command]
pub(super) async fn parse_pdu(&self) -> Result<RoomMessageEventContent> { pub(super) async fn parse_pdu(&self) -> Result<RoomMessageEventContent> {
if self.body.len() < 2 || !self.body[0].trim().starts_with("```") || self.body.last().unwrap_or(&"").trim() != "```" if self.body.len() < 2
|| !self.body[0].trim().starts_with("```")
|| self.body.last().unwrap_or(&EMPTY).trim() != "```"
{ {
return Ok(RoomMessageEventContent::text_plain( return Ok(RoomMessageEventContent::text_plain(
"Expected code block in command body. Add --help for details.", "Expected code block in command body. Add --help for details.",
@ -134,7 +136,9 @@ pub(super) async fn get_remote_pdu_list(
)); ));
} }
if self.body.len() < 2 || !self.body[0].trim().starts_with("```") || self.body.last().unwrap_or(&"").trim() != "```" if self.body.len() < 2
|| !self.body[0].trim().starts_with("```")
|| self.body.last().unwrap_or(&EMPTY).trim() != "```"
{ {
return Ok(RoomMessageEventContent::text_plain( return Ok(RoomMessageEventContent::text_plain(
"Expected code block in command body. Add --help for details.", "Expected code block in command body. Add --help for details.",
@ -843,7 +847,7 @@ pub(super) async fn database_stats(
&self, property: Option<String>, map: Option<String>, &self, property: Option<String>, map: Option<String>,
) -> Result<RoomMessageEventContent> { ) -> Result<RoomMessageEventContent> {
let property = property.unwrap_or_else(|| "rocksdb.stats".to_owned()); let property = property.unwrap_or_else(|| "rocksdb.stats".to_owned());
let map_name = map.as_ref().map_or(utils::string::EMPTY, String::as_str); let map_name = map.as_ref().map_or(EMPTY, String::as_str);
let mut out = String::new(); let mut out = String::new();
for (name, map) in self.services.db.iter_maps() { for (name, map) in self.services.db.iter_maps() {

11
src/api/client/membership.rs
View file

@ -658,13 +658,16 @@ pub async fn join_room_by_id_helper(
}); });
} }
if services let server_in_room = services
.rooms .rooms
.state_cache .state_cache
.server_in_room(services.globals.server_name(), room_id) .server_in_room(services.globals.server_name(), room_id)
.await || servers.is_empty() .await;
|| (servers.len() == 1 && services.globals.server_is_ours(&servers[0]))
{ let local_join =
server_in_room || servers.is_empty() || (servers.len() == 1 && services.globals.server_is_ours(&servers[0]));
if local_join {
join_room_by_id_helper_local(services, sender_user, room_id, reason, servers, third_party_signed, state_lock) join_room_by_id_helper_local(services, sender_user, room_id, reason, servers, third_party_signed, state_lock)
.boxed() .boxed()
.await .await