@@ -105,7 +105,7 @@ pub(crate) async fn get_context_route(
|
|||||||
.collect();
|
.collect();
|
||||||
|
|
||||||
let (base_event, events_before, events_after): (_, Vec<_>, Vec<_>) =
|
let (base_event, events_before, events_after): (_, Vec<_>, Vec<_>) =
|
||||||
join3(base_event, events_before, events_after).await;
|
join3(base_event, events_before, events_after).boxed().await;
|
||||||
|
|
||||||
let lazy_loading_context = lazy_loading::Context {
|
let lazy_loading_context = lazy_loading::Context {
|
||||||
user_id: sender_user,
|
user_id: sender_user,
|
||||||
|
|||||||
@@ -86,7 +86,7 @@ pub(super) fn bad_request_code(kind: &ErrorKind) -> StatusCode {
|
|||||||
|
|
||||||
pub(super) fn ruma_error_message(error: &ruma::api::client::error::Error) -> String {
|
pub(super) fn ruma_error_message(error: &ruma::api::client::error::Error) -> String {
|
||||||
if let ErrorBody::Standard { message, .. } = &error.body {
|
if let ErrorBody::Standard { message, .. } = &error.body {
|
||||||
return message.to_string();
|
return message.clone();
|
||||||
}
|
}
|
||||||
|
|
||||||
format!("{error}")
|
format!("{error}")
|
||||||
|
|||||||
@@ -256,7 +256,7 @@ pub fn url_preview_allowed(&self, url: &Url) -> bool {
|
|||||||
|
|
||||||
if allowlist_url_contains
|
if allowlist_url_contains
|
||||||
.iter()
|
.iter()
|
||||||
.any(|url_s| url.to_string().contains(&url_s.to_string()))
|
.any(|url_s| url.to_string().contains(url_s))
|
||||||
{
|
{
|
||||||
debug!("URL {} is allowed by url_preview_url_contains_allowlist (check 4/4)", &host);
|
debug!("URL {} is allowed by url_preview_url_contains_allowlist (check 4/4)", &host);
|
||||||
return true;
|
return true;
|
||||||
|
|||||||
Reference in New Issue
Block a user