From 0d4fa04ab18c1412b98b56f37d2af1f6091aecca Mon Sep 17 00:00:00 2001 From: wmorgan Date: Sun, 28 Oct 2007 00:35:26 +0000 Subject: [PATCH] for message/rfc822 attachments, handle the case of no From: address (weird...) git-svn-id: svn://rubyforge.org/var/svn/sup/trunk@633 5c8cc53c-5e98-4d25-b20a-d8db53a31250 --- doc/TODO | 1 + lib/sup/message-chunks.rb | 8 ++++++-- lib/sup/message.rb | 4 +++- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/doc/TODO b/doc/TODO index 1e7fb55..d25d1a7 100644 --- a/doc/TODO +++ b/doc/TODO @@ -8,6 +8,7 @@ _ bugfix: sent.mbox and >From _ bugfix: tokenized email addresses (amazon.com, etc) x bugfix: trailing spaces in buffermanager.ask x bugfix: need to URL-unescape maildir folders +x bugfix: downcasing tab completion x warnings: top-posting, missing attachment x hookability diff --git a/lib/sup/message-chunks.rb b/lib/sup/message-chunks.rb index 9168aa7..6da21aa 100644 --- a/lib/sup/message-chunks.rb +++ b/lib/sup/message-chunks.rb @@ -146,19 +146,23 @@ EOS end class EnclosedMessage - attr_reader :from, :lines + attr_reader :lines def initialize from, body @from = from @lines = body.split "\n" end + def from + @from ? @from.longname : "unknown sender" + end + def inlineable?; false end def expandable?; true end def initial_state; :open end def viewable?; false end def patina_color; :generic_notice_patina_color end - def patina_text; "Begin enclosed message from #{@from.longname} (#{@lines.length} lines)" end + def patina_text; "Begin enclosed message from #{from} (#{@lines.length} lines)" end def color; :quote_color end end diff --git a/lib/sup/message.rb b/lib/sup/message.rb index 568179d..13a41aa 100644 --- a/lib/sup/message.rb +++ b/lib/sup/message.rb @@ -325,7 +325,9 @@ private chunks elsif m.header.content_type == "message/rfc822" payload = RMail::Parser.read(m.body) - [Chunk::EnclosedMessage.new(PersonManager.person_for(payload.header.from.first.format), payload.to_s)] + from = payload.header.from.first + from_person = from ? PersonManager.person_for(from.format) : nil + [Chunk::EnclosedMessage.new(from_person, payload.to_s)] else filename = ## first, paw through the headers looking for a filename -- 2.43.0