Paths

Table of Contentst

-
lib/
-
facts/
1/2
genesis.json
1/2
testers.json
-
shared/
1/2
search-utils.js
-
native/
-
account/
1/2
log-in-panel.react.js
-
register-panel.react.js
-
media/
-
camera-modal.react.js
-
save-media.js
-
profile/
-
edit-password.react.js
-
redux/
-
redux-setup.js
-
web/settings/
-
settings/
-
password-change-modal.js

Differential D4541

[chore] Replace `'` with `’` in user-displayed text
ClosedPublic
Actions

Authored by • abosh on Jul 14 2022, 1:14 PM.

Details

Reviewers

atul

Commits

rCOMM4cdbb7da56d5: [chore] Replace `'` with `’` in user-displayed text

Summary

Replaced single quote with apostrophe in user-displayed text. Wasn't sure the best way to title this, but basically this diff only replaces the single quotes in text that can get displayed in a modal, the app, or an error message that isn't an invariant.

Test Plan

Used this regex to search for all instances of ' surrounded by "":

Diff Detail

Repository

rCOMM Comm

Branch

master

Lint

No Lint Coverage

Unit

No Test Coverage

Event Timeline

• abosh created this revision.Jul 14 2022, 1:14 PM

Herald added subscribers: • adrian, tomek, ashoat. · View Herald TranscriptJul 14 2022, 1:14 PM

• abosh edited the test plan for this revision. (Show Details)Jul 14 2022, 1:14 PM

• abosh edited the summary of this revision. (Show Details)

• abosh added inline comments.

lib/facts/genesis.json
1	Not sure where this or `testers.json` is used anymore, but it's human-readable/user-displayed text somewhere, so I changed it.

Harbormaster completed remote builds in B10538: Diff 14503.Jul 14 2022, 1:26 PM

• abosh requested review of this revision.Jul 14 2022, 1:26 PM

Seems reasonable. It might be hard to keep it this way in the codebase since the ' key is a single quote in code editors.

There's probably some way to enforce the rule, but I don't think it really matters enough to go through that effort.

This revision is now accepted and ready to land.Jul 14 2022, 5:49 PM

Yeah, it just depends on how stringent future code reviewers want to be.

Closed by commit rCOMM4cdbb7da56d5: [chore] Replace `'` with `’` in user-displayed text (authored by • abosh). · Explain WhyJul 15 2022, 7:53 AM

This revision was automatically updated to reflect the committed changes.

• abosh added a commit: rCOMM4cdbb7da56d5: [chore] Replace `'` with `’` in user-displayed text.

• abosh mentioned this in D5040: [lib] Use slanted apostrophes and quotation marks in `change-settings-message-spec`.Sep 15 2022, 4:07 PM

Revision Contents
Changeset List

Path

Size

lib/

facts/

genesis.json

4 lines

testers.json

4 lines

shared/

search-utils.js

6 lines

native/

account/

log-in-panel.react.js

6 lines

4 lines

media/

camera-modal.react.js

2 lines

save-media.js

2 lines

profile/

edit-password.react.js

2 lines

redux/

redux-setup.js

4 lines

web/

settings/

password-change-modal.js

2 lines

Diff 14503

View Options

lib/facts/genesis.json

use derive_more::{Display, Error, From};		use derive_more::{Display, Error, From};
use futures_core::Stream;		use futures_core::Stream;
use futures_util::StreamExt;		use futures_util::{StreamExt, TryStreamExt};
use reqwest::Url;		use reqwest::{
		multipart::{Form, Part},
		Body, Url,
		};
use tracing::{debug, trace, warn};		use tracing::{debug, trace, warn};

// publicly re-export some reqwest types		// publicly re-export some reqwest types
pub use reqwest::Error as ReqwestError;		pub use reqwest::Error as ReqwestError;
pub use reqwest::StatusCode;		pub use reqwest::StatusCode;

#[derive(From, Error, Debug, Display)]		#[derive(From, Error, Debug, Display)]
pub enum BlobServiceError {		pub enum BlobServiceError {
▲ Show 20 Lines • Show All 91 Lines • ▼ Show 20 Lines	) -> BlobResult<impl Stream<Item = BlobResult<Vec<u8>>>> {
}		}

