Loading pkgs/by-name/qu/quantframe/0001-disable-telemetry.patch +54 −14 Original line number Diff line number Diff line diff --git a/src-tauri/src/qf_client/modules/analytics.rs b/src-tauri/src/qf_client/modules/analytics.rs index f6f1209..e08490b 100644 index 3b31cfa..562e0b4 100644 --- a/src-tauri/src/qf_client/modules/analytics.rs +++ b/src-tauri/src/qf_client/modules/analytics.rs @@ -115,52 +115,6 @@ impl AnalyticsModule { } }; @@ -37,7 +37,7 @@ impl AnalyticsModule { current_page: "home".to_string(), component: "Analytics".to_string(), is_init: false, - send_metrics: true, + send_metrics: false, last_user_activity: Arc::new(Mutex::new(Instant::now())), metricAndLabelPairsScheduledToSend: vec![], } @@ -96,69 +96,6 @@ impl AnalyticsModule { // Create Timer for sending metrics let mut last_metric_time = Instant::now(); - if is_first_install { - logger::info( - &&qf.analytics().get_component("init"), - "Detected first install", - LoggerOptions::default(), - ); - match qf - .analytics() - .try_send_analytics("install", 3, json!({})) - .await - { - Ok(_) => {} - Err(e) => { - error::create_log_file("analytics.log", &e); - } - }; - } - loop { - let send_metrics = qf.analytics().send_metrics; - if !send_metrics { Loading @@ -22,10 +48,10 @@ index f6f1209..e08490b 100644 - } - - last_metric_time = Instant::now(); - logger::info_con( - &qf.analytics().get_component("TrySendAnalytics"), - "Sending user activity", - ); - // logger::info_con( - // &qf.analytics().get_component("TrySendAnalytics"), - // "Sending user activity", - // ); - match qf - .analytics() - .try_send_analytics( Loading @@ -43,10 +69,10 @@ index f6f1209..e08490b 100644 - || e.cause().contains("Banned") - || e.cause().contains("WFMBanned") - { - error::create_log_file("analytics.log".to_string(), &e); - error::create_log_file("analytics.log", &e); - break; - } - error::create_log_file("analytics.log".to_string(), &e); - error::create_log_file("analytics.log", &e); - } - }; - } Loading @@ -55,7 +81,7 @@ index f6f1209..e08490b 100644 qf.analytics().is_init = false; } }); @@ -176,44 +130,6 @@ impl AnalyticsModule { @@ -174,45 +111,6 @@ impl AnalyticsModule { mut retry_count: i64, data: Value, ) -> Result<(), AppError> { Loading Loading @@ -88,16 +114,30 @@ index f6f1209..e08490b 100644 - return Err(err); - } - retry_count -= 1; - logger::warning_con( - logger::warning( - &self.get_component("TrySendAnalytics"), - &format!( - "Failed to send analytics, retrying in 5 seconds, retries left: {}", - retry_count - ), - LoggerOptions::default(), - ); - tokio::time::sleep(std::time::Duration::from_secs(5)).await; - } - Ok(()) + return Ok(()); + return Ok(()) } } diff --git a/src/contexts/app.context.tsx b/src/contexts/app.context.tsx index 8b3ced9..5da811f 100644 --- a/src/contexts/app.context.tsx +++ b/src/contexts/app.context.tsx @@ -160,7 +160,7 @@ export function AppContextProvider({ children }: AppContextProviderProps) { const id = context.substring(start, end); console.log("OpenTos", settings?.tos_uuid, id); - if (id == settings?.tos_uuid) return; + if (true) return; modals.open({ title: useTranslateModals("tos.title"), size: "100%", pkgs/by-name/qu/quantframe/package.nix +16 −12 Original line number Diff line number Diff line Loading @@ -2,33 +2,37 @@ lib, rustPlatform, fetchFromGitHub, cargo-tauri_1, cargo-tauri, nodejs, pnpm_9, pkg-config, glib-networking, openssl, webkitgtk_4_0, webkitgtk_4_1, wrapGAppsHook3, libsoup_2_4, libsoup_3, libayatana-appindicator, gtk3, nix-update-script, }: rustPlatform.buildRustPackage (finalAttrs: { pname = "quantframe"; version = "1.3.4"; version = "1.4.3"; src = fetchFromGitHub { owner = "Kenya-DK"; repo = "quantframe-react"; tag = "v${finalAttrs.version}"; hash = "sha256-/cjlYQHb23DY4RSjc2HosTar6p1epsqlWQX6TlrzSe8="; hash = "sha256-ls6c9xLmjjx0kSh1s+HkdClrcTOvsAemjzqNwMeOd9c="; }; postPatch = '' substituteInPlace $cargoDepsCopy/libappindicator-sys-*/src/lib.rs \ --replace-fail "libayatana-appindicator3.so.1" "${libayatana-appindicator}/lib/libayatana-appindicator3.so.1" substituteInPlace src-tauri/tauri.conf.json \ --replace-fail '"createUpdaterArtifacts": "v1Compatible"' '"createUpdaterArtifacts": false' ''; patches = [ Loading @@ -37,34 +41,34 @@ rustPlatform.buildRustPackage (finalAttrs: { pnpmDeps = pnpm_9.fetchDeps { inherit (finalAttrs) pname version src; hash = "sha256-4uyjvwvrMDe+86wcB7MBBWWc4NGKzqBsgG3TScf7BMk="; hash = "sha256-3IHwwbl1aH3Pzh9xq2Jfev9hj6/LXZaVaIJOPbgsquE="; }; useFetchCargoVendor = true; cargoHash = "sha256-mtHbWTNrWh4hq4IAncE9TCWr7sozIy2zf3DK3WN7wqI="; cargoHash = "sha256-UyfSmlr+5mWmlisNtjF6jZKx92kdQziG26mgeZtkySY="; nativeBuildInputs = [ cargo-tauri_1.hook cargo-tauri.hook pkg-config wrapGAppsHook3 nodejs pnpm_9.configHook ]; buildInputs = [ openssl libsoup_2_4 libsoup_3 glib-networking gtk3 libayatana-appindicator webkitgtk_4_0 webkitgtk_4_1 ]; cargoRoot = "src-tauri"; buildAndTestSubdir = finalAttrs.cargoRoot; passthru.updateScript = nix-update-script { }; meta = { description = "Warframe Market listings and transactions manager"; mainProgram = "quantframe"; Loading Loading
pkgs/by-name/qu/quantframe/0001-disable-telemetry.patch +54 −14 Original line number Diff line number Diff line diff --git a/src-tauri/src/qf_client/modules/analytics.rs b/src-tauri/src/qf_client/modules/analytics.rs index f6f1209..e08490b 100644 index 3b31cfa..562e0b4 100644 --- a/src-tauri/src/qf_client/modules/analytics.rs +++ b/src-tauri/src/qf_client/modules/analytics.rs @@ -115,52 +115,6 @@ impl AnalyticsModule { } }; @@ -37,7 +37,7 @@ impl AnalyticsModule { current_page: "home".to_string(), component: "Analytics".to_string(), is_init: false, - send_metrics: true, + send_metrics: false, last_user_activity: Arc::new(Mutex::new(Instant::now())), metricAndLabelPairsScheduledToSend: vec![], } @@ -96,69 +96,6 @@ impl AnalyticsModule { // Create Timer for sending metrics let mut last_metric_time = Instant::now(); - if is_first_install { - logger::info( - &&qf.analytics().get_component("init"), - "Detected first install", - LoggerOptions::default(), - ); - match qf - .analytics() - .try_send_analytics("install", 3, json!({})) - .await - { - Ok(_) => {} - Err(e) => { - error::create_log_file("analytics.log", &e); - } - }; - } - loop { - let send_metrics = qf.analytics().send_metrics; - if !send_metrics { Loading @@ -22,10 +48,10 @@ index f6f1209..e08490b 100644 - } - - last_metric_time = Instant::now(); - logger::info_con( - &qf.analytics().get_component("TrySendAnalytics"), - "Sending user activity", - ); - // logger::info_con( - // &qf.analytics().get_component("TrySendAnalytics"), - // "Sending user activity", - // ); - match qf - .analytics() - .try_send_analytics( Loading @@ -43,10 +69,10 @@ index f6f1209..e08490b 100644 - || e.cause().contains("Banned") - || e.cause().contains("WFMBanned") - { - error::create_log_file("analytics.log".to_string(), &e); - error::create_log_file("analytics.log", &e); - break; - } - error::create_log_file("analytics.log".to_string(), &e); - error::create_log_file("analytics.log", &e); - } - }; - } Loading @@ -55,7 +81,7 @@ index f6f1209..e08490b 100644 qf.analytics().is_init = false; } }); @@ -176,44 +130,6 @@ impl AnalyticsModule { @@ -174,45 +111,6 @@ impl AnalyticsModule { mut retry_count: i64, data: Value, ) -> Result<(), AppError> { Loading Loading @@ -88,16 +114,30 @@ index f6f1209..e08490b 100644 - return Err(err); - } - retry_count -= 1; - logger::warning_con( - logger::warning( - &self.get_component("TrySendAnalytics"), - &format!( - "Failed to send analytics, retrying in 5 seconds, retries left: {}", - retry_count - ), - LoggerOptions::default(), - ); - tokio::time::sleep(std::time::Duration::from_secs(5)).await; - } - Ok(()) + return Ok(()); + return Ok(()) } } diff --git a/src/contexts/app.context.tsx b/src/contexts/app.context.tsx index 8b3ced9..5da811f 100644 --- a/src/contexts/app.context.tsx +++ b/src/contexts/app.context.tsx @@ -160,7 +160,7 @@ export function AppContextProvider({ children }: AppContextProviderProps) { const id = context.substring(start, end); console.log("OpenTos", settings?.tos_uuid, id); - if (id == settings?.tos_uuid) return; + if (true) return; modals.open({ title: useTranslateModals("tos.title"), size: "100%",
pkgs/by-name/qu/quantframe/package.nix +16 −12 Original line number Diff line number Diff line Loading @@ -2,33 +2,37 @@ lib, rustPlatform, fetchFromGitHub, cargo-tauri_1, cargo-tauri, nodejs, pnpm_9, pkg-config, glib-networking, openssl, webkitgtk_4_0, webkitgtk_4_1, wrapGAppsHook3, libsoup_2_4, libsoup_3, libayatana-appindicator, gtk3, nix-update-script, }: rustPlatform.buildRustPackage (finalAttrs: { pname = "quantframe"; version = "1.3.4"; version = "1.4.3"; src = fetchFromGitHub { owner = "Kenya-DK"; repo = "quantframe-react"; tag = "v${finalAttrs.version}"; hash = "sha256-/cjlYQHb23DY4RSjc2HosTar6p1epsqlWQX6TlrzSe8="; hash = "sha256-ls6c9xLmjjx0kSh1s+HkdClrcTOvsAemjzqNwMeOd9c="; }; postPatch = '' substituteInPlace $cargoDepsCopy/libappindicator-sys-*/src/lib.rs \ --replace-fail "libayatana-appindicator3.so.1" "${libayatana-appindicator}/lib/libayatana-appindicator3.so.1" substituteInPlace src-tauri/tauri.conf.json \ --replace-fail '"createUpdaterArtifacts": "v1Compatible"' '"createUpdaterArtifacts": false' ''; patches = [ Loading @@ -37,34 +41,34 @@ rustPlatform.buildRustPackage (finalAttrs: { pnpmDeps = pnpm_9.fetchDeps { inherit (finalAttrs) pname version src; hash = "sha256-4uyjvwvrMDe+86wcB7MBBWWc4NGKzqBsgG3TScf7BMk="; hash = "sha256-3IHwwbl1aH3Pzh9xq2Jfev9hj6/LXZaVaIJOPbgsquE="; }; useFetchCargoVendor = true; cargoHash = "sha256-mtHbWTNrWh4hq4IAncE9TCWr7sozIy2zf3DK3WN7wqI="; cargoHash = "sha256-UyfSmlr+5mWmlisNtjF6jZKx92kdQziG26mgeZtkySY="; nativeBuildInputs = [ cargo-tauri_1.hook cargo-tauri.hook pkg-config wrapGAppsHook3 nodejs pnpm_9.configHook ]; buildInputs = [ openssl libsoup_2_4 libsoup_3 glib-networking gtk3 libayatana-appindicator webkitgtk_4_0 webkitgtk_4_1 ]; cargoRoot = "src-tauri"; buildAndTestSubdir = finalAttrs.cargoRoot; passthru.updateScript = nix-update-script { }; meta = { description = "Warframe Market listings and transactions manager"; mainProgram = "quantframe"; Loading