From 4f927bbe6411fdc0703e6fe6743a80de9873cd0d Mon Sep 17 00:00:00 2001
From: Manos Pitsidianakis <manos@pitsidianak.is>
Date: Wed, 25 Sep 2024 11:47:42 +0300
Subject: [PATCH] nntp: properly return all nntp mailboxes

Previously only mailboxes specified in the configuration were fetched.
Now, all groups returned by `LIST ACTIVE` are examined with the
`is_subscribed` function.

Signed-off-by: Manos Pitsidianakis <manos@pitsidianak.is>
---
 melib/src/backends.rs |  1 +
 melib/src/nntp/mod.rs | 37 ++++++++++++++++++++++++++++++++++---
 2 files changed, 35 insertions(+), 3 deletions(-)

diff --git a/melib/src/backends.rs b/melib/src/backends.rs
index 584cd521..1ca1071c 100644
--- a/melib/src/backends.rs
+++ b/melib/src/backends.rs
@@ -43,6 +43,7 @@ pub mod prelude {
         sync::Arc,
     };
 
+    pub use indexmap::{self, IndexMap, IndexSet};
     pub use smallvec::{self, SmallVec};
 
     pub use super::{
diff --git a/melib/src/nntp/mod.rs b/melib/src/nntp/mod.rs
index a7886e4d..02424239 100644
--- a/melib/src/nntp/mod.rs
+++ b/melib/src/nntp/mod.rs
@@ -129,7 +129,7 @@ pub struct UIDStore {
 
     pub collection: Collection,
     pub store: Arc<FutureMutex<Option<store::Store>>>,
-    pub mailboxes: Arc<FutureMutex<HashMap<MailboxHash, NntpMailbox>>>,
+    pub mailboxes: Arc<FutureMutex<IndexMap<MailboxHash, NntpMailbox>>>,
     pub is_online: Arc<FutureMutex<(Instant, Result<()>)>>,
     pub is_subscribed: IsSubscribedFn,
     pub event_consumer: BackendEventConsumer,
@@ -706,7 +706,7 @@ impl NntpType {
         };
         let account_hash = AccountHash::from_bytes(s.name.as_bytes());
         let account_name = s.name.to_string().into();
-        let mut mailboxes = HashMap::default();
+        let mut mailboxes = IndexMap::default();
         for (k, _f) in s.mailboxes.iter() {
             let mailbox_hash = MailboxHash::from_bytes(k.as_bytes());
             mailboxes.insert(
@@ -804,7 +804,7 @@ impl NntpType {
             let mut mailboxes_lck = conn.uid_store.mailboxes.lock().await;
             for l in res.split_rn().skip(1) {
                 let s = l.split_whitespace().collect::<SmallVec<[&str; 4]>>();
-                if s.len() != 3 {
+                if s.len() != 4 {
                     continue;
                 }
                 let mailbox_hash = MailboxHash::from_bytes(s[0].as_bytes());
@@ -814,6 +814,37 @@ impl NntpType {
                 });
             }
         }
+        // Ok, done collecting information about groups specified in configuration. Now
+        // retrieve all other groups:
+        conn.send_command(b"LIST ACTIVE").await?;
+        conn.read_response(&mut res, true, &["215 "])
+            .await
+            .chain_err_summary(|| {
+                format!(
+                    "Could not get newsgroups {}: expected LIST ACTIVE response but got: {}",
+                    &conn.uid_store.account_name, res
+                )
+            })
+            .chain_err_kind(ErrorKind::ProtocolError)?;
+        let mut mailboxes_lck = conn.uid_store.mailboxes.lock().await;
+        for l in res.split_rn().skip(1) {
+            let s = l.split_whitespace().collect::<SmallVec<[&str; 4]>>();
+            if s.is_empty() || s.len() != 4 || !(conn.uid_store.is_subscribed)(s[0]) {
+                continue;
+            }
+            let mailbox_hash = MailboxHash::from_bytes(s[0].as_bytes());
+            mailboxes_lck
+                .entry(mailbox_hash)
+                .or_insert_with(|| NntpMailbox {
+                    hash: mailbox_hash,
+                    nntp_path: s[0].to_string(),
+                    high_watermark: Arc::new(Mutex::new(usize::from_str(s[1]).unwrap_or(0))),
+                    low_watermark: Arc::new(Mutex::new(usize::from_str(s[2]).unwrap_or(0))),
+                    latest_article: Arc::new(Mutex::new(None)),
+                    exists: Default::default(),
+                    unseen: Default::default(),
+                });
+        }
         Ok(())
     }