Page MenuHomePhabricator
Differential D13541

[web] Only call userInfoSelectorForPotentialMembers where it's needed
ClosedPublic
Actions

Authored by ashoat on Sep 30 2024, 9:54 PM.
Tags
None
Referenced Files
Unknown Object (File)
Thu, Mar 20, 11:10 PM
Unknown Object (File)
Thu, Mar 20, 9:54 PM
Unknown Object (File)
Fri, Mar 7, 11:21 AM
Unknown Object (File)
Feb 18 2025, 2:44 AM
Unknown Object (File)
Feb 18 2025, 2:44 AM
Unknown Object (File)
Feb 18 2025, 2:44 AM
Unknown Object (File)
Feb 18 2025, 2:43 AM
Unknown Object (File)
Feb 16 2025, 12:29 PM
View All 49 Files
Subscribers
None

Details

Reviewers
tomek
kamil
inka
Commits
rCOMM2ee243b09b8a: [web] Only call userInfoSelectorForPotentialMembers where it's needed
Summary

The only callsite of useInfosForPendingThread that needs otherUserInfos is ChatMessageListContainer. It's only needed there to pass to ChatThreadComposer.

To avoid fetching it unnecessarily at the other callsites, I've extracted it to that single callsite. This also benefits code readability by reducing indirection and unnecessary prop drilling.

Depends on D13540

Test Plan

Flow (this is a pure refactor)

Diff Detail

Repository
rCOMM Comm
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Revision Contents
Changeset List

Diff 44771

View Options

web/chat/chat-message-list-container.react.js

