diff --git a/Cargo.lock b/Cargo.lock index b71db19..874e505 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1245,7 +1245,7 @@ dependencies = [ [[package]] name = "email-lib" version = "0.25.0" -source = "git+https://git.sr.ht/~soywod/pimalaya#f2b429db2839ddef9e4c496def386062339b437b" +source = "git+https://github.com/pimalaya/core#d61f0e9c6fb26abd0d7f104e6839fcd02ef423bc" dependencies = [ "async-trait", "chrono", @@ -2209,7 +2209,7 @@ dependencies = [ [[package]] name = "imap-client" version = "0.1.4" -source = "git+https://github.com/soywod/imap-client#a6eea6f2310ffdc59f27070b0a062604ad9c0f9e" +source = "git+https://github.com/pimalaya/imap-client#02d6bce5513c8ec6ac3aff0e7b13ce4ae87dbe1f" dependencies = [ "imap-next", "once_cell", @@ -2223,7 +2223,7 @@ dependencies = [ [[package]] name = "imap-codec" version = "2.0.0-alpha.4" -source = "git+https://github.com/soywod/imap-codec#7f5d0918b96a4198811eb73ea12e1a42f43f955b" +source = "git+https://github.com/duesee/imap-codec#fff8355ad0f7133be9e58919be5a6f05f684d421" dependencies = [ "abnf-core", "base64 0.22.1", @@ -2250,7 +2250,7 @@ dependencies = [ [[package]] name = "imap-types" version = "2.0.0-alpha.3" -source = "git+https://github.com/soywod/imap-codec#7f5d0918b96a4198811eb73ea12e1a42f43f955b" +source = "git+https://github.com/duesee/imap-codec#fff8355ad0f7133be9e58919be5a6f05f684d421" dependencies = [ "base64 0.22.1", "bounded-static", @@ -2947,7 +2947,7 @@ checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" [[package]] name = "oauth-lib" version = "0.1.1" -source = "git+https://git.sr.ht/~soywod/pimalaya#f2b429db2839ddef9e4c496def386062339b437b" +source = "git+https://github.com/pimalaya/core#d61f0e9c6fb26abd0d7f104e6839fcd02ef423bc" dependencies = [ "log", "oauth2", diff --git a/Cargo.toml b/Cargo.toml index f762b02..d4878b4 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -40,7 +40,7 @@ sendmail = ["email-lib/sendmail"] keyring = ["email-lib/keyring", "secret-lib?/keyring-tokio"] oauth2 = ["dep:oauth-lib", "email-lib/oauth2", "keyring"] -wizard = ["dep:secret-lib", "email-lib/autoconfig"] +wizard = ["dep:secret-lib", "dep:toml_edit", "email-lib/autoconfig"] pgp = [] pgp-commands = ["email-lib/pgp-commands", "mml-lib/pgp-commands", "pgp"] @@ -79,7 +79,7 @@ sled = "=0.34.7" terminal_size = "0.1" tokio = { version = "1.23", default-features = false, features = ["macros", "rt-multi-thread"] } toml = "0.8" -toml_edit = "0.22" +toml_edit = { version = "0.22", optional = true } tracing = "0.1.40" tracing-error = "0.2.0" tracing-subscriber = { version = "0.3.18", features = ["env-filter"] } @@ -88,8 +88,8 @@ url = "2.2" uuid = { version = "0.8", features = ["v4"] } [patch.crates-io] -oauth-lib = { git = "https://git.sr.ht/~soywod/pimalaya" } -imap-codec = { git = "https://github.com/soywod/imap-codec" } +oauth-lib = { git = "https://github.com/pimalaya/core" } +imap-codec = { git = "https://github.com/duesee/imap-codec" } imap-next = { git = "https://github.com/duesee/imap-next", branch = "jakoschiko_poison-message-with-fragmentizer" } -imap-client = { git = "https://github.com/soywod/imap-client" } -email-lib = { git = "https://git.sr.ht/~soywod/pimalaya" } +imap-client = { git = "https://github.com/pimalaya/imap-client" } +email-lib = { git = "https://github.com/pimalaya/core" } diff --git a/README.md b/README.md index 091fb10..e5d67e6 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,20 @@ -# 📫 Himalaya [![GitHub release](https://img.shields.io/github/v/release/soywod/himalaya?color=success)](https://github.com/soywod/himalaya/releases/latest) [![Matrix](https://img.shields.io/matrix/pimalaya.himalaya:matrix.org?color=success&label=chat)](https://matrix.to/#/#pimalaya.himalaya:matrix.org) +
+ Logo +

📫 Himalaya

+

CLI to manage emails,
based on email-lib.

+

+ Release + Repology + Matrix +

+ +
-Welcome to [**Himalaya CLI**](https://pimalaya.org/himalaya/cli/latest/), the Command-Line Interface to manage emails based on [email-lib](https://crates.io/crates/email-lib). +``` +$ himalaya envelope list --account posteo --folder Archives.FOSS --page 2 +``` -![screenshot](https://github.com/soywod/himalaya/assets/10437171/8a62cf1d-920e-4110-9849-170db6dc51ce) - -*Disclaimer: the project is under active development, do not use in production before the final `v1.0.0`.* +![screenshot](./screenshot) ## Features @@ -66,20 +76,6 @@ $ dnf install himalaya *Please read the [documentation](https://pimalaya.org/himalaya/cli/latest/configuration/).* -## Contributing - -*Please read the [contributing guide](https://github.com/soywod/himalaya/blob/master/CONTRIBUTING.md) for more detailed information.* - -A **bug tracker** is available on [SourceHut](https://todo.sr.ht/~soywod/pimalaya). [[send an email](mailto:~soywod/pimalaya@todo.sr.ht)] - -A **mailing list** is available on [SourceHut](https://lists.sr.ht/~soywod/pimalaya). [[send an email](mailto:~soywod/pimalaya@lists.sr.ht)] [[subscribe](mailto:~soywod/pimalaya+subscribe@lists.sr.ht)] [[unsubscribe](mailto:~soywod/pimalaya+unsubscribe@lists.sr.ht)] - -If you want to **report a bug**, please send an email at [~soywod/pimalaya@todo.sr.ht](mailto:~soywod/pimalaya@todo.sr.ht). - -If you want to **propose a feature** or **fix a bug**, please send a patch at [~soywod/pimalaya@lists.sr.ht](mailto:~soywod/pimalaya@lists.sr.ht). The simplest way to send a patch is to use [git send-email](https://git-scm.com/docs/git-send-email), follow [this guide](https://git-send-email.io/) to configure git properly. - -If you just want to **discuss** about the project, feel free to join the [Matrix](https://matrix.org/) workspace [#pimalaya.himalaya](https://matrix.to/#/#pimalaya.himalaya:matrix.org) or contact me directly [@soywod](https://matrix.to/#/@soywod:matrix.org). You can also use the mailing list. - ## Sponsoring [![nlnet](https://nlnet.nl/logo/banner-160x60.png)](https://nlnet.nl/project/Himalaya/index.html) diff --git a/logo-small.svg b/logo-small.svg new file mode 100644 index 0000000..f8641a0 --- /dev/null +++ b/logo-small.svg @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + diff --git a/logo.svg b/logo.svg new file mode 100644 index 0000000..1622ff6 --- /dev/null +++ b/logo.svg @@ -0,0 +1,81 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/screenshot.jpeg b/screenshot.jpeg new file mode 100644 index 0000000..bb9525f Binary files /dev/null and b/screenshot.jpeg differ diff --git a/src/email/envelope/mod.rs b/src/email/envelope/mod.rs index 19cef09..c9bfcc2 100644 --- a/src/email/envelope/mod.rs +++ b/src/email/envelope/mod.rs @@ -51,10 +51,10 @@ impl Envelope { let flags = { let mut flags = String::new(); - flags.push(config.unseen_char(unseen)); - flags.push(config.replied_char(self.flags.contains(&Flag::Answered))); flags.push(config.flagged_char(self.flags.contains(&Flag::Flagged))); + flags.push(config.unseen_char(unseen)); flags.push(config.attachment_char(self.has_attachment)); + flags.push(config.replied_char(self.flags.contains(&Flag::Answered))); flags };