Skip to content

A little bit more content-types handling on multipart emails #69

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
amatsuda merged 7 commits into from
Oct 22, 2025
Merged

A little bit more content-types handling on multipart emails #69

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
f6e9c2b
Handle text/enriched; as text
amatsuda Oct 21, 2025
5f481f7
Handle application/ms-tnef; as an attachment
amatsuda Oct 21, 2025
ee6f828
multipart body can contain multipart
amatsuda Oct 21, 2025
23183c8
Perhaps attachment file body should better not be decoded?
amatsuda Oct 22, 2025
7769165
from_address can be nil
amatsuda Oct 22, 2025
981ca6c
style
amatsuda Oct 22, 2025
0a7105a
Some more content-types
amatsuda Oct 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 19 additions & 15 deletions app/models/message.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,7 @@ def from_mail(mail, list, list_seq)
def from_mail(mail, list, list_seq)
self.list_id, self.list_seq, self.published_at = list.id, list_seq, mail.date

if mail.multipart?
mail.parts.each do |p|
handle_multipart p
end
else
self.body = Kconv.toutf8 mail.body.raw_source
end
handle_body mail

if ((list.name == 'ruby-dev') && list_seq.in?([13859, 26229, 39731, 39734])) || ((list.name == 'ruby-core') && list_seq.in?([5231])) || ((list.name == 'ruby-list') && list_seq.in?([29637, 29711, 30148])) || ((list.name == 'ruby-talk') && list_seq.in?([5198, 61316]))
self.body.gsub!("\u0000", '')
Expand All @@ -44,8 +38,9 @@ def from_mail(mail, list, list_seq)
self.subject = mail.subject
self.subject = Kconv.toutf8 subject if self.subject

self.from = Kconv.toutf8 mail.from_address&.raw
if !self.from && (list.name == 'ruby-core') && (list_seq == 161)
self.from = mail.from_address&.raw
self.from = Kconv.toutf8 from if from
if !from && (list.name == 'ruby-core') && (list_seq == 161)
self.from = mail.from.encode Encoding::UTF_8, Encoding::KOI8_R
end

Expand All @@ -66,15 +61,24 @@ def from_mail(mail, list, list_seq)
self
end

private def handle_multipart(part)
if part.attachment?
file = StringIO.new(part.decoded)
private def handle_body(part)
if part.multipart?
part.parts.each do |p|
handle_body p
end
elsif part.attachment?
file = StringIO.new(part.body.raw_source)
attachments.attach(io: file, filename: part.filename, content_type: part.content_type)
else
case part.content_type.downcase
when /^text\/plain/
case part.content_type&.downcase
when 'application/pgp-signature'
# ignore
when 'application/ms-tnef'
file = StringIO.new(part.decoded)
attachments.attach(io: file, filename: part.filename || 'noname', content_type: part.content_type)
when /^text\/plain/, /text\/enriched;/, 'message/rfc822', nil
(self.body ||= '') << Kconv.toutf8(part.body.raw_source)
when /^text\/html;/
when /^text\/html/
(self.html_body ||= '') << Kconv.toutf8(part.body.raw_source)
else
puts "Unknown content_type: #{part.content_type}"
Expand Down