Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-08-30 04:29:21 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Almost all JSON properties to JavaScript camelCase

Browse source
This commit is contained in:
the-djmaze 2023-01-24 18:58:25 +01:00
parent 7a53cae32f
commit f080a302b1
50 changed files with 501 additions and 562 deletions
Download patch file Download diff file Expand all files Collapse all files

20
dev/Stores/User/GnuPG.js
View file

@ -63,7 +63,7 @@ export const GnuPGUserStore = new class {
}
}
}, {
KeyId: key.id,
keyId: key.id,
isPrivate: isPrivate
}
);
@ -77,7 +77,7 @@ export const GnuPGUserStore = new class {
showScreenPopup(OpenPgpKeyPopupView, [key]);
}
}, {
KeyId: key.id,
keyId: key.id,
isPrivate: isPrivate,
Passphrase: pass
}
@ -166,7 +166,7 @@ export const GnuPGUserStore = new class {
const
pgpInfo = message.pgpEncrypted();
if (pgpInfo) {
let ids = [message.to[0].email].concat(pgpInfo.KeyIds),
let ids = [message.to[0].email].concat(pgpInfo.keyIds),
i = ids.length, key;
while (i--) {
key = findGnuPGKey(this.privateKeys, ids[i]);
@ -177,10 +177,10 @@ export const GnuPGUserStore = new class {
if (key) {
// Also check message.from[0].email
let params = {
Folder: message.folder,
Uid: message.uid,
PartId: pgpInfo.PartId,
KeyId: key.id,
folder: message.folder,
uid: message.uid,
partId: pgpInfo.PartId,
keyId: key.id,
Passphrase: await askPassphrase(key, 'BUTTON_DECRYPT'),
Data: '' // message.plain() optional
}
@ -195,13 +195,13 @@ export const GnuPGUserStore = new class {
}
async verify(message) {
let data = message.pgpSigned(); // { BodyPartId: "1", SigPartId: "2", MicAlg: "pgp-sha256" }
let data = message.pgpSigned(); // { bodyPartId: "1", sigPartId: "2", micAlg: "pgp-sha256" }
if (data) {
data = { ...data }; // clone
// const sender = message.from[0].email;
// let mode = await this.hasPublicKeyForEmails([sender]);
data.Folder = message.folder;
data.Uid = message.uid;
data.folder = message.folder;
data.uid = message.uid;
if (data.BodyPart) {
data.BodyPart = data.BodyPart.raw;
data.SigPart = data.SigPart.body;

36
dev/Stores/User/Messagelist.js
View file

@ -47,7 +47,7 @@ addObservablesTo(MessagelistUserStore, {
page: 1,
pageBeforeThread: 1,
error: '',
// Folder: '',
// folder: '',
endHash: '',
endThreadUid: 0,
@ -69,17 +69,17 @@ addComputablesTo(MessagelistUserStore, {
return value;
},
isArchiveFolder: () => FolderUserStore.archiveFolder() === MessagelistUserStore().Folder,
isArchiveFolder: () => FolderUserStore.archiveFolder() === MessagelistUserStore().folder,
isDraftFolder: () => FolderUserStore.draftsFolder() === MessagelistUserStore().Folder,
isDraftFolder: () => FolderUserStore.draftsFolder() === MessagelistUserStore().folder,
isSentFolder: () => FolderUserStore.sentFolder() === MessagelistUserStore().Folder,
isSentFolder: () => FolderUserStore.sentFolder() === MessagelistUserStore().folder,
isSpamFolder: () => FolderUserStore.spamFolder() === MessagelistUserStore().Folder,
isSpamFolder: () => FolderUserStore.spamFolder() === MessagelistUserStore().folder,
isTrashFolder: () => FolderUserStore.trashFolder() === MessagelistUserStore().Folder,
isTrashFolder: () => FolderUserStore.trashFolder() === MessagelistUserStore().folder,
archiveAllowed: () => ![UNUSED_OPTION_VALUE, MessagelistUserStore().Folder].includes(FolderUserStore.archiveFolder())
archiveAllowed: () => ![UNUSED_OPTION_VALUE, MessagelistUserStore().folder].includes(FolderUserStore.archiveFolder())
&& !MessagelistUserStore.isDraftFolder(),
canMarkAsSpam: () => !(UNUSED_OPTION_VALUE === FolderUserStore.spamFolder()
@ -147,14 +147,14 @@ MessagelistUserStore.notifyNewMessages = (folder, newMessages) => {
i18n('MESSAGE_LIST/NEW_MESSAGE_NOTIFICATION', {
COUNT: len
}),
{ Url: mailBox(newMessages[0].Folder) }
{ Url: mailBox(newMessages[0].folder) }
);
} else {
newMessages.forEach(item => {
NotificationUserStore.display(
EmailCollectionModel.reviveFromJson(item.From).toString(),
EmailCollectionModel.reviveFromJson(item.from).toString(),
item.subject,
{ Folder: item.Folder, Uid: item.Uid }
{ folder: item.folder, uid: item.uid }
);
});
}
@ -208,12 +208,12 @@ MessagelistUserStore.reload = (bDropPagePosition = false, bDropCurrentFolderCach
let unreadCountChange = false;
const
folder = getFolderFromCacheList(collection.Folder),
folder = getFolderFromCacheList(collection.folder),
folderInfo = collection.folderInfo;
if (folder && !bCached) {
// folder.revivePropertiesFromJson(result);
folder.expires = Date.now();
folder.uidNext = folderInfo.UidNext;
folder.uidNext = folderInfo.uidNext;
folder.hash = collection.folderHash;
if (null != folderInfo.totalEmails) {
@ -228,8 +228,8 @@ MessagelistUserStore.reload = (bDropPagePosition = false, bDropCurrentFolderCach
folder.unreadEmails(folderInfo.unreadEmails);
}
folder.flags(folderInfo.Flags);
let flags = folderInfo.PermanentFlags;
folder.flags(folderInfo.flags);
let flags = folderInfo.permanentFlags;
if (flags.includes('\\*')) {
let i = 6;
while (--i) {
@ -253,14 +253,14 @@ MessagelistUserStore.reload = (bDropPagePosition = false, bDropCurrentFolderCach
MessagelistUserStore.threadUid(collection.threadUid);
MessagelistUserStore.endHash(
collection.Folder +
collection.folder +
'|' + collection.search +
'|' + MessagelistUserStore.threadUid() +
'|' + MessagelistUserStore.page()
);
MessagelistUserStore.endThreadUid(collection.threadUid);
const message = MessageUserStore.message();
if (message && collection.Folder !== message.folder) {
if (message && collection.folder !== message.folder) {
MessageUserStore.message(null);
}
@ -330,7 +330,7 @@ MessagelistUserStore.setAction = (sFolderFullName, iSetAction, messages) => {
folder.unreadEmails(folder.unreadEmails() - alreadyUnread + length);
}
Remote.request('MessageSetSeen', null, {
Folder: sFolderFullName,
folder: sFolderFullName,
Uids: rootUids.join(','),
SetAction: iSetAction == MessageSetAction.SetSeen ? 1 : 0
});
@ -339,7 +339,7 @@ MessagelistUserStore.setAction = (sFolderFullName, iSetAction, messages) => {
case MessageSetAction.SetFlag:
case MessageSetAction.UnsetFlag:
Remote.request('MessageSetFlagged', null, {
Folder: sFolderFullName,
folder: sFolderFullName,
Uids: rootUids.join(','),
SetAction: iSetAction == MessageSetAction.SetFlag ? 1 : 0
});

6
dev/Stores/User/Notification.js
View file

@ -11,7 +11,7 @@ const HTML5Notification = window.Notification,
NotificationsGranted = () => 'granted' === HTML5NotificationStatus(),
dispatchMessage = data => {
focus();
if (data.Folder && data.Uid) {
if (data.folder && data.uid) {
fireEvent('mailbox.message.show', data);
} else if (data.Url) {
hasher.setHash(data.Url);
@ -60,8 +60,8 @@ export const NotificationUserStore = new class {
icon: imageSrc || Links.staticLink('css/images/icon-message-notification.png'),
data: messageData
};
if (messageData?.Uid) {
options.tag = messageData.Uid;
if (messageData?.uid) {
options.tag = messageData.uid;
}
if (WorkerNotifications) {
// Service-Worker-Allowed HTTP header to allow the scope.

8
dev/Stores/User/OpenPGP.js
View file

@ -214,14 +214,14 @@ export const OpenPGPUserStore = new class {
* https://docs.openpgpjs.org/#sign-and-verify-cleartext-messages
*/
async verify(message) {
const data = message.pgpSigned(), // { BodyPartId: "1", SigPartId: "2", MicAlg: "pgp-sha256" }
const data = message.pgpSigned(), // { bodyPartId: "1", sigPartId: "2", micAlg: "pgp-sha256" }
publicKey = this.publicKeys().find(key => key.emails.includes(message.from[0].email));
if (data && publicKey) {
data.Folder = message.folder;
data.Uid = message.uid;
data.folder = message.folder;
data.uid = message.uid;
data.GnuPG = 0;
let response;
if (data.SigPartId) {
if (data.sigPartId) {
response = await Remote.post('MessagePgpVerify', null, data);
} else if (data.BodyPart) {
response = { Result: { text: data.BodyPart.raw, signature: data.SigPart.body } };

2
dev/Stores/User/Pgp.js
View file

@ -198,7 +198,7 @@ export const
gnupg = GnuPGUserStore.hasPublicKeyForEmails([sender]),
openpgp = OpenPGPUserStore.hasPublicKeyForEmails([sender]);
// Detached signature use GnuPG first, else we must download whole message
if (gnupg && signed.SigPartId) {
if (gnupg && signed.sigPartId) {
return GnuPGUserStore.verify(message);
}
if (openpgp) {