Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 26 additions & 10 deletions apps/desktop/src-tauri/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1880,7 +1880,10 @@ async fn check_notification_permissions(app: AppHandle) {
#[specta::specta]
#[instrument(skip(app))]
async fn set_server_url(app: MutableState<'_, App>, server_url: String) -> Result<(), ()> {
app.write().await.server_url = server_url;
let mut app = app.write().await;
posthog::set_server_url(&server_url);
app.server_url = server_url;

Ok(())
}

Expand Down Expand Up @@ -2223,6 +2226,27 @@ pub async fn run(recording_logging_handle: LoggingHandle, logs_dir: PathBuf) {
});

{
let server_url = std::option_env!("VITE_SERVER_URL")
.map(|s| {
GeneralSettingsStore::update(&app, |state| {
Comment thread
Brendonovich marked this conversation as resolved.
Outdated
state.server_url = s.to_string();
})
.map_err(|err| {
error!("Error updating server URL to match value from env: {err}")
})
.ok();

s.to_string()
})
.or_else(|| {
GeneralSettingsStore::get(&app)
.ok()
.flatten()
.map(|v| v.server_url.clone())
})
.unwrap_or_else(|| "https://cap.so".to_string());
posthog::set_server_url(&server_url);
Comment thread
oscartbeaumont marked this conversation as resolved.
Outdated

app.manage(Arc::new(RwLock::new(App {
camera_ws_port,
handle: app.clone(),
Expand All @@ -2231,15 +2255,7 @@ pub async fn run(recording_logging_handle: LoggingHandle, logs_dir: PathBuf) {
recording_logging_handle,
mic_feed,
camera_feed,
server_url: std::option_env!("VITE_SERVER_URL")
.map(|s| s.to_string())
.or_else(|| {
GeneralSettingsStore::get(&app)
.ok()
.flatten()
.map(|v| v.server_url.clone())
})
.unwrap_or_else(|| "https://cap.so".to_string()),
server_url,
logs_dir: logs_dir.clone(),
})));

Expand Down
58 changes: 42 additions & 16 deletions apps/desktop/src-tauri/src/posthog.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
use std::time::Duration;
use std::{
sync::{OnceLock, PoisonError, RwLock},
time::Duration,
};
use tracing::error;

#[derive(Debug)]
Expand All @@ -21,7 +24,7 @@ pub enum PostHogEvent {

impl From<PostHogEvent> for posthog_rs::Event {
fn from(event: PostHogEvent) -> Self {
let mut e = match event {
match event {
PostHogEvent::MultipartUploadComplete {
duration,
length,
Expand Down Expand Up @@ -49,19 +52,7 @@ impl From<PostHogEvent> for posthog_rs::Event {
.ok();
e
}
};

e.insert_prop("cap_version", env!("CARGO_PKG_VERSION"))
.map_err(|err| error!("Error adding PostHog property: {err:?}"))
.ok();
e.insert_prop("os", std::env::consts::OS)
.map_err(|err| error!("Error adding PostHog property: {err:?}"))
.ok();
e.insert_prop("arch", std::env::consts::ARCH)
.map_err(|err| error!("Error adding PostHog property: {err:?}"))
.ok();

e
}
}
}

Expand All @@ -76,10 +67,45 @@ pub fn init() {
}
}

pub fn set_server_url(url: &str) {
*API_SERVER_IS_CAP_CLOUD
.get_or_init(Default::default)
.write()
.unwrap_or_else(PoisonError::into_inner) = Some(url.contains("https://cap.so"));
}
Comment thread
oscartbeaumont marked this conversation as resolved.

static API_SERVER_IS_CAP_CLOUD: OnceLock<RwLock<Option<bool>>> = OnceLock::new();
Comment thread
oscartbeaumont marked this conversation as resolved.

pub fn async_capture_event(event: PostHogEvent) {
if option_env!("VITE_POSTHOG_KEY").is_some() {
tokio::spawn(async move {
posthog_rs::capture(event.into())
let mut e: posthog_rs::Event = event.into();

e.insert_prop("cap_version", env!("CARGO_PKG_VERSION"))
.map_err(|err| error!("Error adding PostHog property: {err:?}"))
.ok();
e.insert_prop(
"cap_backend",
match *API_SERVER_IS_CAP_CLOUD
.get_or_init(Default::default)
.read()
.unwrap_or_else(PoisonError::into_inner)
{
Some(true) => "cloud",
Some(false) => "self_hosted",
None => "unknown",
},
)
.map_err(|err| error!("Error adding PostHog property: {err:?}"))
.ok();
e.insert_prop("os", std::env::consts::OS)
.map_err(|err| error!("Error adding PostHog property: {err:?}"))
.ok();
e.insert_prop("arch", std::env::consts::ARCH)
.map_err(|err| error!("Error adding PostHog property: {err:?}"))
.ok();

posthog_rs::capture(e)
.await
.map_err(|err| error!("Error sending event to PostHog: {err:?}"))
.ok();
Expand Down
Loading