Page MenuHomePhabricator
Differential D7423

[native] move emoji avatar creation from profile directory to components directory
ClosedPublic
Actions

Authored by ginsu on Apr 13 2023, 8:23 AM.
Tags
None
Referenced Files
Unknown Object (File)
Wed, Apr 23, 8:59 AM
Unknown Object (File)
Wed, Apr 23, 5:41 AM
Unknown Object (File)
Wed, Apr 23, 2:26 AM
Unknown Object (File)
Wed, Apr 23, 1:35 AM
Unknown Object (File)
Mon, Apr 21, 11:05 PM
Unknown Object (File)
Wed, Apr 9, 12:53 AM
Unknown Object (File)
Wed, Apr 9, 12:15 AM
Unknown Object (File)
Tue, Apr 8, 11:15 PM
View All Files
Subscribers
ashoat
atul
tomek

Details

Reviewers
ashoat
atul
Commits
rCOMM94c79f1808ee: [native] move emoji avatar creation from profile directory to components…
Summary

This is a move diff, I want to move this component to components directory since both profile and chat will be using this. Probably should have done this from the get go

Depends on D7378

Test Plan

flow

Diff Detail

Repository
rCOMM Comm
Lint
No Lint Coverage
Unit
No Test Coverage

Event Timeline

ginsu created this revision.Apr 13 2023, 8:23 AM
Herald added subscribers: atul, tomek, ashoat. · View Herald TranscriptApr 13 2023, 8:23 AM
ginsu edited the summary of this revision. (Show Details)Apr 13 2023, 8:24 AM
ginsu added reviewers: ashoat, atul.
ginsu added a parent revision: D7378: [native] add edit avatar badge to thread avatar.
ginsu edited the summary of this revision. (Show Details)Apr 13 2023, 8:27 AM
Harbormaster completed remote builds in B18330: Diff 25114.Apr 13 2023, 8:41 AM
ginsu requested review of this revision.Apr 13 2023, 8:41 AM
ginsu added a child revision: D7424: [native] introduce useSaveUserAvatar hook.Apr 13 2023, 8:44 AM
ashoat accepted this revision.Apr 13 2023, 9:01 AM

Does nothing actually use this component? Usually we'd have to update some import paths as well

This revision is now accepted and ready to land.Apr 13 2023, 9:01 AM
ginsu updated this revision to Diff 25123.Apr 13 2023, 9:13 AM

rebase before landing

ginsu added a comment.EditedApr 13 2023, 9:22 AM

Does nothing actually use this component? Usually we'd have to update some import paths as well

This will be addressed in D7324 but going to update this after EmojiAvatarCreation handles thread avatars and then I will also add the imports for the chat navigator as well, but to answer your question at this point in the stack nothing does call and use this component

Harbormaster completed remote builds in B18336: Diff 25123.Apr 13 2023, 9:31 AM
Closed by commit rCOMM94c79f1808ee: [native] move emoji avatar creation from profile directory to components… (authored by ginsu). · Explain WhyApr 13 2023, 9:37 AM
This revision was automatically updated to reflect the committed changes.
ginsu added a commit: rCOMM94c79f1808ee: [native] move emoji avatar creation from profile directory to components….

Revision Contents
Changeset List

PathSize
native/
components/
profile/
246 lines
profile/

Diff 25114

View Options

native/components/emoji-avatar-creation.react.js

