More app fixes 0.9.0 (#3054)

* initial set of fixes (toggle sidebar, profile pagination)

* more fixes, bump version

* fix lint:

* fix quick switcher ordering

apps/app/src/api/ads.rs

@@ -8,6 +8,7 @@ use tokio::sync::RwLock;
 
 pub struct AdsState {
     pub shown: bool,
+    pub modal_shown: bool,
     pub last_click: Option<Instant>,
     pub malicious_origins: HashSet<String>,
 }
@@ -19,6 +20,7 @@ pub fn init<R: Runtime>() -> TauriPlugin<R> {
         .setup(|app, _api| {
             app.manage(RwLock::new(AdsState {
                 shown: true,
+                modal_shown: false,
                 last_click: None,
                 malicious_origins: HashSet::new(),
             }));
@@ -86,6 +88,10 @@ pub async fn init_ads_window<R: Runtime>(
         state.shown = true;
     }
 
+    if state.modal_shown {
+        return Ok(());
+    }
+
     if let Ok((position, size)) = get_webview_position(&app, dpr) {
         if let Some(webview) = app.webviews().get("ads-window") {
             if state.shown {
@@ -133,7 +139,9 @@ pub async fn show_ads_window<R: Runtime>(
 ) -> crate::api::Result<()> {
     if let Some(webview) = app.webviews().get("ads-window") {
         let state = app.state::<RwLock<AdsState>>();
-        let state = state.read().await;
+        let mut state = state.write().await;
+
+        state.modal_shown = false;
 
         if state.shown {
             let (position, size) = get_webview_position(&app, dpr)?;
@@ -151,11 +159,13 @@ pub async fn hide_ads_window<R: Runtime>(
     reset: Option<bool>,
 ) -> crate::api::Result<()> {
     if let Some(webview) = app.webviews().get("ads-window") {
-        if reset.unwrap_or(false) {
-            let state = app.state::<RwLock<AdsState>>();
-            let mut state = state.write().await;
+        let state = app.state::<RwLock<AdsState>>();
+        let mut state = state.write().await;
 
+        if reset.unwrap_or(false) {
             state.shown = false;
+        } else {
+            state.modal_shown = true;
         }
 
         let _ = webview.set_position(PhysicalPosition::new(-1000, -1000));

apps/app/src/macos/window_ext.rs

@@ -7,7 +7,7 @@ use tauri::{
 }; // 0.8
 
 const WINDOW_CONTROL_PAD_X: f64 = 9.0;
-const WINDOW_CONTROL_PAD_Y: f64 = 16.0;
+const WINDOW_CONTROL_PAD_Y: f64 = 10.0;
 
 struct UnsafeWindowHandle(*mut std::ffi::c_void);
 unsafe impl Send for UnsafeWindowHandle {}

apps/app/src/main.rs

@@ -25,6 +25,7 @@ extern crate objc;
 #[tracing::instrument(skip_all)]
 #[tauri::command]
 async fn initialize_state(app: tauri::AppHandle) -> api::Result<()> {
+    tracing::info!("Initializing app event state...");
     theseus::EventState::init(app.clone()).await?;
 
     #[cfg(feature = "updater")]
@@ -35,6 +36,7 @@ async fn initialize_state(app: tauri::AppHandle) -> api::Result<()> {
 
         let update_fut = updater.check();
 
+        tracing::info!("Initializing app state...");
         State::init().await?;
 
         let check_bar = theseus::init_loading(
@@ -44,6 +46,7 @@ async fn initialize_state(app: tauri::AppHandle) -> api::Result<()> {
         )
         .await?;
 
+        tracing::info!("Checking for updates...");
         let update = update_fut.await;
 
         drop(check_bar);
@@ -88,6 +91,7 @@ async fn initialize_state(app: tauri::AppHandle) -> api::Result<()> {
         State::init().await?;
     }
 
+    tracing::info!("Finished checking for updates!");
     let state = State::get().await?;
     app.asset_protocol_scope()
         .allow_directory(state.directories.caches_dir(), true)?;
@@ -169,19 +173,19 @@ fn main() {
     }
 
     builder = builder
-        //         .plugin(tauri_plugin_single_instance::init(|app, args, _cwd| {
-        //             if let Some(payload) = args.get(1) {
-        //                 tracing::info!("Handling deep link from arg {payload}");
-        //                 let payload = payload.clone();
-        //                 tauri::async_runtime::spawn(api::utils::handle_command(
-        //                     payload,
-        //                 ));
-        //             }
-        //
-        //             if let Some(win) = app.get_window("main") {
-        //                 let _ = win.set_focus();
-        //             }
-        //         }))
+        .plugin(tauri_plugin_single_instance::init(|app, args, _cwd| {
+            if let Some(payload) = args.get(1) {
+                tracing::info!("Handling deep link from arg {payload}");
+                let payload = payload.clone();
+                tauri::async_runtime::spawn(api::utils::handle_command(
+                    payload,
+                ));
+            }
+
+            if let Some(win) = app.get_window("main") {
+                let _ = win.set_focus();
+            }
+        }))
         .plugin(tauri_plugin_os::init())
         .plugin(tauri_plugin_dialog::init())
         .plugin(tauri_plugin_deep_link::init())
@@ -274,6 +278,7 @@ fn main() {
         builder = builder.plugin(macos::window_ext::init());
     }
 
+    tracing::info!("Initializing app...");
     let app = builder.build(tauri::generate_context!());
 
     match app {
@@ -335,6 +340,7 @@ fn main() {
                 .show_alert()
                 .unwrap();
 
+            tracing::error!("Error while running tauri application: {:?}", e);
             panic!("{1}: {:?}", e, "error while running tauri application")
         }
     }