backups/grapevine
1
0
Fork 0
mirror of https://gitlab.computer.surgery/matrix/grapevine.git synced 2025-12-17 15:51:23 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

create admin bot user id once and reuse it

Browse source 
This way we don't need to remember to do the conditional everywhere.
This commit is contained in:
Charles Hall 2024-06-12 16:07:47 -07:00
parent 9087da91db
commit 95a24c761d
No known key found for this signature in database
GPG key ID: 7B8E0645816E07CF
2 changed files with 42 additions and 76 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/service/globals.rs
View file

@ -25,7 +25,7 @@ use reqwest::dns::{Addrs, Name, Resolve, Resolving};
use ruma::{
api::federation::discovery::ServerSigningKeys, serde::Base64, DeviceId,
MilliSecondsSinceUnixEpoch, OwnedEventId, OwnedRoomId, OwnedServerName,
RoomVersionId, ServerName, UserId,
OwnedUserId, RoomVersionId, ServerName, UserId,
};
use tokio::sync::{broadcast, Mutex, RwLock, Semaphore};
use tracing::{error, info, Instrument};
@ -52,6 +52,7 @@ pub(crate) struct Service {
default_client: reqwest::Client,
pub(crate) stable_room_versions: Vec<RoomVersionId>,
pub(crate) unstable_room_versions: Vec<RoomVersionId>,
pub(crate) admin_bot_user_id: OwnedUserId,
pub(crate) bad_event_ratelimiter:
Arc<RwLock<HashMap<OwnedEventId, RateLimitState>>>,
pub(crate) bad_signature_ratelimiter:
@ -206,6 +207,17 @@ impl Service {
let unstable_room_versions =
vec![RoomVersionId::V3, RoomVersionId::V4, RoomVersionId::V5];
let admin_bot_user_id = UserId::parse(format!(
"@{}:{}",
if config.conduit_compat {
"conduit"
} else {
"grapevine"
},
config.server_name,
))
.expect("admin bot user ID should be valid");
let mut s = Self {
db,
config,
@ -231,6 +243,7 @@ impl Service {
jwt_decoding_key,
stable_room_versions,
unstable_room_versions,
admin_bot_user_id,
bad_event_ratelimiter: Arc::new(RwLock::new(HashMap::new())),
bad_signature_ratelimiter: Arc::new(RwLock::new(HashMap::new())),
bad_query_ratelimiter: Arc::new(RwLock::new(HashMap::new())),