diff --git a/src-tauri/src/lib.rs b/src-tauri/src/lib.rs index 8ba4d5ea..ed770eb6 100644 --- a/src-tauri/src/lib.rs +++ b/src-tauri/src/lib.rs @@ -1302,7 +1302,7 @@ pub fn run() { tokio::time::sleep(Duration::from_millis(4000)).await; let val: State<'_, Mutex> = w.state(); let mut n = val.lock().await; - if let Err(e) = n.check(&w).await { + if let Err(e) = n.maybe_check(&w).await { warn!("Failed to check for notifications {}", e) } }); diff --git a/src-tauri/src/notifications.rs b/src-tauri/src/notifications.rs index d824e309..d6e1d9b0 100644 --- a/src-tauri/src/notifications.rs +++ b/src-tauri/src/notifications.rs @@ -63,7 +63,7 @@ impl YaakNotifier { Ok(()) } - pub async fn check(&mut self, window: &WebviewWindow) -> Result<()> { + pub async fn maybe_check(&mut self, window: &WebviewWindow) -> Result<()> { let app_handle = window.app_handle(); let ignore_check = self.last_check.elapsed().unwrap().as_secs() < MAX_UPDATE_CHECK_SECONDS; @@ -83,7 +83,7 @@ impl YaakNotifier { let num_launches = get_num_launches(app_handle).await; let info = app_handle.package_info().clone(); let req = yaak_api_client(app_handle)? - .request(Method::GET, "http://localhost:9444/notifications") + .request(Method::GET, "https://notify.yaak.app/notifications") .query(&[ ("version", info.version.to_string().as_str()), ("launches", num_launches.to_string().as_str()), diff --git a/src-tauri/yaak-models/src/queries/batch.rs b/src-tauri/yaak-models/src/queries/batch.rs index 7be4a498..9eeb1d3c 100644 --- a/src-tauri/yaak-models/src/queries/batch.rs +++ b/src-tauri/yaak-models/src/queries/batch.rs @@ -22,7 +22,7 @@ impl<'a> DbContext<'a> { let x = self.upsert_workspace(&v, source)?; imported_resources.workspaces.push(x.clone()); } - info!("Upserted {} workspaces", imported_resources.environments.len()); + info!("Upserted {} workspaces", imported_resources.workspaces.len()); } if http_requests.len() > 0 { diff --git a/src-tauri/yaak-plugins/src/api.rs b/src-tauri/yaak-plugins/src/api.rs index b9d5a4fc..297f2564 100644 --- a/src-tauri/yaak-plugins/src/api.rs +++ b/src-tauri/yaak-plugins/src/api.rs @@ -17,7 +17,7 @@ pub async fn get_plugin( version: Option, ) -> Result { info!("Getting plugin: {name} {version:?}"); - let mut url = base_url(&format!("/{name}")); + let mut url = build_url(&format!("/{name}")); if let Some(version) = version { let mut query_pairs = url.query_pairs_mut(); query_pairs.append_pair("version", &version); @@ -36,7 +36,7 @@ pub async fn download_plugin_archive( let name = plugin_version.name.clone(); let version = plugin_version.version.clone(); info!("Downloading plugin: {name} {version}"); - let mut url = base_url(&format!("/{}/download", name)); + let mut url = build_url(&format!("/{}/download", name)); { let mut query_pairs = url.query_pairs_mut(); query_pairs.append_pair("version", &version); @@ -67,7 +67,7 @@ pub async fn check_plugin_updates( }) .collect(); - let url = base_url("/updates"); + let url = build_url("/updates"); let body = serde_json::to_vec(&PluginUpdatesResponse { plugins: name_versions, })?; @@ -84,7 +84,7 @@ pub async fn search_plugins( app_handle: &AppHandle, query: &str, ) -> Result { - let mut url = base_url("/search"); + let mut url = build_url("/search"); { let mut query_pairs = url.query_pairs_mut(); query_pairs.append_pair("query", query); @@ -93,7 +93,7 @@ pub async fn search_plugins( Ok(resp.json().await?) } -fn base_url(path: &str) -> Url { +fn build_url(path: &str) -> Url { let base_url = if is_dev() { "http://localhost:9444/api/v1/plugins" } else { diff --git a/src-web/components/core/Editor/hyperlink/extension.ts b/src-web/components/core/Editor/hyperlink/extension.ts index 0cd8b498..98fe5803 100644 --- a/src-web/components/core/Editor/hyperlink/extension.ts +++ b/src-web/components/core/Editor/hyperlink/extension.ts @@ -2,7 +2,7 @@ import type { DecorationSet, ViewUpdate } from '@codemirror/view'; import { Decoration, EditorView, hoverTooltip, MatchDecorator, ViewPlugin } from '@codemirror/view'; const REGEX = - /(https?:\/\/(www\.)?[-a-zA-Z0-9@:%._+*~#=]{1,256}\.[a-zA-Z0-9()]{1,6}\b([-a-zA-Z0-9()@:%_+*.~#?&/={}[\]]*))/g; + /(https?:\/\/([-a-zA-Z0-9@:%._+*~#=]{1,256})+(\.[a-zA-Z0-9()]{1,6})?\b([-a-zA-Z0-9()@:%_+*.~#?&/={}[\]]*))/g; const tooltip = hoverTooltip( (view, pos, side) => {