end
def initialize message
- super 2, :twiddles => false
@m = message
## it's important to put this early because it forces a read of
## the full headers (most importantly the list-post header, if
## any)
- @body = reply_body_lines message
+ body = reply_body_lines message
from =
- if @m.recipient_email
- AccountManager.account_for(@m.recipient_email)
+ if @m.recipient_email && (a = AccountManager.account_for(@m.recipient_email))
+ a
+ elsif(b = (@m.to + @m.cc).find { |p| AccountManager.is_account? p })
+ b
else
- (@m.to + @m.cc).find { |p| AccountManager.is_account? p }
- end || AccountManager.default_account
-
- #from_email = @m.recipient_email || from.email
- from_email = from.email
+ AccountManager.default_account
+ end
## ignore reply-to for list messages because it's typically set to
- ## the list address anyways
+ ## the list address, which we explicitly treat with :list
to = @m.is_list_message? ? @m.from : (@m.replyto || @m.from)
cc = (@m.to + @m.cc - [from, to]).uniq
@headers = {}
@headers[:sender] = {
- "From" => "#{from.name} <#{from_email}>",
"To" => [to.full_address],
} unless AccountManager.is_account? to
@headers[:recipient] = {
- "From" => "#{from.name} <#{from_email}>",
"To" => cc.map { |p| p.full_address },
} unless cc.empty? || @m.is_list_message?
- @headers[:user] = {
- "From" => "#{from.name} <#{from_email}>",
- }
+ @headers[:user] = {}
@headers[:all] = {
- "From" => "#{from.name} <#{from_email}>",
"To" => [to.full_address],
- "Cc" => cc.map { |p| p.full_address },
+ "Cc" => cc.select { |p| !AccountManager.is_account?(p) }.map { |p| p.full_address },
} unless cc.empty?
@headers[:list] = {
- "From" => "#{from.name} <#{from_email}>",
"To" => [@m.list_address.full_address],
} if @m.is_list_message?
refs = gen_references
- mid = gen_message_id
@headers.each do |k, v|
@headers[k] = {
- "To" => "",
- "Cc" => "",
- "Bcc" => "",
+ "From" => "#{from.name} <#{from.email}>",
+ "To" => [],
+ "Cc" => [],
+ "Bcc" => [],
"In-Reply-To" => "<#{@m.id}>",
"Subject" => Message.reify_subj(@m.subj),
- "Message-Id" => mid,
"References" => refs,
}.merge v
end
:recipient
end
- regen_text
+ super :header => @headers[@selected_type], :body => body,
+ :skip_top_rows => 2, :twiddles => false
end
- def lines; @text.length + 2; end
+ def lines; super + 2; end
def [] i
case i
when 0
- lame = []
- @type_labels.each do |t|
- lame << [(t == @selected_type ? :none_highlight : :none),
- "#{TYPE_DESCRIPTIONS[t]}"]
- lame << [:none, " "]
- end
- lame + [[:none, ""]]
+ @type_labels.inject([]) do |array, t|
+ array + [[(t == @selected_type ? :none_highlight : :none),
+ "#{TYPE_DESCRIPTIONS[t]}"], [:none, " "]]
+ end + [[:none, ""]]
when 1
""
else
- @text[i - 2]
+ super(i - 2)
end
end
protected
- def body; @body; end
- def header; @headers[@selected_type]; end
-
def reply_body_lines m
lines = ["Excerpts from #{@m.from.name}'s message of #{@m.date}:"] +
m.basic_body_lines.map { |l| "> #{l}" }
end
def handle_new_text new_header, new_body
- @body = new_body
-
- if new_header.size != header.size ||
- header.any? { |k, v| new_header[k] != v }
+ old_header = @headers[@selected_type]
+ if new_header.size != old_header.size || old_header.any? { |k, v| new_header[k] != v }
@selected_type = :user
- @headers[:user] = new_header
+ self.header = @headers[:user] = new_header
+ update
end
end
def gen_references
(@m.refs + [@m.id]).map { |x| "<#{x}>" }.join(" ")
end
+
+ def edit_field field
+ edited_field = super
+ if edited_field && edited_field != "Subject"
+ @selected_type = :user
+ update
+ end
+ end
def move_cursor_left
i = @type_labels.index @selected_type
@selected_type = @type_labels[(i - 1) % @type_labels.length]
+ self.header = @headers[@selected_type]
update
end
def move_cursor_right
i = @type_labels.index @selected_type
@selected_type = @type_labels[(i + 1) % @type_labels.length]
+ self.header = @headers[@selected_type]
update
end
end