let error = handle_http_error(response.status());		let error = handle_http_error(response.status());
if let Ok(message) = response.text().await {		if let Ok(message) = response.text().await {
trace!("Error response message: {}", message);		trace!("Error response message: {}", message);
}		}
Err(error)		Err(error)
}		}

		/// Uploads a blob. Returns `BlobServiceError::AlreadyExists` if blob with given hash
		/// already exists.
		///
		/// # Example
		/// ```rust
		/// use std::io::{Error, ErrorKind};
		///
		/// let client =
		/// BlobServiceClient::new("http://localhost:50053".parse()?);
		///
		/// let stream = async_stream::stream! {
		/// yield Ok(vec![1, 2, 3]);
		/// yield Ok(vec![4, 5, 6]);
		/// yield Err(Error::new(ErrorKind::Other, "Oops"));
		/// };
		/// client.upload_blob(&blob_hash, stream).await?;
		/// ```
		pub async fn upload_blob<H, S>(
		&self,
		blob_hash: H,
		data_stream: S,
		) -> BlobResult<()>
		where
		H: Into<String>,
		S: futures_core::stream::TryStream + Send + Sync + 'static,
		S::Error: Into<Box<dyn std::error::Error + Send + Sync>>,
		Vec<u8>: From<S::Ok>,
		bartekAuthorUnsubmitted Done Inline Actions Requirements of the reqwest body stream: A stream of `Result<impl Into<Vec<u8>>, impl Into<Box<dyn Error>>>` bartek: Requirements of the reqwest body stream: A stream of `Result<impl Into<Vec<u8>>, impl…
		{
		debug!("Revoke holder request");
		michalUnsubmitted Not Done Inline Actions Wrong message? michal: Wrong message?
		let url = self.get_blob_url(None)?;

		let stream = data_stream.map_ok(Vec::from);
		let streaming_body = Body::wrap_stream(stream);
		let form = Form::new()
		.text("blob_hash", blob_hash.into())
		.part("blob_data", Part::stream(streaming_body));

		let response = self.http_client.put(url).multipart(form).send().await?;
		debug!("Response status: {}", response.status());

		if response.status().is_success() {
		trace!("Blob upload successful");
		return Ok(());
		}

		let error = handle_http_error(response.status());
		if let Ok(message) = response.text().await {
		trace!("Error response message: {}", message);
		}
		Err(error)
		}
}		}

// private helper methods		// private helper methods
impl BlobServiceClient {		impl BlobServiceClient {
fn get_blob_url(		fn get_blob_url(
&self,		&self,
blob_hash: Option<&str>,		blob_hash: Option<&str>,
) -> Result<Url, BlobServiceError> {		) -> Result<Url, BlobServiceError> {
Show All 24 Lines

View Options

lib/facts/testers.json

use derive_more::{Display, Error, From};		use derive_more::{Display, Error, From};
use futures_core::Stream;		use futures_core::Stream;
use futures_util::StreamExt;		use futures_util::{StreamExt, TryStreamExt};
use reqwest::Url;		use reqwest::{
		multipart::{Form, Part},
		Body, Url,
		};
use tracing::{debug, trace, warn};		use tracing::{debug, trace, warn};

// publicly re-export some reqwest types		// publicly re-export some reqwest types
pub use reqwest::Error as ReqwestError;		pub use reqwest::Error as ReqwestError;
pub use reqwest::StatusCode;		pub use reqwest::StatusCode;

#[derive(From, Error, Debug, Display)]		#[derive(From, Error, Debug, Display)]
pub enum BlobServiceError {		pub enum BlobServiceError {
▲ Show 20 Lines • Show All 91 Lines • ▼ Show 20 Lines	) -> BlobResult<impl Stream<Item = BlobResult<Vec<u8>>>> {
}		}

let error = handle_http_error(response.status());		let error = handle_http_error(response.status());
if let Ok(message) = response.text().await {		if let Ok(message) = response.text().await {
trace!("Error response message: {}", message);		trace!("Error response message: {}", message);
}		}
Err(error)		Err(error)
}		}

		/// Uploads a blob. Returns `BlobServiceError::AlreadyExists` if blob with given hash
		/// already exists.
		///
		/// # Example
		/// ```rust
		/// use std::io::{Error, ErrorKind};
		///
		/// let client =
		/// BlobServiceClient::new("http://localhost:50053".parse()?);
		///
		/// let stream = async_stream::stream! {
		/// yield Ok(vec![1, 2, 3]);
		/// yield Ok(vec![4, 5, 6]);
		/// yield Err(Error::new(ErrorKind::Other, "Oops"));
		/// };
		/// client.upload_blob(&blob_hash, stream).await?;
		/// ```
		pub async fn upload_blob<H, S>(
		&self,
		blob_hash: H,
		data_stream: S,
		) -> BlobResult<()>
		where
		H: Into<String>,
		S: futures_core::stream::TryStream + Send + Sync + 'static,
		S::Error: Into<Box<dyn std::error::Error + Send + Sync>>,
		Vec<u8>: From<S::Ok>,
		bartekAuthorUnsubmitted Done Inline Actions Requirements of the reqwest body stream: A stream of `Result<impl Into<Vec<u8>>, impl Into<Box<dyn Error>>>` bartek: Requirements of the reqwest body stream: A stream of `Result<impl Into<Vec<u8>>, impl…
		{
		debug!("Revoke holder request");
		michalUnsubmitted Not Done Inline Actions Wrong message? michal: Wrong message?
		let url = self.get_blob_url(None)?;

		let stream = data_stream.map_ok(Vec::from);
		let streaming_body = Body::wrap_stream(stream);
		let form = Form::new()
		.text("blob_hash", blob_hash.into())
		.part("blob_data", Part::stream(streaming_body));

		let response = self.http_client.put(url).multipart(form).send().await?;
		debug!("Response status: {}", response.status());

		if response.status().is_success() {
		trace!("Blob upload successful");
		return Ok(());
		}

		let error = handle_http_error(response.status());
		if let Ok(message) = response.text().await {
		trace!("Error response message: {}", message);
		}
		Err(error)
		}
}		}

// private helper methods		// private helper methods
impl BlobServiceClient {		impl BlobServiceClient {
fn get_blob_url(		fn get_blob_url(
&self,		&self,
blob_hash: Option<&str>,		blob_hash: Option<&str>,
) -> Result<Url, BlobServiceError> {		) -> Result<Url, BlobServiceError> {
Show All 24 Lines

View Options

lib/shared/search-utils.js

use derive_more::{Display, Error, From};		use derive_more::{Display, Error, From};
use futures_core::Stream;		use futures_core::Stream;
use futures_util::StreamExt;		use futures_util::{StreamExt, TryStreamExt};
use reqwest::Url;		use reqwest::{
		multipart::{Form, Part},
		Body, Url,
		};
use tracing::{debug, trace, warn};		use tracing::{debug, trace, warn};

// publicly re-export some reqwest types		// publicly re-export some reqwest types
pub use reqwest::Error as ReqwestError;		pub use reqwest::Error as ReqwestError;
pub use reqwest::StatusCode;		pub use reqwest::StatusCode;

#[derive(From, Error, Debug, Display)]		#[derive(From, Error, Debug, Display)]
pub enum BlobServiceError {		pub enum BlobServiceError {
▲ Show 20 Lines • Show All 91 Lines • ▼ Show 20 Lines	) -> BlobResult<impl Stream<Item = BlobResult<Vec<u8>>>> {
}		}

let error = handle_http_error(response.status());		let error = handle_http_error(response.status());
if let Ok(message) = response.text().await {		if let Ok(message) = response.text().await {
trace!("Error response message: {}", message);		trace!("Error response message: {}", message);
}		}
Err(error)		Err(error)
}		}

		/// Uploads a blob. Returns `BlobServiceError::AlreadyExists` if blob with given hash
		/// already exists.
		///
		/// # Example
		/// ```rust
		/// use std::io::{Error, ErrorKind};
		///
		/// let client =
		/// BlobServiceClient::new("http://localhost:50053".parse()?);
		///
		/// let stream = async_stream::stream! {
		/// yield Ok(vec![1, 2, 3]);
		/// yield Ok(vec![4, 5, 6]);
		/// yield Err(Error::new(ErrorKind::Other, "Oops"));
		/// };
		/// client.upload_blob(&blob_hash, stream).await?;
		/// ```
		pub async fn upload_blob<H, S>(
		&self,
		blob_hash: H,
		data_stream: S,
		) -> BlobResult<()>
		where
		H: Into<String>,
		S: futures_core::stream::TryStream + Send + Sync + 'static,
		S::Error: Into<Box<dyn std::error::Error + Send + Sync>>,
		Vec<u8>: From<S::Ok>,
		bartekAuthorUnsubmitted Done Inline Actions Requirements of the reqwest body stream: A stream of `Result<impl Into<Vec<u8>>, impl Into<Box<dyn Error>>>` bartek: Requirements of the reqwest body stream: A stream of `Result<impl Into<Vec<u8>>, impl…
		{
		debug!("Revoke holder request");
		michalUnsubmitted Not Done Inline Actions Wrong message? michal: Wrong message?
		let url = self.get_blob_url(None)?;

		let stream = data_stream.map_ok(Vec::from);
		let streaming_body = Body::wrap_stream(stream);
		let form = Form::new()
		.text("blob_hash", blob_hash.into())
		.part("blob_data", Part::stream(streaming_body));

		let response = self.http_client.put(url).multipart(form).send().await?;
		debug!("Response status: {}", response.status());

		if response.status().is_success() {
		trace!("Blob upload successful");
		return Ok(());
		}

		let error = handle_http_error(response.status());
		if let Ok(message) = response.text().await {
		trace!("Error response message: {}", message);
		}
		Err(error)
		}
}		}

// private helper methods		// private helper methods
impl BlobServiceClient {		impl BlobServiceClient {
fn get_blob_url(		fn get_blob_url(
&self,		&self,
blob_hash: Option<&str>,		blob_hash: Option<&str>,
) -> Result<Url, BlobServiceError> {		) -> Result<Url, BlobServiceError> {
Show All 24 Lines

View Options

native/account/log-in-panel.react.js

use derive_more::{Display, Error, From};		use derive_more::{Display, Error, From};
use futures_core::Stream;		use futures_core::Stream;
use futures_util::StreamExt;		use futures_util::{StreamExt, TryStreamExt};
use reqwest::Url;		use reqwest::{
		multipart::{Form, Part},
		Body, Url,
		};
use tracing::{debug, trace, warn};		use tracing::{debug, trace, warn};

// publicly re-export some reqwest types		// publicly re-export some reqwest types
pub use reqwest::Error as ReqwestError;		pub use reqwest::Error as ReqwestError;
pub use reqwest::StatusCode;		pub use reqwest::StatusCode;

#[derive(From, Error, Debug, Display)]		#[derive(From, Error, Debug, Display)]
pub enum BlobServiceError {		pub enum BlobServiceError {
▲ Show 20 Lines • Show All 91 Lines • ▼ Show 20 Lines	) -> BlobResult<impl Stream<Item = BlobResult<Vec<u8>>>> {
}		}

let error = handle_http_error(response.status());		let error = handle_http_error(response.status());
if let Ok(message) = response.text().await {		if let Ok(message) = response.text().await {
trace!("Error response message: {}", message);		trace!("Error response message: {}", message);
}		}
Err(error)		Err(error)
}		}

		/// Uploads a blob. Returns `BlobServiceError::AlreadyExists` if blob with given hash
		/// already exists.
		///
		/// # Example
		/// ```rust
		/// use std::io::{Error, ErrorKind};
		///
		/// let client =
		/// BlobServiceClient::new("http://localhost:50053".parse()?);
		///
		/// let stream = async_stream::stream! {
		/// yield Ok(vec![1, 2, 3]);
		/// yield Ok(vec![4, 5, 6]);
		/// yield Err(Error::new(ErrorKind::Other, "Oops"));
		/// };
		/// client.upload_blob(&blob_hash, stream).await?;
		/// ```
		pub async fn upload_blob<H, S>(
		&self,
		blob_hash: H,
		data_stream: S,
		) -> BlobResult<()>
		where
		H: Into<String>,
		S: futures_core::stream::TryStream + Send + Sync + 'static,
		S::Error: Into<Box<dyn std::error::Error + Send + Sync>>,
		Vec<u8>: From<S::Ok>,
		bartekAuthorUnsubmitted Done Inline Actions Requirements of the reqwest body stream: A stream of `Result<impl Into<Vec<u8>>, impl Into<Box<dyn Error>>>` bartek: Requirements of the reqwest body stream: A stream of `Result<impl Into<Vec<u8>>, impl…
		{
		debug!("Revoke holder request");
		michalUnsubmitted Not Done Inline Actions Wrong message? michal: Wrong message?
		let url = self.get_blob_url(None)?;

		let stream = data_stream.map_ok(Vec::from);
		let streaming_body = Body::wrap_stream(stream);
		let form = Form::new()
		.text("blob_hash", blob_hash.into())
		.part("blob_data", Part::stream(streaming_body));

		let response = self.http_client.put(url).multipart(form).send().await?;
		debug!("Response status: {}", response.status());

		if response.status().is_success() {
		trace!("Blob upload successful");
		return Ok(());
		}

		let error = handle_http_error(response.status());
		if let Ok(message) = response.text().await {
		trace!("Error response message: {}", message);
		}
		Err(error)
		}
}		}

// private helper methods		// private helper methods
impl BlobServiceClient {		impl BlobServiceClient {
fn get_blob_url(		fn get_blob_url(
&self,		&self,
blob_hash: Option<&str>,		blob_hash: Option<&str>,
) -> Result<Url, BlobServiceError> {		) -> Result<Url, BlobServiceError> {
Show All 24 Lines