Remove tracking closes #7

Cargo.toml

@@ -7,5 +7,5 @@ members = [
 resolver = "2"
 
 [workspace.package]
-version = "6.2.0"
+version = "6.3.0"
 authors = ["AnnsAnn"]

sphene/src/main.rs

@@ -36,7 +36,9 @@ impl EventHandler for Handler {
         let options: Vec<CreateSelectMenuOption>;
 
         if twitter::is_twitter_url(content.as_str()) {
-            url = twitter::convert_url_lazy(content, twitter::UrlType::Vxtwitter).await;
+            url = twitter::remove_tracking(
+                twitter::convert_url_lazy(content, twitter::UrlType::Vxtwitter).await,
+            );
             options = self.options_twitter.clone();
         } else if bluesky::is_bluesky_url(content.as_str()) {
             url = bluesky::convert_url_lazy(content, bluesky::UrlType::FixBluesky).await;

thorium/src/twitter.rs

@@ -49,6 +49,29 @@ impl UrlType {
     }
 }
 
+pub fn remove_tracking(url: String) -> String {
+    let mut new_url = String::new();
+    for word in url.split_whitespace() {
+        if word.contains('?') && word.contains('=') {
+            let url: &str;
+            if !word.starts_with("https://") && word.contains("https://") {
+                let split = word.split_once("https://").unwrap();
+                url = split.1;
+                new_url.push_str(split.0);
+                new_url.push(' ');
+                new_url.push_str("https://");
+            } else {
+                url = word.split_once('?').unwrap().0;
+            }
+            new_url.push_str(url);
+        } else {
+            new_url.push_str(word);
+        }
+        new_url.push(' ');
+    }
+    new_url.trim().to_string()
+}
+
 pub async fn convert_url(url: String, from: UrlType, to: UrlType) -> String {
     url.replace(from.as_str(), to.as_str())
 }