From 4dc15a460501caacf2e0e892b630c8bb1a07cee4 Mon Sep 17 00:00:00 2001
From: Matthias Ahouansou <matthias@ahouansou.cz>
Date: Sat, 8 Mar 2025 13:19:45 +0000
Subject: [PATCH] refactor: set send_request matrix versions in a single
 constant

---
 src/api/appservice_server.rs | 8 +++-----
 src/api/server_server.rs     | 7 +++----
 src/lib.rs                   | 2 ++
 src/service/pusher/mod.rs    | 6 +++---
 4 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/src/api/appservice_server.rs b/src/api/appservice_server.rs
index 6af31d8f..641e9532 100644
--- a/src/api/appservice_server.rs
+++ b/src/api/appservice_server.rs
@@ -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());
diff --git a/src/api/server_server.rs b/src/api/server_server.rs
index f8768a9a..9134a634 100644
--- a/src/api/server_server.rs
+++ b/src/api/server_server.rs
@@ -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!(
diff --git a/src/lib.rs b/src/lib.rs
index 5a89f805..141d880a 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -13,10 +13,12 @@ use std::sync::RwLock;
 pub use api::ruma_wrapper::{Ruma, RumaResponse};
 pub use config::Config;
 pub use database::KeyValueDatabase;
+use ruma::api::MatrixVersion;
 pub use service::{pdu::PduEvent, Services};
 pub use utils::error::{Error, Result};
 
 pub static SERVICES: RwLock<Option<&'static Services>> = RwLock::new(None);
+pub const MATRIX_VERSIONS: &[MatrixVersion] = &[MatrixVersion::V1_13];
 
 pub fn services() -> &'static Services {
     SERVICES
diff --git a/src/service/pusher/mod.rs b/src/service/pusher/mod.rs
index 3ef54b6c..dede74b0 100644
--- a/src/service/pusher/mod.rs
+++ b/src/service/pusher/mod.rs
@@ -2,7 +2,7 @@ mod data;
 pub use data::Data;
 use ruma::{events::AnySyncTimelineEvent, push::PushConditionPowerLevelsCtx};
 
-use crate::{services, Error, PduEvent, Result};
+use crate::{services, Error, PduEvent, Result, MATRIX_VERSIONS};
 use bytes::BytesMut;
 use ruma::{
     api::{
@@ -11,7 +11,7 @@ use ruma::{
             self,
             v1::{Device, Notification, NotificationCounts, NotificationPriority},
         },
-        IncomingResponse, MatrixVersion, OutgoingRequest, SendAccessToken,
+        IncomingResponse, OutgoingRequest, SendAccessToken,
     },
     events::{room::power_levels::RoomPowerLevelsEventContent, StateEventType, TimelineEventType},
     push::{Action, PushConditionRoomCtx, PushFormat, Ruleset, Tweak},
@@ -58,7 +58,7 @@ impl Service {
             .try_into_http_request::<BytesMut>(
                 &destination,
                 SendAccessToken::IfRequired(""),
-                &[MatrixVersion::V1_0],
+                MATRIX_VERSIONS,
             )
             .map_err(|e| {
                 warn!("Failed to find destination {}: {}", destination, e);