Show First 20 Lines • Show All 138 Lines • ▼ Show 20 Lines ) -> Self {
Self { Self {
user_id: user_id.into(), user_id: user_id.into(),
device_ids, device_ids,
timestamp: update_info.timestamp.unwrap_or_else(Utc::now), timestamp: update_info.timestamp.unwrap_or_else(Utc::now),
current_primary_signature: update_info.current_signature.clone(), current_primary_signature: update_info.current_signature.clone(),
last_primary_signature: update_info.last_signature.clone(), last_primary_signature: update_info.last_signature.clone(),
} }
} }
pub fn has_device(&self, device_id: &String) -> bool {
self.device_ids.contains(device_id)
}
pub fn is_primary_device(&self, device_id: &String) -> bool {
self
.device_ids
.first()
.filter(|it| *it == device_id)
.is_some()
}
pub fn has_secondary_device(&self, device_id: &String) -> bool {
self.has_device(device_id) && !self.is_primary_device(device_id)
}
} }
// helper structs for converting to/from attribute values for sort key (a.k.a itemID) // helper structs for converting to/from attribute values for sort key (a.k.a itemID)
pub struct DeviceIDAttribute(pub String); pub struct DeviceIDAttribute(pub String);
struct DeviceListKeyAttribute(DateTime<Utc>); struct DeviceListKeyAttribute(DateTime<Utc>);
impl From<DeviceIDAttribute> for AttributeValue { impl From<DeviceIDAttribute> for AttributeValue {
fn from(value: DeviceIDAttribute) -> Self { fn from(value: DeviceIDAttribute) -> Self {
▲ Show 20 Lines • Show All 656 Lines • ▼ Show 20 Lines self
&content_one_time_keys, &content_one_time_keys,
&notif_one_time_keys, &notif_one_time_keys,
) )
.await?; .await?;
Ok(()) Ok(())
} }
/// Removes device data from devices table. If the device doesn't exist,
/// it is a no-op. This does not update the device list; the device ID
/// should be removed from the device list separately.
#[tracing::instrument(skip_all)]
pub async fn remove_device_data(
&self,
user_id: impl Into<String>,
device_id: impl Into<String>,
) -> Result<(), Error> {
let user_id = user_id.into();
let device_id = device_id.into();
self
.client
.delete_item()
.table_name(devices_table::NAME)
.key(ATTR_USER_ID, AttributeValue::S(user_id))
.key(ATTR_ITEM_ID, DeviceIDAttribute(device_id).into())
.send()
.await
.map_err(|e| {
error!(
errorType = error_types::DEVICE_LIST_DB_LOG,
"Failed to delete device data: {:?}", e
);
Error::AwsSdk(e.into())
})?;
Ok(())
}
/// Registers primary device for user, stores its signed device list /// Registers primary device for user, stores its signed device list
pub async fn register_primary_device( pub async fn register_primary_device(
&self, &self,
user_id: impl Into<String>, user_id: impl Into<String>,
device_key_upload: FlattenedDeviceKeyUpload, device_key_upload: FlattenedDeviceKeyUpload,
code_version: u64, code_version: u64,
login_time: DateTime<Utc>, login_time: DateTime<Utc>,
initial_device_list: DeviceListUpdate, initial_device_list: DeviceListUpdate,
▲ Show 20 Lines • Show All 793 Lines • Show Last 20 Lines
View Options

web/chat/chat-thread-composer.react.js

Show First 20 Lines • Show All 138 Lines • ▼ Show 20 Lines ) -> Self {
Self { Self {
user_id: user_id.into(), user_id: user_id.into(),
device_ids, device_ids,
timestamp: update_info.timestamp.unwrap_or_else(Utc::now), timestamp: update_info.timestamp.unwrap_or_else(Utc::now),
current_primary_signature: update_info.current_signature.clone(), current_primary_signature: update_info.current_signature.clone(),
last_primary_signature: update_info.last_signature.clone(), last_primary_signature: update_info.last_signature.clone(),
} }
} }
pub fn has_device(&self, device_id: &String) -> bool {
self.device_ids.contains(device_id)
}
pub fn is_primary_device(&self, device_id: &String) -> bool {
self
.device_ids
.first()
.filter(|it| *it == device_id)
.is_some()
}
pub fn has_secondary_device(&self, device_id: &String) -> bool {
self.has_device(device_id) && !self.is_primary_device(device_id)
}
} }
// helper structs for converting to/from attribute values for sort key (a.k.a itemID) // helper structs for converting to/from attribute values for sort key (a.k.a itemID)
pub struct DeviceIDAttribute(pub String); pub struct DeviceIDAttribute(pub String);
struct DeviceListKeyAttribute(DateTime<Utc>); struct DeviceListKeyAttribute(DateTime<Utc>);
impl From<DeviceIDAttribute> for AttributeValue { impl From<DeviceIDAttribute> for AttributeValue {
fn from(value: DeviceIDAttribute) -> Self { fn from(value: DeviceIDAttribute) -> Self {
▲ Show 20 Lines • Show All 656 Lines • ▼ Show 20 Lines self
&content_one_time_keys, &content_one_time_keys,
&notif_one_time_keys, &notif_one_time_keys,
) )
.await?; .await?;
Ok(()) Ok(())
} }
/// Removes device data from devices table. If the device doesn't exist,
/// it is a no-op. This does not update the device list; the device ID
/// should be removed from the device list separately.
#[tracing::instrument(skip_all)]
pub async fn remove_device_data(
&self,
user_id: impl Into<String>,
device_id: impl Into<String>,
) -> Result<(), Error> {
let user_id = user_id.into();
let device_id = device_id.into();
self
.client
.delete_item()
.table_name(devices_table::NAME)
.key(ATTR_USER_ID, AttributeValue::S(user_id))
.key(ATTR_ITEM_ID, DeviceIDAttribute(device_id).into())
.send()
.await
.map_err(|e| {
error!(
errorType = error_types::DEVICE_LIST_DB_LOG,
"Failed to delete device data: {:?}", e
);
Error::AwsSdk(e.into())
})?;
Ok(())
}
/// Registers primary device for user, stores its signed device list /// Registers primary device for user, stores its signed device list
pub async fn register_primary_device( pub async fn register_primary_device(
&self, &self,
user_id: impl Into<String>, user_id: impl Into<String>,
device_key_upload: FlattenedDeviceKeyUpload, device_key_upload: FlattenedDeviceKeyUpload,
code_version: u64, code_version: u64,
login_time: DateTime<Utc>, login_time: DateTime<Utc>,
initial_device_list: DeviceListUpdate, initial_device_list: DeviceListUpdate,
▲ Show 20 Lines • Show All 793 Lines • Show Last 20 Lines
View Options

web/utils/thread-utils.js

Show First 20 Lines • Show All 138 Lines • ▼ Show 20 Lines ) -> Self {
Self { Self {
user_id: user_id.into(), user_id: user_id.into(),
device_ids, device_ids,
timestamp: update_info.timestamp.unwrap_or_else(Utc::now), timestamp: update_info.timestamp.unwrap_or_else(Utc::now),
current_primary_signature: update_info.current_signature.clone(), current_primary_signature: update_info.current_signature.clone(),
last_primary_signature: update_info.last_signature.clone(), last_primary_signature: update_info.last_signature.clone(),
} }
} }
pub fn has_device(&self, device_id: &String) -> bool {
self.device_ids.contains(device_id)
}
pub fn is_primary_device(&self, device_id: &String) -> bool {
self
.device_ids
.first()
.filter(|it| *it == device_id)
.is_some()
}
pub fn has_secondary_device(&self, device_id: &String) -> bool {
self.has_device(device_id) && !self.is_primary_device(device_id)
}
} }
// helper structs for converting to/from attribute values for sort key (a.k.a itemID) // helper structs for converting to/from attribute values for sort key (a.k.a itemID)
pub struct DeviceIDAttribute(pub String); pub struct DeviceIDAttribute(pub String);
struct DeviceListKeyAttribute(DateTime<Utc>); struct DeviceListKeyAttribute(DateTime<Utc>);
impl From<DeviceIDAttribute> for AttributeValue { impl From<DeviceIDAttribute> for AttributeValue {
fn from(value: DeviceIDAttribute) -> Self { fn from(value: DeviceIDAttribute) -> Self {
▲ Show 20 Lines • Show All 656 Lines • ▼ Show 20 Lines self
&content_one_time_keys, &content_one_time_keys,
&notif_one_time_keys, &notif_one_time_keys,
) )
.await?; .await?;
Ok(()) Ok(())
} }
/// Removes device data from devices table. If the device doesn't exist,
/// it is a no-op. This does not update the device list; the device ID
/// should be removed from the device list separately.
#[tracing::instrument(skip_all)]
pub async fn remove_device_data(
&self,
user_id: impl Into<String>,
device_id: impl Into<String>,
) -> Result<(), Error> {
let user_id = user_id.into();
let device_id = device_id.into();
self
.client
.delete_item()
.table_name(devices_table::NAME)
.key(ATTR_USER_ID, AttributeValue::S(user_id))
.key(ATTR_ITEM_ID, DeviceIDAttribute(device_id).into())
.send()
.await
.map_err(|e| {
error!(
errorType = error_types::DEVICE_LIST_DB_LOG,
"Failed to delete device data: {:?}", e
);
Error::AwsSdk(e.into())
})?;
Ok(())
}
/// Registers primary device for user, stores its signed device list /// Registers primary device for user, stores its signed device list
pub async fn register_primary_device( pub async fn register_primary_device(
&self, &self,
user_id: impl Into<String>, user_id: impl Into<String>,
device_key_upload: FlattenedDeviceKeyUpload, device_key_upload: FlattenedDeviceKeyUpload,
code_version: u64, code_version: u64,
login_time: DateTime<Utc>, login_time: DateTime<Utc>,
initial_device_list: DeviceListUpdate, initial_device_list: DeviceListUpdate,
▲ Show 20 Lines • Show All 793 Lines • Show Last 20 Lines