From 16572a868a9ecf87248613680e2316ddb24b585f Mon Sep 17 00:00:00 2001 From: strawberry Date: Sun, 17 Mar 2024 01:55:09 -0400 Subject: [PATCH] slight inclusive wording changes Signed-off-by: strawberry --- src/api/server_server.rs | 2 +- src/database/key_value/globals.rs | 2 +- src/service/media/mod.rs | 4 ++-- src/service/sending/mod.rs | 6 +++--- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/api/server_server.rs b/src/api/server_server.rs index 4f28e271..4edfd09d 100644 --- a/src/api/server_server.rs +++ b/src/api/server_server.rs @@ -1540,7 +1540,7 @@ pub async fn create_invite_route(body: Ruma) -> Resu let mut event: JsonObject = serde_json::from_str(body.event.get()) .map_err(|_| Error::BadRequest(ErrorKind::InvalidParam, "Invalid invite event bytes."))?; - event.insert("event_id".to_owned(), "$dummy".into()); + event.insert("event_id".to_owned(), "$placeholder".into()); let pdu: PduEvent = serde_json::from_value(event.into()).map_err(|e| { warn!("Invalid invite event: {}", e); diff --git a/src/database/key_value/globals.rs b/src/database/key_value/globals.rs index be5796ed..48e55578 100644 --- a/src/database/key_value/globals.rs +++ b/src/database/key_value/globals.rs @@ -52,7 +52,7 @@ impl service::globals::Data for KeyValueDatabase { let mut futures = FuturesUnordered::new(); - // Return when *any* user changed his key + // Return when *any* user changed their key // TODO: only send for user they share a room with futures.push(self.todeviceid_events.watch_prefix(&userdeviceid_prefix)); diff --git a/src/service/media/mod.rs b/src/service/media/mod.rs index 696fa9f0..767fee9a 100644 --- a/src/service/media/mod.rs +++ b/src/service/media/mod.rs @@ -194,8 +194,8 @@ impl Service { debug!("Full MXC key from database: {:?}", key); // we need to get the MXC URL from the first part of the key (the first 0xff / - // 255 push) this code does look kinda crazy but blame conduit for using magic - // keys + // 255 push). this is all necessary because of conduit using magic keys for + // media let mut parts = key.split(|&b| b == 0xFF); let mxc = parts .next() diff --git a/src/service/sending/mod.rs b/src/service/sending/mod.rs index 529e1631..fae05404 100644 --- a/src/service/sending/mod.rs +++ b/src/service/sending/mod.rs @@ -360,11 +360,11 @@ impl Service { for user_id in device_list_changes { // Empty prev id forces synapse to resync: https://github.com/matrix-org/synapse/blob/98aec1cc9da2bd6b8e34ffb282c85abf9b8b42ca/synapse/handlers/device.py#L767 - // Because synapse resyncs, we can just insert dummy data + // Because synapse resyncs, we can just insert placeholder data let edu = Edu::DeviceListUpdate(DeviceListUpdateContent { user_id, - device_id: device_id!("dummy").to_owned(), - device_display_name: Some("Dummy".to_owned()), + device_id: device_id!("placeholder").to_owned(), + device_display_name: Some("Placeholder".to_owned()), stream_id: uint!(1), prev_id: Vec::new(), deleted: None,