From 8e55ccd5f1fe902c345ea2550ed0278fa4623890 Mon Sep 17 00:00:00 2001
From: mii443 <mii@sfc.wide.ad.jp>
Date: Wed, 25 Sep 2024 01:20:50 +0900
Subject: [PATCH] wip

---
 src-tauri/src/handler.rs | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src-tauri/src/handler.rs b/src-tauri/src/handler.rs
index 66f4765..21eb9a6 100644
--- a/src-tauri/src/handler.rs
+++ b/src-tauri/src/handler.rs
@@ -32,12 +32,12 @@ impl ConversionHandler {
 }
 
 impl ConversionHandler {
-    fn tsf_conversion(&mut self, contents: &str, config: &Config) -> CallbackResult {
+    fn tsf_conversion(&mut self, contents: &str, config: &Config) -> Result<()> {
         if contents.chars().count() > 140 {
-            return CallbackResult::Next;
+            return Ok(());
         }
         if config.skip_url && Regex::new(r"(http://|https://){1}[\w\.\-/:\#\?=\&;%\~\+]+").unwrap().is_match(&contents) {
-            return CallbackResult::Next;
+            return Ok(());
         }
 
         if self.tsf_conversion.is_none() {
@@ -48,7 +48,7 @@ impl ConversionHandler {
 
         let tsf_conversion = self.tsf_conversion.as_mut().unwrap();
 
-        let converted = tsf_conversion.convert(contents).unwrap_or("Failed to convert".to_string());
+        let converted = tsf_conversion.convert(contents)?;
 
         println!("TSF conversion: {} -> {}", contents, converted);
 
@@ -56,7 +56,7 @@ impl ConversionHandler {
 
         self.return_conversion(contents.to_string(), converted, config);
 
-        CallbackResult::Next
+        Ok(())
     }
 
     fn return_conversion(&mut self, parsed_contents: String, converted: String, config: &Config) {
@@ -115,7 +115,8 @@ impl ClipboardHandler for ConversionHandler {
         let config = self.get_config();
         if let Ok(mut contents) = self.clipboard_ctx.get_contents() {
             if config.use_tsf_reconvert {
-                return self.tsf_conversion(&contents, &config);
+                self.tsf_conversion(&contents, &config).expect("TSF conversion failed.");
+                return CallbackResult::Next;
             }
 
             if contents != self.last_text {