codeninjasllc/discourse
1
0
Fork 0
mirror of https://github.com/codeninjasllc/discourse.git synced 2024-11-27 09:36:19 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

FIX: support emails in with weird encoding

Browse source
This commit is contained in:
Régis Hanol 2016-03-11 18:51:53 +01:00
parent 01f2f05f2d
commit 841cec1bc1
3 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/email/receiver.rb
View file

@ -166,7 +166,9 @@ module Email
def try_to_encode(string, encoding)
string.encode("UTF-8", encoding)
rescue Encoding::InvalidByteSequenceError, Encoding::UndefinedConversionError
rescue Encoding::InvalidByteSequenceError,
Encoding::UndefinedConversionError,
Encoding::ConverterNotFoundError
nil
end

3
spec/components/email/receiver_spec.rb
View file

@ -109,6 +109,9 @@ describe Email::Receiver do
expect { process(:chinese_reply) }.to change { topic.posts.count }
expect(topic.posts.last.raw).to eq("您好！ 你今天好吗？")
expect { process(:reply_with_weird_encoding) }.to change { topic.posts.count }
expect(topic.posts.last.raw).to eq("This is a reply with a weird encoding.")
end
it "prefers text over html" do

9
spec/fixtures/emails/reply_with_weird_encoding.eml vendored Normal file
View file

@ -0,0 +1,9 @@
Return-Path: <discourse@bar.com>
From: Foo Bar <discourse@bar.com>
To: reply+4f97315cc828096c9cb34c6f1a0d6fe8@bar.com
Date: Fri, 15 Jan 2016 00:12:43 +0100
Message-ID: <42@foo.bar.mail>
Mime-Version: 1.0
Content-Type: text/plain; charset=unicode-1-1-utf-7
This is a reply with a weird encoding.