moparisthebest/mail
1
0
Fork 0
mirror of https://github.com/moparisthebest/mail synced 2024-11-30 04:42:15 -05:00
Code Issues Releases Wiki Activity

Merge pull request #65 from whiteout-io/dev/wo-399

Browse Source 
[WO-399] Handle reply-to, in-reply-to and references headers
This commit is contained in:
Felix Hammerl 2014-05-21 18:39:37 +02:00
commit fa45fcdb76
2 changed files with 34 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/js/controller/write.js
View File

@ -63,7 +63,7 @@ define(function(require) {
} }
function fillFields(re, replyAll, forward) { function fillFields(re, replyAll, forward) {
var from, sentDate, body; var replyTo, from, sentDate, body;
if (!re) { if (!re) {
return; return;
@ -71,17 +71,26 @@ define(function(require) {
$scope.writerTitle = (forward) ? 'Forward' : 'Reply'; $scope.writerTitle = (forward) ? 'Forward' : 'Reply';
// fill recipient field replyTo = re.replyTo && re.replyTo[0] && re.replyTo[0].address || re.from[0].address;
// fill recipient field and references
if (!forward) { if (!forward) {
$scope.to.unshift({ $scope.to.unshift({
address: re.from[0].address address: replyTo
}); });
$scope.to.forEach($scope.verify); $scope.to.forEach($scope.verify);
if ((re.references || []).indexOf(re.id) < 0) {
// references might not exist yet, so use the double concat
$scope.references = [].concat(re.references || []).concat(re.id);
} else {
$scope.references = re.references;
}
$scope.inReplyTo = re.id;
} }
if (replyAll) { if (replyAll) {
re.to.concat(re.cc).forEach(function(recipient) { re.to.concat(re.cc).forEach(function(recipient) {
var me = emailDao._account.emailAddress; var me = emailDao._account.emailAddress;
if (recipient.address === me && re.from[0].address !== me) { if (recipient.address === me && replyTo !== me) {
// don't reply to yourself // don't reply to yourself
return; return;
} }
@ -98,11 +107,12 @@ define(function(require) {
$scope.cc.forEach($scope.verify); $scope.cc.forEach($scope.verify);
} }
// fill attachments on forward // fill attachments and references on forward
if (forward) { if (forward) {
// create a new array, otherwise removing an attachment will also // create a new array, otherwise removing an attachment will also
// remove it from the original in the mail list as a side effect // remove it from the original in the mail list as a side effect
$scope.attachments = [].concat(re.attachments); $scope.attachments = [].concat(re.attachments);
$scope.references = [re.id];
} }
// fill subject // fill subject
@ -113,7 +123,7 @@ define(function(require) {
} }
// fill text body // fill text body
from = re.from[0].name || re.from[0].address; from = re.from[0].name || replyTo;
sentDate = $filter('date')(re.sentDate, 'EEEE, MMM d, yyyy h:mm a'); sentDate = $filter('date')(re.sentDate, 'EEEE, MMM d, yyyy h:mm a');
function createString(array) { function createString(array) {
@ -292,9 +302,20 @@ define(function(require) {
subject: $scope.subject.trim() ? $scope.subject.trim() : str.fallbackSubject, // Subject line, or the fallback subject, if nothing valid was entered subject: $scope.subject.trim() ? $scope.subject.trim() : str.fallbackSubject, // Subject line, or the fallback subject, if nothing valid was entered
body: $scope.body.trim() + (!$scope.sendBtnSecure ? str.signature : ''), // use parsed plaintext body body: $scope.body.trim() + (!$scope.sendBtnSecure ? str.signature : ''), // use parsed plaintext body
attachments: $scope.attachments, attachments: $scope.attachments,
sentDate: new Date() sentDate: new Date(),
headers: {}
}; };
if ($scope.inReplyTo) {
email.headers['in-reply-to'] = '<' + $scope.inReplyTo + '>';
}
if ($scope.references && $scope.references.length) {
email.headers.references = $scope.references.map(function(reference) {
return '<' + reference + '>';
}).join(' ');
}
// close the writer // close the writer
$scope.state.writer.close(); $scope.state.writer.close();
@ -339,7 +360,7 @@ define(function(require) {
}; };
}; };
// //
// Helpers // Helpers
// //

5
test/new-unit/write-ctrl-test.js
View File

@ -100,12 +100,14 @@ define(function(require) {
subject = 'Ermahgerd!', subject = 'Ermahgerd!',
body = 'so much body!', body = 'so much body!',
re = { re = {
id: 'abc',
from: [{ from: [{
address: address address: address
}], }],
subject: subject, subject: subject,
sentDate: new Date(), sentDate: new Date(),
body: body body: body,
references: ['ghi', 'def']
}; };
scope.state.writer.write(re); scope.state.writer.write(re);
@ -118,6 +120,7 @@ define(function(require) {
}]); }]);
expect(scope.subject).to.equal('Re: ' + subject); expect(scope.subject).to.equal('Re: ' + subject);
expect(scope.body).to.contain(body); expect(scope.body).to.contain(body);
expect(scope.references).to.deep.equal(['ghi', 'def', 'abc']);
expect(scope.ciphertextPreview).to.not.be.empty; expect(scope.ciphertextPreview).to.not.be.empty;
expect(verifyMock.called).to.be.true; expect(verifyMock.called).to.be.true;