1
0
Fork 0
forked from mirror/grapevine

enable error_on_line_overflow and fix errors

These required some manual intervention.
This commit is contained in:
Charles Hall 2024-05-16 01:42:48 -07:00
parent 0afc1d2f50
commit 5cb2551422
No known key found for this signature in database
GPG key ID: 7B8E0645816E07CF
6 changed files with 75 additions and 60 deletions

View file

@ -1,6 +1,7 @@
edition = "2021" edition = "2021"
condense_wildcard_suffixes = true condense_wildcard_suffixes = true
error_on_line_overflow = true
format_code_in_doc_comments = true format_code_in_doc_comments = true
format_macro_bodies = true format_macro_bodies = true
format_macro_matchers = true format_macro_matchers = true

View file

@ -35,13 +35,16 @@ pub(crate) async fn report_event_route(
)); ));
}; };
services() services().admin.send_message(message::RoomMessageEventContent::text_html(
.admin
.send_message(message::RoomMessageEventContent::text_html(
format!( format!(
"Report received from: {}\n\nEvent ID: {:?}\nRoom ID: {:?}\nSent \ "Report received from: {}\n\nEvent ID: {:?}\nRoom ID: {:?}\nSent \
By: {:?}\n\nReport Score: {:?}\nReport Reason: {:?}", By: {:?}\n\nReport Score: {:?}\nReport Reason: {:?}",
sender_user, pdu.event_id, pdu.room_id, pdu.sender, body.score, body.reason sender_user,
pdu.event_id,
pdu.room_id,
pdu.sender,
body.score,
body.reason
), ),
format!( format!(
r#" r#"

View file

@ -15,8 +15,10 @@ use super::{watchers::Watchers, KeyValueDatabaseEngine, KvTree};
use crate::{database::Config, Result}; use crate::{database::Config, Result};
thread_local! { thread_local! {
static READ_CONNECTION: RefCell<Option<&'static Connection>> = RefCell::new(None); static READ_CONNECTION: RefCell<Option<&'static Connection>> =
static READ_CONNECTION_ITERATOR: RefCell<Option<&'static Connection>> = RefCell::new(None); RefCell::new(None);
static READ_CONNECTION_ITERATOR: RefCell<Option<&'static Connection>> =
RefCell::new(None);
} }
struct PreparedStatementIterator<'a> { struct PreparedStatementIterator<'a> {

View file

@ -595,9 +595,15 @@ macro_rules! impl_ruma_handler {
for path in meta.history.all_paths() { for path in meta.history.all_paths() {
let handler = self.clone(); let handler = self.clone();
router = router.route(path, on(method_filter, |$( $ty: $ty, )* req| async move { router = router.route(
path,
on(
method_filter,
|$( $ty: $ty, )* req| async move {
handler($($ty,)* req).await.map(RumaResponse) handler($($ty,)* req).await.map(RumaResponse)
})) }
)
)
} }
router router

View file

@ -243,7 +243,9 @@ impl Service {
Some(event) = receiver.recv() => { Some(event) = receiver.recv() => {
let message_content = match event { let message_content = match event {
AdminRoomEvent::SendMessage(content) => content, AdminRoomEvent::SendMessage(content) => content,
AdminRoomEvent::ProcessMessage(room_message) => self.process_admin_message(room_message).await AdminRoomEvent::ProcessMessage(room_message) => {
self.process_admin_message(room_message).await
}
}; };
let mutex_state = Arc::clone( let mutex_state = Arc::clone(

View file

@ -21,6 +21,8 @@ pub(crate) struct Service {
pub(crate) db: &'static dyn Data, pub(crate) db: &'static dyn Data,
} }
type RoomsLeft = (OwnedRoomId, Vec<Raw<AnySyncStateEvent>>);
impl Service { impl Service {
/// Update current membership data. /// Update current membership data.
#[tracing::instrument(skip(self, last_state))] #[tracing::instrument(skip(self, last_state))]
@ -390,8 +392,7 @@ impl Service {
pub(crate) fn rooms_left<'a>( pub(crate) fn rooms_left<'a>(
&'a self, &'a self,
user_id: &UserId, user_id: &UserId,
) -> impl Iterator<Item = Result<(OwnedRoomId, Vec<Raw<AnySyncStateEvent>>)>> + 'a ) -> impl Iterator<Item = Result<RoomsLeft>> + 'a {
{
self.db.rooms_left(user_id) self.db.rooms_left(user_id)
} }