mod proto { mod proto {
tonic::include_proto!("blob"); tonic::include_proto!("blob");
} }
use proto::blob_service_client::BlobServiceClient; use proto::blob_service_client::BlobServiceClient;
use proto::GetRequest; use proto::GetRequest;
use crate::constants::{BLOB_ADDRESS, MPSC_CHANNEL_BUFFER_CAPACITY}; use crate::constants::{BLOB_ADDRESS, MPSC_CHANNEL_BUFFER_CAPACITY};
use crate::tools::{ use crate::tools::{
c_char_pointer_to_string, check_error, report_error, string_to_c_char_pointer, c_char_pointer_to_string, c_char_pointer_to_string_new, check_error,
report_error, string_to_c_char_pointer, string_to_c_char_pointer_new,
}; };
use anyhow::bail;
use lazy_static::lazy_static; use lazy_static::lazy_static;
use libc; use libc;
use libc::c_char; use libc::c_char;
use std::collections::HashMap; use std::collections::HashMap;
use std::sync::{Arc, Mutex}; use std::sync::{Arc, Mutex};
use tokio::runtime::Runtime; use tokio::runtime::Runtime;
use tokio::sync::mpsc; use tokio::sync::mpsc;
use tokio::task::JoinHandle; use tokio::task::JoinHandle;
Show All 17 Linesfn is_initialized(holder: &String) -> bool {
if let Ok(clients) = CLIENTS.lock() { if let Ok(clients) = CLIENTS.lock() {
return clients.contains_key(holder); return clients.contains_key(holder);
} else { } else {
report_error(&ERROR_MESSAGES, "couldn't access client", Some("get")); report_error(&ERROR_MESSAGES, "couldn't access client", Some("get"));
} }
false false
} }
fn is_initialized_new(holder: &String) -> anyhow::Result<bool, anyhow::Error> {
if let Ok(clients) = CLIENTS.lock() {
return Ok(clients.contains_key(holder));
}
bail!("couldn't access client");
}
pub fn get_client_initialize_cxx( pub fn get_client_initialize_cxx(
holder_char: *const c_char, holder_char: *const c_char,
) -> Result<(), String> { ) -> Result<(), String> {
let holder = c_char_pointer_to_string(holder_char)?; let holder = c_char_pointer_to_string(holder_char)?;
if is_initialized(&holder) { if is_initialized(&holder) {
get_client_terminate_cxx(string_to_c_char_pointer(&holder)?)?; // get_client_terminate_cxx(string_to_c_char_pointer(&holder)?)?;
} }
assert!( assert!(
!is_initialized(&holder), !is_initialized(&holder),
"client cannot be initialized twice" "client cannot be initialized twice"
); );
// grpc // grpc
▲ Show 20 Lines • Show All 83 Lines • ▼ Show 20 Lines let response: Option<Vec<u8>> = RUNTIME.block_on(async {
None None
}); });
check_error(&ERROR_MESSAGES)?; check_error(&ERROR_MESSAGES)?;
response.ok_or("response could not be obtained".to_string()) response.ok_or("response could not be obtained".to_string())
} }
pub fn get_client_terminate_cxx( pub fn get_client_terminate_cxx(
holder_char: *const c_char, holder_char: *const c_char,
) -> Result<(), String> { ) -> anyhow::Result<(), anyhow::Error> {
let holder = c_char_pointer_to_string(holder_char)?; let holder = c_char_pointer_to_string_new(holder_char)?;
check_error(&ERROR_MESSAGES)?; if !is_initialized_new(&holder)? {
if !is_initialized(&holder) {
check_error(&ERROR_MESSAGES)?;
return Ok(()); return Ok(());
} }
if let Ok(mut clients) = CLIENTS.lock() { if let Ok(mut clients) = CLIENTS.lock() {
let maybe_client = clients.remove(&holder); match clients.remove(&holder) {
if let Some(client) = maybe_client { Some(client) => {
RUNTIME.block_on(async { RUNTIME.block_on(async {
if client.rx_handle.await.is_err() { if client.rx_handle.await.is_err() {
report_error( bail!(format!("awaiting for the client {} failed", holder));
&ERROR_MESSAGES, }
"wait for receiver handle failed", Ok(())
Some("get"), })?;
); }
None => {
bail!(format!("no client foudn for {}", holder));
} }
});
} else {
return Err("no client detected".to_string());
} }
} else { } else {
return Err("couldn't access client".to_string()); bail!("couldn't access client");
} }
assert!( if is_initialized_new(&holder)? {
!is_initialized(&holder), bail!("client transmitter handler released properly");
"client transmitter handler released properly" }
);
check_error(&ERROR_MESSAGES)?;
Ok(()) Ok(())
} }
View Options

native/profile/emoji-avatar-creation.react.js

