feat: use paste.hep.gg:

src-tauri/Cargo.lock

@@ -109,6 +109,7 @@ dependencies = [
  "tauri-plugin-notification",
  "tauri-plugin-os",
  "tauri-plugin-updater",
+ "thiserror 2.0.12",
  "tokio",
  "tokio-macros",
 ]

src-tauri/Cargo.toml

@@ -30,6 +30,7 @@ tauri-plugin-notification = { version = "2.2.1" }
 tauri-plugin-updater = { version = "2.2.1" }
 tauri-plugin-log =  { version = "2.2.1" }
 log = "0.4.27"
+thiserror = "2.0.12"
 
 [features]
 # this feature is used for production builds or when `devPath` points to the filesystem and the built-in dev server is disabled.

src-tauri/src/handlers/fansly/mod.rs

@@ -10,6 +10,7 @@ use reqwest::header::{HeaderMap, HeaderValue, USER_AGENT};
 use serde::{Deserialize, Serialize};
 use serde_json::Value;
 use tokio::sync::Mutex;
+use thiserror::Error;
 
 // Create a PROGRESS mutex to hold the current sync progress, lazy initialized
 lazy_static! {
@@ -26,11 +27,32 @@ pub struct SyncProgress {
     pub complete: bool,
 }
 
+#[derive(Default, Debug, Clone, PartialEq, Serialize, Deserialize)]
+pub struct PasteData {
+    id: String,
+    content: String,
+}
+
+#[derive(Default, Debug, Clone, PartialEq, Serialize, Deserialize)]
+pub struct PasteResponse {
+    error: Option<String>,
+    payload: PasteData,
+}
+
 pub struct Fansly {
     client: reqwest::Client,
     token: Option<String>,
 }
 
+#[derive(Debug, Error)]
+pub enum UploadError {
+    #[error("HTTP error: {0}")]
+    Http(#[from] reqwest::Error),
+
+    #[error("Failed to get UUID from paste.hep.gg URL")]
+    MissingUuid,
+}
+
 impl Fansly {
     pub fn new(token: Option<String>) -> Self {
         let mut headers = HeaderMap::new();
@@ -38,7 +60,7 @@ impl Fansly {
         // Set the user agent to the FanslySync/0.1.0 tanner@fanslycreatorbot.com
         headers.insert(
             USER_AGENT,
-            HeaderValue::from_static("FanslySync/0.1.0 tanner@fanslycreatorbot.com"),
+            HeaderValue::from_static("FanslySync/0.1.0 tanner@fanslycreatorbot.com"), // this sucks, oh well
         );
 
         // If we have a token, add it to the headers\
@@ -209,20 +231,14 @@ impl Fansly {
     }
 
 
-    async fn upload_sync_data(&self, data: SyncDataResponse) -> Result<String, reqwest::Error> {
-        let url = "https://paste.fanslycreatorbot.com";
+    async fn upload_sync_data(&self, data: SyncDataResponse) -> Result<String, UploadError> {
+        let url = "https://paste.hep.gg/";
 
         // Convert passed data to bytes
         let json_string = serde_json::to_string(&data).unwrap();
-        let data_as_bytes = json_string.as_bytes();
 
         let form = reqwest::multipart::Form::new()
-            .part(
-                "file",
-                reqwest::multipart::Part::bytes(data_as_bytes.to_vec())
-                    .file_name("sync_data.json")
-                    .mime_str("application/json")?,
-            );
+            .text("content", json_string);
 
         // Create a new client and POST
         let response = self
@@ -235,12 +251,23 @@ impl Fansly {
         if !response.status().is_success() {
             log::error!("Failed to upload sync data...");
             log::info!("Response: {:?}", response);
-            return Err(response.error_for_status().unwrap_err());
+            return Err(UploadError::from(response.error_for_status().unwrap_err()));
         }
 
-        let reply = response.text().await?;
-        log::info!("Uploaded sync data successfully. Response: {}", reply);
-        Ok(reply)
+        log::info!("Uploaded sync data successfully.");
+
+        // Get the response URL from the response
+        let url = response.url();
+
+        // Grab the UUID from the URL
+        let uuid = url.path_segments()
+            .and_then(|segments| segments.last())
+            .ok_or(UploadError::MissingUuid)?;
+
+        log::info!("Sync data uploaded to paste.hep.gg with UUID: {}", uuid);
+
+        // Return the URL of the uploaded data
+        Ok(format!("https://paste.hep.gg/api/{}/raw", uuid))
     }
 
     pub async fn upload_auto_sync_data(

src-tauri/tauri.conf.json

@@ -59,7 +59,7 @@
 				"height": 650,
 				"resizable": false,
 				"title": "FanslySync",
-				"width": 600
+				"width": 630
 			}
 		],
 		"security": {

src/routes/home/+page.svelte

@@ -837,13 +837,22 @@
 	<!-- Create a Little bar that animates up when a sync is running -->
 	{#if syncState.show}
 		<div
-			class={`fixed bottom-0 left-0 right-0  text-white p-4
-			${syncState.syncing ? 'bg-blue-500' : syncState.success ? 'bg-green-500' : 'bg-red-500'}
-		
-		`}
+			class="fixed bottom-0 left-0 right-0 h-16 overflow-hidden"
 			transition:slide={{ duration: 500 }}
 		>
-			<div class="flex items-center">
+			<div class="absolute inset-0 bg-blue-900"></div>
+
+			<div
+				class={`absolute inset-y-0 left-0 transition-all duration-500 ease-in-out
+        ${syncState.syncing   ? 'bg-blue-500'
+        : syncState.success   ? 'bg-green-500'
+                              : 'bg-red-500'}`}
+				style="width: {syncState.syncing
+        ? `${syncProgress.percentage}%`
+        : '100%'};"
+			></div>
+
+			<div class="relative z-10 flex items-center h-full  text-white">
 				{#if !syncState.success && !syncState.error}
 					<!-- Add loading spinner -->
 					<svg
@@ -871,11 +880,10 @@
 					</div>
 				{:else if syncState.success}
 					<!-- Add Success title and status subtitle below it -->
-					<div class="flex flex-col">
+					<div class="flex flex-col px-2">
 						<h1 class="text-lg font-bold">Sync Successful!</h1>
 						<p class="text-sm">
-							Data synced successfully. Please run the import with the following link {syncState.url}
-							to import the data.
+							Data synced successfully. Use the copy button to copy the sync URL to your clipboard.
 						</p>
 					</div>
 
@@ -900,7 +908,7 @@
 					</div>
 				{:else}
 					<!-- Add Error title and status subtitle below it -->
-					<div class="flex flex-col">
+					<div class="flex flex-col px-2">
 						<h1 class="text-lg font-bold">Sync Failed!</h1>
 						<p class="text-sm">
 							An error occurred while syncing your data. Details: {syncState.message}