Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-06-27 08:46:44 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

mailToHelper() use URLSearchParams

Browse source
This commit is contained in:
the-djmaze 2022-03-08 10:05:24 +01:00
parent 4b8e77be5c
commit ffcd9990eb
2 changed files with 28 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

5
dev/App/User.js
View file

@ -348,10 +348,7 @@ class AppUser extends AbstractApp {
);
} catch (e) {} // eslint-disable-line no-empty
}
setTimeout(() => {
value = SettingsGet('MailToEmail');
value && mailToHelper(value);
}, 500);
setTimeout(() => mailToHelper(SettingsGet('MailToEmail')), 500);
} else {
this.logout();
}

72
dev/Common/UtilsUser.js
View file

@ -123,56 +123,38 @@ computedPaginatorHelper = (koCurrentPage, koPageCount) => {
* @param {string} mailToUrl
* @returns {boolean}
*/
mailToHelper = (mailToUrl) => {
if (
mailToUrl &&
'mailto:' ===
mailToUrl
.toString()
.slice(0, 7)
.toLowerCase()
) {
mailToUrl = mailToUrl.toString().slice(7);
mailToHelper = mailToUrl => {
if (mailToUrl && 'mailto:' === mailToUrl.slice(0, 7).toLowerCase()) {
mailToUrl = mailToUrl.slice(7).split('?');
let to = [],
params = {};
const email = mailToUrl.replace(/\?.+$/, ''),
query = mailToUrl.replace(/^[^?]*\?/, ''),
toEmailModel = value => null != value ? EmailModel.parseEmailLine(decodeURIComponent(value)) : null;
query.split('&').forEach(temp => {
temp = temp.split('=');
params[decodeURIComponent(temp[0])] = decodeURIComponent(temp[1]);
});
if (null != params.to) {
to = Object.values(
toEmailModel(email + ',' + params.to).reduce((result, value) => {
if (value) {
if (result[value.email]) {
if (!result[value.email].name) {
result[value.email] = value;
}
} else {
result[value.email] = value;
}
}
return result;
}, {})
);
} else {
to = EmailModel.parseEmailLine(email);
}
const
email = mailToUrl[0],
params = new URLSearchParams(mailToUrl[1]),
toEmailModel = value => null != value ? EmailModel.parseEmailLine(value) : null;
showMessageComposer([
ComposeType.Empty,
null,
to,
toEmailModel(params.cc),
toEmailModel(params.bcc),
null == params.subject ? null : decodeURIComponent(params.subject),
null == params.body ? null : plainToHtml(decodeURIComponent(params.body))
params.get('to')
? Object.values(
toEmailModel(email + ',' + params.get('to')).reduce((result, value) => {
if (value) {
if (result[value.email]) {
if (!result[value.email].name) {
result[value.email] = value;
}
} else {
result[value.email] = value;
}
}
return result;
}, {})
)
: EmailModel.parseEmailLine(email),
toEmailModel(params.get('cc')),
toEmailModel(params.get('bcc')),
params.get('subject'),
plainToHtml(params.get('body') || '')
]);
return true;