fix(other): apply cache-first strategy to accelerate folder browsing

Author: IrAlfred

.env.example

@@ -56,7 +56,7 @@ REDIS_SERVER='127.0.0.1'
 REDIS_PORT=6379
 REDIS_INDEX=1
 REDIS_PASS=
-REDIS_SOCKET=/var/run/redis/redis-server.sock
+REDIS_SOCKET=
 
 ENABLE_MEMCACHED=true
 MEMCACHED_SERVER='127.0.0.1'

config/app.php

@@ -454,7 +454,7 @@
 
     'redis_pass' => env('REDIS_PASS'),
 
-    'redis_socket' => env('REDIS_SOCKET', '/var/run/redis/redis-server.sock'),
+    'redis_socket' => env('REDIS_SOCKET', ''),
 
     /*
     | -----------------

modules/imap/handler_modules.php

@@ -650,13 +650,25 @@ public function process() {
                 $folder = $this->request->post['folder'];
             }
             $path = sprintf("imap_%s_%s", $form['imap_server_id'], $folder);
-            $page_cache = $this->cache->get('imap_folders_'.$path);
+            $with_subscription = isset($this->request->post['subscription_state']) && $this->request->post['subscription_state'];
+
             if (array_key_exists('imap_prefetch', $this->request->post)) {
                 $prefetched = $this->session->get('imap_prefetched_ids', array());
                 $prefetched[] = $form['imap_server_id'];
                 $this->session->set('imap_prefetched_ids', array_unique($prefetched, SORT_STRING));
             }
-            $with_subscription = isset($this->request->post['subscription_state']) && $this->request->post['subscription_state'];
+
+            // Check cache FIRST before connecting to IMAP
+            $page_cache = $this->cache->get('imap_folders_'.$path);
+            if ($page_cache) {
+                $this->out('imap_expanded_folder_data', $page_cache);
+                $this->out('imap_expanded_folder_id', $form['imap_server_id']);
+                $this->out('imap_expanded_folder_path', $path);
+                $this->out('with_input', $with_subscription);
+                $this->out('folder', $folder);
+                return;
+            }
+
             $mailbox = Hm_IMAP_List::get_connected_mailbox($form['imap_server_id'], $this->cache);
             if ($mailbox && $mailbox->authed()) {
                 $this->out('can_share_folders', stripos($mailbox->get_capability(), 'ACL') !== false);
@@ -673,14 +685,6 @@ public function process() {
                     }
                 }
             }
-            if ($page_cache) {
-                $this->out('imap_expanded_folder_data', $page_cache);
-                $this->out('imap_expanded_folder_id', $form['imap_server_id']);
-                $this->out('imap_expanded_folder_path', $path);
-                $this->out('with_input', $with_subscription);
-                $this->out('folder', $folder);
-                return;
-            }
             if ($mailbox && $mailbox->authed()) {
                 $only_subscribed = $this->user_config->get('only_subscribed_folders_setting', false);
                 if ($with_subscription) {