tweak url alike checking

Author: kybe236

src/app/tile/update.rs

@@ -35,7 +35,7 @@ use crate::config::Config;
 use crate::unit_conversion;
 use crate::utils::get_installed_apps;
 
-use crate::utils::is_valid_url;
+use crate::utils::is_url_like;
 #[cfg(target_os = "macos")]
 use crate::{
     cross_platform::macos::focus_this_app,
@@ -468,7 +468,7 @@ pub fn handle_update(tile: &mut Tile, message: Message) -> Task<Message> {
                         }
                     })
                     .collect();
-            } else if tile.results.is_empty() && is_valid_url(&tile.query) {
+            } else if tile.results.is_empty() && is_url_like(&tile.query) {
                 tile.results.push(App {
                     open_command: AppCommand::Function(Function::OpenWebsite(tile.query.clone())),
                     desc: "Web Browsing".to_string(),

src/commands.rs

@@ -1,7 +1,7 @@
 //! This handles all the different commands that rustcast can perform, such as opening apps,
 //! copying to clipboard, etc.
 use std::process::Command;
-#[cfg(any(target_os = "macos", target_os = "linux"))]
+#[cfg(target_os = "macos")]
 use std::thread;
 
 use arboard::Clipboard;
@@ -59,25 +59,6 @@ impl Function {
                 let query = query.strip_suffix("?").unwrap_or(&query).to_string();
 
                 cross_platform::open_url(&query);
-
-                #[cfg(target_os = "macos")]
-                NSWorkspace::new().openURL(
-                    &NSURL::URLWithString_relativeToURL(
-                        &objc2_foundation::NSString::from_str(&query),
-                        None,
-                    )
-                    .unwrap(),
-                );
-
-                #[cfg(target_os = "linux")]
-                thread::spawn(move || {
-                    Command::new("xdg-open")
-                        .arg(query)
-                        .spawn()
-                        .unwrap()
-                        .wait()
-                        .unwrap();
-                });
             }
 
             Function::OpenWebsite(url) => {

src/utils.rs

@@ -218,16 +218,30 @@ pub fn get_installed_apps(config: &Config) -> Vec<App> {
     }
 }
 
-/// Check if the provided string is a valid url
-pub fn is_valid_url(s: &str) -> bool {
-    s.ends_with(".com")
-        || s.ends_with(".net")
-        || s.ends_with(".org")
-        || s.ends_with(".edu")
-        || s.ends_with(".gov")
-        || s.ends_with(".io")
-        || s.ends_with(".co")
-        || s.ends_with(".me")
-        || s.ends_with(".app")
-        || s.ends_with(".dev")
+/// Check if the provided string looks like a valid url
+pub fn is_url_like(s: &str) -> bool {
+    if s.starts_with("http://") || s.starts_with("https://") {
+        return true;
+    }
+    if !s.contains('.') {
+        return false;
+    }
+    let mut parts = s.split('.');
+
+    let tld = match parts.next_back() {
+        Some(p) => p,
+        None => return false,
+    };
+
+    if tld.is_empty() || tld.len() > 63 || !tld.chars().all(|c| c.is_ascii_alphabetic()) {
+        return false;
+    }
+
+    parts.all(|label| {
+        !label.is_empty()
+            && label.len() <= 63
+            && label.chars().all(|c| c.is_ascii_alphanumeric() || c == '-')
+            && !label.starts_with('-')
+            && !label.ends_with('-')
+    })
 }