quantframe: 1.3.4 -> 1.4.3 (#401613)

authored by isabelroses.com and committed by GitHub d429072d 5b804594

+70 -26
+54 -14
pkgs/by-name/qu/quantframe/0001-disable-telemetry.patch
··· 1 1 diff --git a/src-tauri/src/qf_client/modules/analytics.rs b/src-tauri/src/qf_client/modules/analytics.rs 2 - index f6f1209..e08490b 100644 2 + index 3b31cfa..562e0b4 100644 3 3 --- a/src-tauri/src/qf_client/modules/analytics.rs 4 4 +++ b/src-tauri/src/qf_client/modules/analytics.rs 5 - @@ -115,52 +115,6 @@ impl AnalyticsModule { 6 - } 7 - }; 8 - } 5 + @@ -37,7 +37,7 @@ impl AnalyticsModule { 6 + current_page: "home".to_string(), 7 + component: "Analytics".to_string(), 8 + is_init: false, 9 + - send_metrics: true, 10 + + send_metrics: false, 11 + last_user_activity: Arc::new(Mutex::new(Instant::now())), 12 + metricAndLabelPairsScheduledToSend: vec![], 13 + } 14 + @@ -96,69 +96,6 @@ impl AnalyticsModule { 15 + // Create Timer for sending metrics 16 + let mut last_metric_time = Instant::now(); 17 + 18 + - if is_first_install { 19 + - logger::info( 20 + - &&qf.analytics().get_component("init"), 21 + - "Detected first install", 22 + - LoggerOptions::default(), 23 + - ); 24 + - match qf 25 + - .analytics() 26 + - .try_send_analytics("install", 3, json!({})) 27 + - .await 28 + - { 29 + - Ok(_) => {} 30 + - Err(e) => { 31 + - error::create_log_file("analytics.log", &e); 32 + - } 33 + - }; 34 + - } 9 35 - loop { 10 36 - let send_metrics = qf.analytics().send_metrics; 11 37 - if !send_metrics { ··· 22 48 - } 23 49 - 24 50 - last_metric_time = Instant::now(); 25 - - logger::info_con( 26 - - &qf.analytics().get_component("TrySendAnalytics"), 27 - - "Sending user activity", 28 - - ); 51 + - // logger::info_con( 52 + - // &qf.analytics().get_component("TrySendAnalytics"), 53 + - // "Sending user activity", 54 + - // ); 29 55 - match qf 30 56 - .analytics() 31 57 - .try_send_analytics( ··· 43 69 - || e.cause().contains("Banned") 44 70 - || e.cause().contains("WFMBanned") 45 71 - { 46 - - error::create_log_file("analytics.log".to_string(), &e); 72 + - error::create_log_file("analytics.log", &e); 47 73 - break; 48 74 - } 49 - - error::create_log_file("analytics.log".to_string(), &e); 75 + - error::create_log_file("analytics.log", &e); 50 76 - } 51 77 - }; 52 78 - } ··· 55 81 qf.analytics().is_init = false; 56 82 } 57 83 }); 58 - @@ -176,44 +130,6 @@ impl AnalyticsModule { 84 + @@ -174,45 +111,6 @@ impl AnalyticsModule { 59 85 mut retry_count: i64, 60 86 data: Value, 61 87 ) -> Result<(), AppError> { ··· 88 114 - return Err(err); 89 115 - } 90 116 - retry_count -= 1; 91 - - logger::warning_con( 117 + - logger::warning( 92 118 - &self.get_component("TrySendAnalytics"), 93 119 - &format!( 94 120 - "Failed to send analytics, retrying in 5 seconds, retries left: {}", 95 121 - retry_count 96 122 - ), 123 + - LoggerOptions::default(), 97 124 - ); 98 125 - tokio::time::sleep(std::time::Duration::from_secs(5)).await; 99 126 - } 100 127 - Ok(()) 101 - + return Ok(()); 128 + + return Ok(()) 102 129 } 103 130 } 131 + diff --git a/src/contexts/app.context.tsx b/src/contexts/app.context.tsx 132 + index 8b3ced9..5da811f 100644 133 + --- a/src/contexts/app.context.tsx 134 + +++ b/src/contexts/app.context.tsx 135 + @@ -160,7 +160,7 @@ export function AppContextProvider({ children }: AppContextProviderProps) { 136 + const id = context.substring(start, end); 137 + 138 + console.log("OpenTos", settings?.tos_uuid, id); 139 + - if (id == settings?.tos_uuid) return; 140 + + if (true) return; 141 + modals.open({ 142 + title: useTranslateModals("tos.title"), 143 + size: "100%",
+16 -12
pkgs/by-name/qu/quantframe/package.nix
··· 2 2 lib, 3 3 rustPlatform, 4 4 fetchFromGitHub, 5 - cargo-tauri_1, 5 + cargo-tauri, 6 6 nodejs, 7 7 pnpm_9, 8 8 pkg-config, 9 9 glib-networking, 10 10 openssl, 11 - webkitgtk_4_0, 11 + webkitgtk_4_1, 12 12 wrapGAppsHook3, 13 - libsoup_2_4, 13 + libsoup_3, 14 14 libayatana-appindicator, 15 15 gtk3, 16 + nix-update-script, 16 17 }: 17 18 18 19 rustPlatform.buildRustPackage (finalAttrs: { 19 20 pname = "quantframe"; 20 - version = "1.3.4"; 21 + version = "1.4.3"; 21 22 22 23 src = fetchFromGitHub { 23 24 owner = "Kenya-DK"; 24 25 repo = "quantframe-react"; 25 26 tag = "v${finalAttrs.version}"; 26 - hash = "sha256-/cjlYQHb23DY4RSjc2HosTar6p1epsqlWQX6TlrzSe8="; 27 + hash = "sha256-ls6c9xLmjjx0kSh1s+HkdClrcTOvsAemjzqNwMeOd9c="; 27 28 }; 28 29 29 30 postPatch = '' 30 31 substituteInPlace $cargoDepsCopy/libappindicator-sys-*/src/lib.rs \ 31 32 --replace-fail "libayatana-appindicator3.so.1" "${libayatana-appindicator}/lib/libayatana-appindicator3.so.1" 33 + 34 + substituteInPlace src-tauri/tauri.conf.json \ 35 + --replace-fail '"createUpdaterArtifacts": "v1Compatible"' '"createUpdaterArtifacts": false' 32 36 ''; 33 37 34 38 patches = [ ··· 37 41 38 42 pnpmDeps = pnpm_9.fetchDeps { 39 43 inherit (finalAttrs) pname version src; 40 - hash = "sha256-4uyjvwvrMDe+86wcB7MBBWWc4NGKzqBsgG3TScf7BMk="; 44 + hash = "sha256-3IHwwbl1aH3Pzh9xq2Jfev9hj6/LXZaVaIJOPbgsquE="; 41 45 }; 42 46 43 47 useFetchCargoVendor = true; 44 - cargoHash = "sha256-mtHbWTNrWh4hq4IAncE9TCWr7sozIy2zf3DK3WN7wqI="; 48 + cargoHash = "sha256-UyfSmlr+5mWmlisNtjF6jZKx92kdQziG26mgeZtkySY="; 45 49 46 50 nativeBuildInputs = [ 47 - cargo-tauri_1.hook 48 - 51 + cargo-tauri.hook 49 52 pkg-config 50 53 wrapGAppsHook3 51 - 52 54 nodejs 53 55 pnpm_9.configHook 54 56 ]; 55 57 56 58 buildInputs = [ 57 59 openssl 58 - libsoup_2_4 60 + libsoup_3 59 61 glib-networking 60 62 gtk3 61 63 libayatana-appindicator 62 - webkitgtk_4_0 64 + webkitgtk_4_1 63 65 ]; 64 66 65 67 cargoRoot = "src-tauri"; 66 68 buildAndTestSubdir = finalAttrs.cargoRoot; 69 + 70 + passthru.updateScript = nix-update-script { }; 67 71 68 72 meta = { 69 73 description = "Warframe Market listings and transactions manager";