sup 1.2 → 1.4

data/man/sup.1

@@ -1,51 +1,51 @@
-.\" Automatically generated by Pandoc 3.1.9
+.\" Automatically generated by Pandoc 3.7.0.2
 .\"
-.TH "SUP" "1" "April 8, 2014" "Sup User Manual" ""
+.TH "SUP" "1" "April 8, 2014" "Sup User Manual"
 .SH NAME
-sup - a curses-based email client
+sup \- a curses\-based email client
 .SH SYNOPSIS
 sup [\f[I]options\f[R]]
 .SH DESCRIPTION
-Sup is a console-based email client for people with a lot of email.
+Sup is a console\-based email client for people with a lot of email.
 .PP
 It presents an interface of a list of threads, which are each
 hierarchical collections email messages.
 Threads can have multiple tags applied to them.
-It supports a very fast full-text search, automatic contact-list
+It supports a very fast full\-text search, automatic contact\-list
 management, custom code insertion via a Ruby hook system, and more.
-If you\[cq]re the type of person who treats email as an extension of
-your long-term memory, Sup is for you.
+If you\(cqre the type of person who treats email as an extension of your
+long\-term memory, Sup is for you.
 .SH OPTIONS
 .TP
--l, --list-hooks
+\-l, \-\-list\-hooks
 List all hooks and descriptions, and quit.
-Use \[en]hooks-matching to filter
+Use \(enhooks\-matching to filter
 .TP
--m, --hooks-matching=<s>
+\-m, \-\-hooks\-matching=<s>
 If given, list all hooks and descriptions matching the given pattern.
-Needs the \[en]list-hooks option (default: )
+Needs the \(enlist\-hooks option (default: )
 .TP
--n, --no-threads
+\-n, \-\-no\-threads
 Turn off threading.
 Helps with debugging.
 (Necessarily disables background polling for new messages.)
 .TP
--o, --no-initial-poll
-Don\[cq]t poll for new messages when starting.
+\-o, \-\-no\-initial\-poll
+Don\(cqt poll for new messages when starting.
 .TP
--s \f[I]QUERY\f[R], --search \f[I]QUERY\f[R]
+\-s \f[I]QUERY\f[R], \-\-search \f[I]QUERY\f[R]
 Search for this query upon startup
 .TP
--c \f[I]STRING\f[R], --compose \f[I]STRING\f[R]
+\-c \f[I]STRING\f[R], \-\-compose \f[I]STRING\f[R]
 Compose message to this recipient upon startup
 .TP
--j \f[I]STRING\f[R], --subject \f[I]STRING\f[R]
+\-j \f[I]STRING\f[R], \-\-subject \f[I]STRING\f[R]
 When composing, use this subject
 .TP
--v, --version
+\-v, \-\-version
 Print version and exit
 .TP
--h, --help
+\-h, \-\-help
 Show brief help message
 .SH ENVIRONMENT
 .TP
@@ -54,7 +54,7 @@ Set log level verbosity.
 Valid values ordered by decresing verbosity: debug info warn error.
 Default log level is info.
 .TP
-SUP_BASE\[rs]
+SUP_BASE\(rs
 Specify home directory for configuration files and xapian index,
 defaults to: $HOME/.sup.
 .SH FILES
@@ -68,9 +68,9 @@ Configuration file for Sup mail sources
 $HOME/.sup/colors.yaml
 Color theme for Sup
 .SH SEE ALSO
-mail(1), sup-add(1), sup-config(1), sup-dump(1), sup-import-dump(1),
-sup-recover-sources(1), sup-sync(1), sup-sync-back-maildir(1),
-sup-tweak-labels(1)
+mail(1), sup\-add(1), sup\-config(1), sup\-dump(1),
+sup\-import\-dump(1), sup\-recover\-sources(1), sup\-sync(1),
+sup\-sync\-back\-maildir(1), sup\-tweak\-labels(1)
 .SH REPORTING BUGS
 You are welcome to submit bug reports to the Sup issue tracker, located
 at
@@ -96,21 +96,21 @@ Sup Wiki:
 .UE \c
 .TP
 Mailing list:
-supmua\[at]googlegroups.com
+supmua\(atgooglegroups.com
 .RS
 .PP
-supmua+subscribe\[at]googlegroups.com
+supmua+subscribe\(atgooglegroups.com
 .PP
 Archives: \c
 .UR https://groups.google.com/d/forum/supmua/
 .UE \c
 .RE
 .SH COPYRIGHT
-Copyright © 2006-2009 William Morgan \c
+Copyright © 2006\-2009 William Morgan \c
 .MT mworgan-sup@masanjin.net
 .ME \c
 .PP
-Copyright \[at] 2013-2014 Sup developers
+Copyright \(at 2013\-2014 Sup developers
 .PP
 Permission is granted to copy and distribute this manual under the terms
 of the GNU General Public License; either version 2 or (at your option)

data/sup.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |s|
   s.authors = ["William Morgan", "Gaute Hope", "Hamish Downer", "Matthieu Rakotojaona"]
   s.email   = "supmua@googlegroups.com"
   s.summary = "A console-based email client with the best features of GMail, mutt and Emacs"
-  s.homepage = "https://sup-heliotrope.github.io/"
+  s.homepage = "https://supmua.dev/"
   s.license = 'GPL-2.0'
   s.description = <<-DESC
     Sup is a console-based email client for people with a lot of email.
@@ -61,6 +61,8 @@ SUP: please note that our old mailing lists have been shut down,
   s.add_runtime_dependency "unicode", "~> 0.4.4"
   s.add_runtime_dependency "unicode-display_width"
   s.add_runtime_dependency "string-scrub" if /^2\.0\./ =~ RUBY_VERSION
+  s.add_runtime_dependency "benchmark"
+  s.add_runtime_dependency "fiddle"
 
   s.add_development_dependency "bundler", ">= 1.3", "< 3"
   s.add_development_dependency "rake"

data/test/dummy_buffer.rb

@@ -0,0 +1,34 @@
+require "sup"
+
+module Redwood
+
+class DummyBuffer
+  attr_reader :width, :height, :dirty_count, :commit_count
+
+  def initialize width=80, height=25
+    @width = width
+    @height = height
+    @dirty = false
+    @dirty_count = 0
+    @commit_count = 0
+  end
+
+  def content_height; @height - 1; end
+  def content_width; @width; end
+
+  def mark_dirty
+    @dirty = true
+    @dirty_count += 1
+  end
+
+  def dirty?; @dirty; end
+
+  def commit
+    @dirty = false
+    @commit_count += 1
+  end
+
+  def write(*args); end
+end
+
+end

data/test/dummy_source.rb

@@ -10,10 +10,12 @@ module Redwood
 class DummySource < Source
 
   attr_accessor :messages
+  attr_writer :fallback_date
 
   def initialize uri, last_date=nil, usual=true, archived=false, id=nil, labels=[]
     super uri, usual, archived, id
     @messages = nil
+    @fallback_date = Time.utc 2001, 2, 3, 4, 56, 57
   end
 
   def start_offset
@@ -59,6 +61,10 @@ class DummySource < Source
       end
     end
   end
+
+  def fallback_date_for_message id
+    @fallback_date
+  end
 end
 
 end

data/test/fixtures/contacts.txt

@@ -1 +1,2 @@
-RC: Random Contact <random_dude@gmail.com>
+RC: Random Contact <random_dude@gmail.com>
+: Unaliased Contact <unaliased@example.invalid>

data/test/fixtures/embedded-message-rfc6532.eml

@@ -0,0 +1,33 @@
+Return-Path: <return@example.com>
+From: Sender <sender@example.com>
+To: <recipient@example.invalid>
+Subject: Email with embedded message
+MIME-Version: 1.0
+Content-Type: multipart/mixed; boundary="----------=_4F506AC2.EE281DC4"
+Message-Id: <9181f493-df49-4af5-8ad2-e1a8eb692a98>
+Date: Wed, 15 Jul 2020 19:48:41 +0100
+
+This is a multi-part message in MIME format.
+
+------------=_4F506AC2.EE281DC4
+Content-Type: text/plain; charset=iso-8859-1
+Content-Disposition: inline
+Content-Transfer-Encoding: 8bit
+
+Example outer message.
+
+
+------------=_4F506AC2.EE281DC4
+Content-Type: message/global
+Content-Transfer-Encoding: 8bit
+
+From: "Embed sender" <embed@example.com>
+To: <rcpt2@example.invalid>
+Subject: Embedded subject line with emoji ✨
+X-heävy-mëtal-ümlaut: yes
+Date: Sun, 12 May 2024 17:34:29 +1000
+
+Example embedded message, with UTF-8 headers.
+
+------------=_4F506AC2.EE281DC4--
+

data/test/fixtures/invalid-date.eml

@@ -0,0 +1,8 @@
+To: person@example.invalid
+Subject: pre-RFC2822 Date header
+Content-type: text/plain
+From: anotherperson@example.invalid
+Message-Id: <6965470922807932796@example.invalid>
+Date: ons, 26 maj 1999 11:00:34 +0200 (CEST)
+
+A message body.

data/test/fixtures/rfc2047-header-encoding.eml

@@ -1,4 +1,4 @@
-From: test@example.invalid
+From: =?utf-8?q?YouTube-tj=E4nst?= <service@youtube.com>
 To: test@example.invalid
 Date: Sun, 19 Jul 2020 17:03:56 +1000
 Subject:

data/test/gnupg_test_home/private-keys-v1.d/26C05E44706A8E230B3255BB9532B34DC9420232.key

@@ -0,0 +1,42 @@
+Created: 20241014T073358
+Key: (private-key (rsa (n #00C0EF24D44D17ABD33603EDED46A2F639BDB90C9A72
+ E6AD03E83B597169BF7B8F6DEF42A5EED6F9BBDD0BDE326075969886D11D2875FB6972
+ D8D73ECC98F6A14AB083E93990567C78EEDA09260096B4B99C67824B39005DEA7D75B5
+ ECF3F03D042EEEB49E9871AA3B2DC4552FC7598B8DDAD6454EF0CCD11D8C4BAEEFEBCC
+ CF4BCDB4FBB05BCC026910D4249E24BB657BD2287E6999FD2C499C54C29CE079437CB3
+ 8AE685C6D733749B046FF2235A29B22822C23EFFF38302B3A8EEC81CE9505BF8D4CCF5
+ EB958AFBDE50488F56E14B3CC116E413CE5E449D65537DDFB90F841A3B6580BEA20783
+ 002699B584F53EE4C29C7381071536659E50BE9AA445068F5B2B2B0185E850DF4790FD
+ 455A91135FE29A79A0E7EF73A8C6B6328603C5B46466B1A674AE205256C79B8A39E73D
+ 15587A123C2FEC23C14CD2ADD2D41344408E713A10D986766F17F93011998788DEF294
+ DA6C3E86CEC1562FB574014CA2937FA7ACF7C57D80E9925994FCF8EA55102FC987FAD6
+ 7393E2011515856AE9FEB6DDB9#)(e #010001#)(d
+  #1AC7D73BE4EB993D3B2D36748E2E86B12325B19B2AC1DC58437F217E3DA887B53414
+ 5713036131CF22F2C7C8045DAE26C3E7F8FD29CB592AC8F0AFD5E491AF77D7A2A7D806
+ B20A9B1AC4872A90405B1BBC9B1D99E572A896A90D92D02E5835900417BC589B5E83BB
+ AD31A885764D76B29D22CB021728C70A2BF441772A2B06C745E98E5A3F93C4EDE2991F
+ F017B72F720D8CF3672329E260E1635E943A107B0EAF3963A04426910CE98BA7225C47
+ E2ABC92872001EB52585557CE8903C7B225D342894EFB6CCA4ED2397E970EAB675BE69
+ 70F1009E87396923D13A6B4B1E941EA9433C386EFA94843C67C5C5D08B688BDCD3075D
+ 29ACB0D3D3F156562ABB19345B547040782FA7DD199F20CA7042D8548FF72FAB96394C
+ 2ADFCAFA4E38196AED778C777BA8BF4646A8E4F5DA3E44C0330AC71AFAD1FCF1C792F2
+ 34C7D0BFA59E1435813695CC813C1395DDCD61BE60B1693B89DC5B8480DE5BD5065AED
+ 3822B865574D55155FCACDB51807679040D6952E073982C6075E07111A205D7EBEA015
+ #)(p #00D8DF87835F964777CC15BA16559A04CD40D570084AF06117224D9B6DE56CB5
+ DCC0F5A66DEAF9DBA1542475808017B318D152FA7425376508A48E1591C75605504799
+ 184C0F11059B5625C799356CC895314DD684A25CC36775DFB2270DBB1E92E7457773BB
+ 9E2C1BCDB93BD7A9E4AE316F23FC06D9AC6E538A7A9A53D454B1548A80291777704EA7
+ B5D798C8378C4C7B040A4BD64875755A8CC092D4D1C340D22CA798F177F0A0A9893BC7
+ 026A9023660CBF155F22CC295880965E75832AA01F#)(q
+  #00E3BDF8A4560327A98A63D6B00B7474FC0F918F043CF0A99253F41EEEF4895BFAF8
+ 50AFDC107C4A741958667F7B567F280632C8B3454494CA1B253A33DD4E45ACC5194F53
+ 1B67DD975D15470FA52CF2C71CEA669B1471CF1B8B76EE0E5925F5CC1103D75184D7C3
+ BB8EE7498ECC34483EEDD5516AF5F234ADA9C0BFDE2E3A15F7027B109E136C56C4779C
+ 6E032DC25B5D2E68D7079C5CEBC15B25ADE6481A1E1E78305B067C452C677908BE6D16
+ EC7B1869689FC9F70FB4D45449C336D9B46727#)(u
+  #009C3200C269390035DB78F0259D81B22712470EE1FBA278564DDDE0C667EA48A511
+ 7B8AB17C2DAEFD2078BF99CE548A72661E8FCA2288BE39447854F79AFDAFB4415BB60A
+ C72562E2DDB31D52DDE9D638EEDBF9636AB6BCDD2870E6C9B59AFAB04C169CF51433BE
+ C75EC697575686029F36FA2537896ACCD35EB766BB3A2EBC84DBFC24C0D049699813B1
+ 1A7679D87D38B222ECD1238DCFB84AB58D5C4D8B5E90D627D9C1BEA3793AC2AEA225FC
+ 7C7021EA0FA08CAF614286537134929A47097D#)))

data/test/gnupg_test_home/private-keys-v1.d/D187ADC90EC4DEB7047678EAA37E33A53A465D47.key

@@ -0,0 +1,5 @@
+Created: 20241014T073400
+Key: (private-key (ecc (curve Ed25519)(flags eddsa)(q
+  #4049C4EFC8EEB81658624601387C3ECCDE9A3D76476C10773DE55E025580B9AE17#)
+ (d #C9A9E5DAE378425DDCFBC4B565845883A198F96B86E31D3F4763665633D9F51E#)
+ ))

data/test/gnupg_test_home/private-keys-v1.d/FB2D9BD3B1BE90B5BCF697781F8404224B0FCF5B.key

@@ -0,0 +1,5 @@
+Created: 20241014T073400
+Key: (private-key (ecc (curve Curve25519)(flags djb-tweak)(q
+  #404F9277B8281579076BE50AF2D30484B4B72E56035A3F36A99F38A6FA06065521#)
+ (d #5390C4E04165F6AAF4CDCA43C6FF4C5B6FF3F55137B11A5BC64CE8C7B67E3948#)
+ ))

data/test/gnupg_test_home/regen_keys.sh

@@ -67,6 +67,15 @@ gpg2 \
     --passphrase '' \
     --quick-generate-key sup-test-1@foo.bar rsa encrypt,sign 0
 
+echo "Generating key pair for sender alternate address (email sup-fake-ecc@fake.fake)"
+gpg2 \
+    --homedir . \
+    --batch \
+    --pinentry-mode loopback \
+    --passphrase '' \
+    --default-new-key-algo "ed25519/cert,sign+cv25519/encr" \
+    --quick-generate-key sup-fake-ecc@fake.fake default default 0
+
 echo "Importing public key for receiver, into sender's key store"
 gpg2 \
     --homedir . \
@@ -80,10 +89,10 @@ gpg2 \
 
 echo "Done."
 
-echo "We now have two non-expiring public keys (receiver & sender):"
+echo "We now have some non-expiring public keys:"
 gpg2 --homedir . --list-keys
 
-echo "And we also have only *one* corresponding private key (sender only):"
+echo "And we also have some corresponding private keys:"
 gpg2 --homedir . --list-secret-keys
 
 popd

data/test/gnupg_test_home/sup-test-2@foo.bar.asc

@@ -1,23 +1,23 @@
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 
-mQGNBF7leTkBDAC3auy8xodH6jxoISylFZTpVqy/0L2ul879YUb/QbC58+F/H36S
-CjLfPxFlq0FAOXHelOvktxaybg+BG5UpSvTgBLbcArq5nctee+04TMXCzQzrG2V1
-zb9gIRT665fX3+WYncSIXdr4LAp7r8Jw3RT3tTOZqbaencumCWaJblnvfFwPrMKf
-AXWa/NVndNMAXmJ5uBf1MRr45KXaQ2tczPIeHqSOKhKNnKZPRqPs0fg4i3d0Vb6G
-yItgtJapfBo50FV+PvtodMHo3LDlz/BBjdEJHSvghqEjb1S7xGo+hdXs+lfCMfa0
-3PAWoj+OeHNorbK0YbVKOtS0E0xYvScbyC7bfwtA9yb3LZYmy7VHsKJmQfygCNQ6
-wIKQGAVN1NcQcJsvWyAwk9+WMN5oqB5lb76u40beoWlUjSJRlph2VvWvkGuh/huU
-sVGqcN7EO4SFkwi2YQLoWfQRGur3mids/PQTBywpGE1SyziPZK76pT6SqP8b+OpI
-CG1QbcTZzYpbv6kAEQEAAbQSc3VwLXRlc3QtMkBmb28uYmFyiQHOBBMBCgA4FiEE
-e0oXvVeqMzUcfd1s2bF8xbTizW8FAl7leTkCGw8FCwkIBwIGFQoJCAsCBBYCAwEC
-HgECF4AACgkQ2bF8xbTizW92TAv/WGlYfDTKNEmJ0K+kxt33T2ldmZXaJKL04Mft
-h5s5KlRZWDNpkCC/L55uyaeEg+Uy+BEEQKLAEeJrrLMV8UMJwMPDOizSTT9uLyiz
-b8RjnQw4iMT8wt9TQboXGaTMslwdXvFPii7w44KgCimE7VuPetJuLMLMbnl147G8
-+QhkNUsrB51TuPS8xZJ4qjbH+K/Y2NlvwLtJrxNE3SRQuy2ApYJxKPZIj1KpUL8M
-7Jy/2hI8DaRm/0Fpu8HwRIVsd6/dgdkqdj1uVyLj+wyhgdzqV5WrPLFCRVhd3icd
-lPNRIDjg8YKCh353LVHjKwefOW4SnkOPn4uVMdCP9gUFd9zpMP9lMFpjk0o0tcYO
-NiFrOclS4q5qZ5jrj1MnBF0NaGhuC83DDgRfKV+p5noVeJxg0nXYZSlsSMfAT/K7
-FbdNEg0XUsrLgWVzhvWv/ebMetFPSfGHIveZ7lhiq1qpA5hLBNfSSBb1JJsFmtQt
-cEUluymdNe5W7Y6UGs1CpvcIvbj+
-=Cy9S
+mQGNBGcMyWQBDADDsDnBPhnEKSH2qSJq00/nxe1zFhwc5yiD5kwutfOCG/46Wtqs
+vETmZfAaWOrfFectT51zLlG2/zju63NEiImt8KBxB02lI8uanLdKxNpAuN3OuNTF
+RapqLTCwThlNZlGXM4fvC7uuFxtSV3yE5wIOQIT4IvpGc2/P7NuDg+aYoAkfNH5Y
+1E3II/tRUYZn63t5ihmOH1b2Gc8qyD05gc7O836ZgKHL1FfCf4A8tgQEOFgkkYdH
+fX8x57RbZAqfzpH5oxcZNa5LAC+m+3EmLF5cvNWqLh8wAnYb+krDvZ9sg8OjY5YN
+K4SDTnKfg0zofdEHeZFqDOg1N/0Ri79EYJBINBeERj1OMPUD8uim+AeJjLbL1XiH
+l31zEQOoTCSutGeA7sKS3YTaNcpvKfneW3MHN4y4jqLLI2g1PGGGTXYpr/t3/8uG
+fzlkcxBDzl3IX1lvIBEhF4P1uSSc2Oa+IizzfDVPoKzy7+bLP/JvF3cTKKZHe63P
+p/9hy34IOdKKw7sAEQEAAbQSc3VwLXRlc3QtMkBmb28uYmFyiQHRBBMBCAA7FiEE
+IJRwaSVB2pkxecFGpaPGNeoyUYoFAmcMyWQCGw8FCwkIBwICIgIGFQoJCAsCBBYC
+AwECHgcCF4AACgkQpaPGNeoyUYq1NwwAuurXiq3hnmTbg/Lxn1FtcwW0xKdBmUbB
+LWg+fWZvo87wU5TxsdAu1Y8YiWqusSX9ZYg8po0/dgBKdrPREF3rCWOw6wVwWg4E
+aydajoefUa10CPf4VeOLbVReQLsueWycp5uw3Pm8Zc78RyKL9QmY+k3ez6kspHS6
+gWeiLv9XazBll/o1YYLQX7gI29aseBkbLS81Z1ea+a6cqvzm/MzAYiDf8ETQ3/Sm
+Nd/HoPWJ9/aHuuBUQsX2uWCI70YgvTh/kKfaNr3up5BmCjwgQCo2zjZOGDUqnajd
+2I5qV3uabNXTwgdjWoqN9nmBeEpW5haw+NwuhQT0H5tWfiL4wyXv01KZxPxv1tAq
+Tu9frSOk4ziRWbUQMelIiGbIRB6VNHEIyM3F/UpboDDPn9lIVuG6ARNfPemHsErI
+rIdC2PXMibdO5U1d+0oY5xf7YxnWWgWstsjlgyXBUnX3R5xXGm5Sf66VwR+0Vo9J
+EFqKZ/vYa3YwJ+hfzIBVKGxBKXpXQv83
+=kQ2o
 -----END PGP PUBLIC KEY BLOCK-----

data/test/integration/test_draft.rb

@@ -0,0 +1,128 @@
+require "sup"
+require "test_helper"
+
+class TestDraft < Minitest::Test
+  include Redwood
+
+  def setup
+    @path = Dir.mktmpdir
+    start
+    Logger.remove_sink $stderr
+    @draft_dir = File.join @path, "drafts"
+    @test_message_1 = <<EOS
+From: Some Person <someone@example.invalid>
+To:
+Cc:
+Bcc:
+Subject: draft
+Date: Fri, 11 Apr 2025 22:34:05 +1000
+Message-ID: <123@example.invalid>
+
+My incomplete message
+EOS
+    DraftManager.instance.instance_eval "@dir = '#{@draft_dir}'"
+    Index.init @path
+    Index.load
+    SourceManager.instance.instance_eval "@sources = {}"
+    @draft_source = DraftManager.new_source
+    SourceManager.add_source @draft_source
+  end
+
+  def teardown
+    Index.save_index
+    ObjectSpace.each_object(Class).select {|a| a < Redwood::Singleton}.each do |klass|
+      klass.deinstantiate! unless klass == Redwood::Logger
+    end
+    FileUtils.rm_r @path
+  end
+
+  def test_write_draft
+    DraftManager.write_draft { |f| f.write @test_message_1 }
+
+    draft_filename = File.join @draft_dir, "0"
+    assert File.exist? draft_filename
+    assert_equal @test_message_1, (File.read draft_filename)
+
+    ## Check that it is loaded back into the index successfully too.
+    messages_in_index = Index.instance.enum_for(:each_message).to_a
+    assert_equal @test_message_1, messages_in_index.first.raw_message
+    assert_equal [:draft, :inbox].to_set, messages_in_index.first.labels
+  end
+
+  def test_discard_draft
+    DraftManager.write_draft { |f| f.write @test_message_1 }
+    draft_filename = File.join @draft_dir, "0"
+    assert File.exist? draft_filename
+    message_in_index = Index.instance.enum_for(:each_message).to_a.first
+
+    DraftManager.discard message_in_index
+    refute File.exist? draft_filename
+  end
+
+  def test_discard_already_deleted_from_disk
+    DraftManager.write_draft { |f| f.write @test_message_1 }
+    draft_filename = File.join @draft_dir, "0"
+    assert File.exist? draft_filename
+    message_in_index = Index.instance.enum_for(:each_message).to_a.first
+
+    File.delete draft_filename
+
+    DraftManager.discard message_in_index
+    refute File.exist? draft_filename
+  end
+
+  def test_load_malformed_draft
+    ## Sup always writes drafts by serialising a Message, meaning the draft is
+    ## guaranteed to have certain headers like Date. But it's always possible
+    ## for the user to edit the draft directly on the filesystem and leave it
+    ## in some kind of malformed state. Sup should handle it without crashing.
+    draft_filename = File.join @draft_dir, "0"
+    fallback_date = Time.new 2025, 5, 3, 15, 47, 41
+    File.write draft_filename, <<EOS
+Some-Header: Value
+
+body
+EOS
+    File.utime fallback_date, fallback_date, draft_filename
+    PollManager.poll_from @draft_source
+    messages_in_index = Index.instance.enum_for(:each_message).to_a
+    assert_equal "", messages_in_index[0].subj
+    assert_equal fallback_date, messages_in_index[0].date
+
+    File.write (File.join @draft_dir, "1"), <<EOS
+missing a header!
+EOS
+    PollManager.poll_from @draft_source
+    messages_in_index = Index.instance.enum_for(:each_message).to_a
+    assert_equal "", messages_in_index[0].subj
+
+    File.write (File.join @draft_dir, "2"), ""
+    PollManager.poll_from @draft_source
+    messages_in_index = Index.instance.enum_for(:each_message).to_a
+    assert_equal "", messages_in_index[0].subj
+  end
+
+  def test_draft_with_non_ascii_chars
+    message = <<EOS
+From: Some Person <someone@example.invalid>
+To:
+Cc:
+Bcc:
+Subject: UTF-8 draft 🤐
+Date: Fri, 11 Apr 2025 22:34:05 +1000
+Message-ID: <123@example.invalid>
+
+¡Buen día! Доброго ранку! おはよう！
+EOS
+    DraftManager.write_draft { |f| f.write message }
+    draft_filename = File.join @draft_dir, "0"
+    assert_equal message, (File.read draft_filename)
+
+    PollManager.poll_from @draft_source
+    messages_in_index = Index.instance.enum_for(:each_message).to_a
+    assert_equal "UTF-8 draft 🤐", messages_in_index[0].subj
+    assert_equal message, messages_in_index.first.raw_message
+    assert_equal "¡Buen día! Доброго ранку! おはよう！", \
+                 messages_in_index[0].chunks[0].lines[0]
+  end
+end

data/test/integration/test_maildir.rb

@@ -34,16 +34,20 @@ EOS
   end
 
   def create_a_maildir_email(folder, content)
-    File.write(File.join(folder, "#{Time.now.to_f}.hostname:2,S"), content)
+    filename = File.join folder, "#{Time.now.to_f}.hostname:2,S"
+    File.write filename, content
+    filename
   end
 
   def start_sup_and_add_source(source)
     start
+    Logger.remove_sink $stderr
     Index.init @path
     Index.load
     SourceManager.instance.instance_eval '@sources = {}'
     SourceManager.instance.add_source source
     PollManager.poll_from source
+    Index.save_index
   end
 
   # and now, let the tests begin!
@@ -74,5 +78,17 @@ EOS
 
   end
 
+  def test_missing_date_header
+    ## The message is missing a Date header so we should use its modtime
+    ## as a fallback.
+    fallback_date = Time.new 2004, 4, 19, 11, 12, 13
+    maildir = create_a_maildir
+    filename = create_a_maildir_email(File.join(maildir, 'cur'), @test_message_1)
+    File.utime fallback_date, fallback_date, filename
+    start_sup_and_add_source Maildir.new "maildir:#{maildir}"
+
+    messages_in_index = Index.instance.enum_for(:each_message).to_a
+    assert_equal fallback_date, messages_in_index.first.date
+  end
 end
 

data/test/integration/test_mbox.rb

@@ -34,11 +34,13 @@ EOS
 
   def start_sup_and_add_source(source)
     start
+    Logger.remove_sink $stderr
     Index.init @path
     Index.load
     SourceManager.instance.instance_eval '@sources = {}'
     SourceManager.instance.add_source source
     PollManager.poll_from source
+    Index.save_index
   end
 
   # and now, let the tests begin!
@@ -69,4 +71,14 @@ EOS
 
   end
 
+  def test_missing_date_header
+    ## The message is missing a Date header so we should use envelope date
+    ## stored in the From line as a fallback.
+    fallback_date = Time.new 2009, 4, 27, 12, 56, 18
+    mbox = create_a_mbox
+    start_sup_and_add_source MBox.new "mbox:#{mbox}"
+
+    messages_in_index = Index.instance.enum_for(:each_message).to_a
+    assert_equal fallback_date, messages_in_index.first.date
+  end
 end

data/test/integration/test_sup-add.rb

@@ -26,6 +26,8 @@ class TestSupAdd < Minitest::Test
 EOS
   end
 
+  ## https://github.com/sup-heliotrope/sup/issues/577
+  ## https://github.com/sup-heliotrope/sup/issues/516
   def test_fixes_old_tag_uri_syntax
     File.write "#{@path}/sources.yaml", <<EOS
 ---
@@ -36,6 +38,7 @@ EOS
   sync_back: true
   id: 1
   labels: []
+- !supmua.org,2006-10-01/Redwood/SentLoader {}
 EOS
     _out, _err = capture_subprocess_io do
       assert system({"SUP_BASE" => @path}, "bin/sup-add", "maildir:///other/path")
@@ -58,6 +61,7 @@ EOS
   sync_back: true
   id: 2
   labels: []
+- !<tag:supmua.org,2006-10-01/Redwood/SentLoader> {}
 EOS
   end