[lib] Allow calling createRealThreadFromPendingThread for PRIVATE thread
ClosedPublic
Actions

Authored by ashoat on Sep 30 2024, 10:08 PM.

Details

Reviewers

tomek
kamil
inka

Commits

rCOMM11fd8ad3f62f: [lib] Allow calling createRealThreadFromPendingThread for PRIVATE thread

Summary

Not sure why this invariant is here (added in D13244), but I tested and it all works correctly after removing it.

Depends on D13547

Test Plan

On both native and web, tested PRIVATE thread creation end-to-end via thread list search, chat composer, and user profile. Confirmed that a peer (same user device) receives the DM messages

Diff Detail

Repository

rCOMM Comm

Lint

Lint Not Applicable

Unit

Tests Not Applicable

Event Timeline

ashoat created this revision.Sep 30 2024, 10:08 PM

ashoat added a child revision: D13549: [web] Update thick threads avatar logic for web.

ashoat edited the summary of this revision. (Show Details)Sep 30 2024, 10:56 PM

Harbormaster completed remote builds in B31964: Diff 44729.Sep 30 2024, 11:11 PM

ashoat requested review of this revision.Sep 30 2024, 11:11 PM

tomek accepted this revision.Oct 1 2024, 8:16 AM

This revision is now accepted and ready to land.Oct 1 2024, 8:16 AM

Closed by commit rCOMM11fd8ad3f62f: [lib] Allow calling createRealThreadFromPendingThread for PRIVATE thread (authored by ashoat). · Explain WhyOct 1 2024, 9:07 AM

This revision was automatically updated to reflect the committed changes.

ashoat added a commit: rCOMM11fd8ad3f62f: [lib] Allow calling createRealThreadFromPendingThread for PRIVATE thread.

Revision Contents
Changeset List

Path

Size

lib/

shared/

thread-actions-utils.js

70 lines

Diff 44778

View Options

lib/shared/thread-actions-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

[lib] Allow calling createRealThreadFromPendingThread for PRIVATE threadClosedPublicActions