mod proto { mod proto {
tonic::include_proto!("blob"); tonic::include_proto!("blob");
} }
use proto::blob_service_client::BlobServiceClient; use proto::blob_service_client::BlobServiceClient;
use proto::GetRequest; use proto::GetRequest;
use crate::constants::{BLOB_ADDRESS, MPSC_CHANNEL_BUFFER_CAPACITY}; use crate::constants::{BLOB_ADDRESS, MPSC_CHANNEL_BUFFER_CAPACITY};
use crate::tools::{ use crate::tools::{
c_char_pointer_to_string, check_error, report_error, string_to_c_char_pointer, c_char_pointer_to_string, c_char_pointer_to_string_new, check_error,
report_error, string_to_c_char_pointer, string_to_c_char_pointer_new,
}; };
use anyhow::bail;
use lazy_static::lazy_static; use lazy_static::lazy_static;
use libc; use libc;
use libc::c_char; use libc::c_char;
use std::collections::HashMap; use std::collections::HashMap;
use std::sync::{Arc, Mutex}; use std::sync::{Arc, Mutex};
use tokio::runtime::Runtime; use tokio::runtime::Runtime;
use tokio::sync::mpsc; use tokio::sync::mpsc;
use tokio::task::JoinHandle; use tokio::task::JoinHandle;
Show All 17 Linesfn is_initialized(holder: &String) -> bool {
if let Ok(clients) = CLIENTS.lock() { if let Ok(clients) = CLIENTS.lock() {
return clients.contains_key(holder); return clients.contains_key(holder);
} else { } else {
report_error(&ERROR_MESSAGES, "couldn't access client", Some("get")); report_error(&ERROR_MESSAGES, "couldn't access client", Some("get"));
} }
false false
} }
fn is_initialized_new(holder: &String) -> anyhow::Result<bool, anyhow::Error> {
if let Ok(clients) = CLIENTS.lock() {
return Ok(clients.contains_key(holder));
}
bail!("couldn't access client");
}
pub fn get_client_initialize_cxx( pub fn get_client_initialize_cxx(
holder_char: *const c_char, holder_char: *const c_char,
) -> Result<(), String> { ) -> Result<(), String> {
let holder = c_char_pointer_to_string(holder_char)?; let holder = c_char_pointer_to_string(holder_char)?;
if is_initialized(&holder) { if is_initialized(&holder) {
get_client_terminate_cxx(string_to_c_char_pointer(&holder)?)?; // get_client_terminate_cxx(string_to_c_char_pointer(&holder)?)?;
} }
assert!( assert!(
!is_initialized(&holder), !is_initialized(&holder),
"client cannot be initialized twice" "client cannot be initialized twice"
); );
// grpc // grpc
▲ Show 20 Lines • Show All 83 Lines • ▼ Show 20 Lines let response: Option<Vec<u8>> = RUNTIME.block_on(async {
None None
}); });
check_error(&ERROR_MESSAGES)?; check_error(&ERROR_MESSAGES)?;
response.ok_or("response could not be obtained".to_string()) response.ok_or("response could not be obtained".to_string())
} }
pub fn get_client_terminate_cxx( pub fn get_client_terminate_cxx(
holder_char: *const c_char, holder_char: *const c_char,
) -> Result<(), String> { ) -> anyhow::Result<(), anyhow::Error> {
let holder = c_char_pointer_to_string(holder_char)?; let holder = c_char_pointer_to_string_new(holder_char)?;
check_error(&ERROR_MESSAGES)?; if !is_initialized_new(&holder)? {
if !is_initialized(&holder) {
check_error(&ERROR_MESSAGES)?;
return Ok(()); return Ok(());
} }
if let Ok(mut clients) = CLIENTS.lock() { if let Ok(mut clients) = CLIENTS.lock() {
let maybe_client = clients.remove(&holder); match clients.remove(&holder) {
if let Some(client) = maybe_client { Some(client) => {
RUNTIME.block_on(async { RUNTIME.block_on(async {
if client.rx_handle.await.is_err() { if client.rx_handle.await.is_err() {
report_error( bail!(format!("awaiting for the client {} failed", holder));
&ERROR_MESSAGES, }
"wait for receiver handle failed", Ok(())
Some("get"), })?;
); }
None => {
bail!(format!("no client foudn for {}", holder));
} }
});
} else {
return Err("no client detected".to_string());
} }
} else { } else {
return Err("couldn't access client".to_string()); bail!("couldn't access client");
} }
assert!( if is_initialized_new(&holder)? {
!is_initialized(&holder), bail!("client transmitter handler released properly");
"client transmitter handler released properly" }
);
check_error(&ERROR_MESSAGES)?;
Ok(()) Ok(())
} }