oss/conduit
oss/conduit
1
0
Fork 0
mirror of https://gitlab.com/famedly/conduit.git synced 2025-08-01 17:38:36 +00:00
Code Wiki Activity

refactor: set send_request matrix versions in a single constant

Browse source
This commit is contained in:
Matthias Ahouansou 2025-03-08 13:19:45 +00:00
parent 42d8e88c74
commit 4dc15a4605
No known key found for this signature in database
4 changed files with 11 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/api/appservice_server.rs
View file

@ -1,8 +1,6 @@
use crate::{services, utils, Error, Result};
use crate::{services, utils, Error, Result, MATRIX_VERSIONS};
use bytes::BytesMut;
use ruma::api::{
appservice::Registration, IncomingResponse, MatrixVersion, OutgoingRequest, SendAccessToken,
};
use ruma::api::{appservice::Registration, IncomingResponse, OutgoingRequest, SendAccessToken};
use std::{fmt::Debug, mem, time::Duration};
use tracing::warn;
@ -30,7 +28,7 @@ where
.try_into_http_request::<BytesMut>(
&destination,
SendAccessToken::IfRequired(hs_token),
&[MatrixVersion::V1_0],
MATRIX_VERSIONS,
)
.unwrap()
.map(|body| body.freeze());

7
src/api/server_server.rs
View file

@ -7,7 +7,7 @@ use crate::{
media::FileMeta,
pdu::{gen_event_id_canonical_json, PduBuilder},
},
services, utils, Error, PduEvent, Result, Ruma,
services, utils, Error, PduEvent, Result, Ruma, MATRIX_VERSIONS,
};
use axum::{response::IntoResponse, Json};
use axum_extra::headers::{CacheControl, Header};
@ -44,8 +44,7 @@ use ruma::{
send_transaction_message,
},
},
EndpointError, IncomingResponse, MatrixVersion, OutgoingRequest, OutgoingResponse,
SendAccessToken,
EndpointError, IncomingResponse, OutgoingRequest, OutgoingResponse, SendAccessToken,
},
directory::{Filter, RoomNetwork},
events::{
@ -215,7 +214,7 @@ where
.try_into_http_request::<Vec<u8>>(
&actual_destination_str,
SendAccessToken::IfRequired(""),
&[MatrixVersion::V1_11],
MATRIX_VERSIONS,
)
.map_err(|e| {
warn!(