the-djmaze/snappymail
1
1
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2024-11-10 09:02:45 +08:00
Code Issues Projects Releases Packages Wiki Activity

Bugfix: inboxFolderName was incorrect

Browse source 
You could have potentionally deleted INBOX and other issues
This commit is contained in:
djmaze 2020-10-15 12:23:11 +02:00
parent 3bfe2c67d1
commit b68d04aacd
4 changed files with 23 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
dev/Common/Cache.js
View file

@ -7,7 +7,7 @@ let FOLDERS_CACHE = {},
FOLDERS_UID_NEXT_CACHE = {},
MESSAGE_FLAGS_CACHE = {},
NEW_MESSAGE_CACHE = {},
inboxFolderName = '';
inboxFolderName = 'INBOX';
const REQUESTED_MESSAGE_CACHE = {};
@ -79,7 +79,14 @@ export function clearNewMessageCache() {
* @returns {string}
*/
export function getFolderInboxName() {
return inboxFolderName || 'INBOX';
return inboxFolderName;
}
/**
* @returns {string}
*/
export function setFolderInboxName(name) {
inboxFolderName = name;
}
/**
@ -93,12 +100,11 @@ export function getFolderFullNameRaw(folderHash) {
/**
* @param {string} folderHash
* @param {string} folderFullNameRaw
* @param {?FolderModel} folder
*/
export function setFolderFullNameRaw(folderHash, folderFullNameRaw) {
export function setFolder(folderHash, folderFullNameRaw, folder) {
FOLDERS_CACHE[folderFullNameRaw] = folder;
FOLDERS_NAME_CACHE[folderHash] = folderFullNameRaw;
if (!inboxFolderName || 'INBOX' === folderFullNameRaw) {
inboxFolderName = folderFullNameRaw;
}
}
/**
@ -145,19 +151,11 @@ export function getFolderFromCacheList(folderFullNameRaw) {
return folderFullNameRaw && FOLDERS_CACHE[folderFullNameRaw] ? FOLDERS_CACHE[folderFullNameRaw] : null;
}
/**
* @param {string} folderFullNameRaw
* @param {?FolderModel} folder
*/
export function setFolderToCacheList(folderFullNameRaw, folder) {
FOLDERS_CACHE[folderFullNameRaw] = folder;
}
/**
* @param {string} folderFullNameRaw
*/
export function removeFolderFromCacheList(folderFullNameRaw) {
setFolderToCacheList(folderFullNameRaw, null);
delete FOLDERS_CACHE[folderFullNameRaw];
}
/**

10
dev/Model/Folder.js
View file

@ -3,7 +3,6 @@ import ko from 'ko';
import { FolderType } from 'Common/Enums';
import { isPosNumeric } from 'Common/UtilsUser';
import { i18n, trigger as translatorTrigger } from 'Common/Translator';
import { getFolderInboxName } from 'Common/Cache';
import { AbstractModel } from 'Knoin/AbstractModel';
@ -56,8 +55,6 @@ class FolderModel extends AbstractModel {
* @returns {FolderModel}
*/
initComputed() {
const inboxFolderName = getFolderInboxName();
this.isInbox = ko.computed(() => FolderType.Inbox === this.type());
this.hasSubScribedSubfolders = ko.computed(
@ -136,11 +133,11 @@ class FolderModel extends AbstractModel {
this.canBeDeleted = ko.computed(() => {
const bSystem = this.isSystemFolder();
return !bSystem && !this.subFolders().length && inboxFolderName !== this.fullNameRaw;
return !bSystem && !this.subFolders().length;
});
this.canBeSubScribed = ko.computed(
() => !this.isSystemFolder() && this.selectable && inboxFolderName !== this.fullNameRaw
() => !this.isSystemFolder() && this.selectable
);
this.canBeChecked = this.canBeSubScribed;
@ -263,7 +260,6 @@ class FolderModel extends AbstractModel {
*/
initByJson(json) {
let bResult = false;
const sInboxFolderName = getFolderInboxName();
if (json && 'Object/Folder' === json['@Object']) {
this.name(json.Name);
@ -278,8 +274,6 @@ class FolderModel extends AbstractModel {
this.subScribed(!!json.IsSubscribed);
this.checkable(!!json.Checkable);
this.type(sInboxFolderName === this.fullNameRaw ? FolderType.Inbox : FolderType.User);
bResult = true;
}

9
dev/Model/FolderCollection.js
View file

@ -2,7 +2,7 @@ import { AbstractCollectionModel } from 'Model/AbstractCollection';
import { UNUSED_OPTION_VALUE } from 'Common/Consts';
import { pInt } from 'Common/Utils';
import { ClientSideKeyName, ServerFolderType } from 'Common/Enums';
import { ClientSideKeyName, FolderType, ServerFolderType } from 'Common/Enums';
import * as Cache from 'Common/Cache';
import * as Local from 'Storage/Client';
@ -55,8 +55,11 @@ export class FolderCollectionModel extends AbstractCollectionModel
if (!oCacheFolder) {
oCacheFolder = FolderModel.newInstanceFromJson(oFolder);
if (oCacheFolder) {
Cache.setFolderToCacheList(oFolder.FullNameRaw, oCacheFolder);
Cache.setFolderFullNameRaw(oCacheFolder.fullNameHash, oFolder.FullNameRaw, oCacheFolder);
if (oFolder.FullNameRaw == result.SystemFolders[ServerFolderType.INBOX]) {
oCacheFolder.type(FolderType.Inbox);
Cache.setFolderInboxName(oFolder.FullNameRaw);
}
Cache.setFolder(oCacheFolder.fullNameHash, oFolder.FullNameRaw, oCacheFolder);
}
}

2
rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php
View file

@ -3108,6 +3108,7 @@ NewThemeLink IncludeCss TemplatesLink LangLink IncludeBackground PluginsLink Aut
{
$iFolderListType = $oFolder->GetFolderListType();
if (!isset($aResult[$iFolderListType]) && \in_array($iFolderListType, array(
\MailSo\Imap\Enumerations\FolderType::INBOX,
\MailSo\Imap\Enumerations\FolderType::SENT,
\MailSo\Imap\Enumerations\FolderType::DRAFTS,
\MailSo\Imap\Enumerations\FolderType::JUNK,
@ -3139,6 +3140,7 @@ NewThemeLink IncludeCss TemplatesLink LangLink IncludeBackground PluginsLink Aut
{
$iFolderType = isset($aMap[$sName]) ? $aMap[$sName] : $aMap[$sFullName];
if (!isset($aResult[$iFolderType]) && \in_array($iFolderType, array(
\MailSo\Imap\Enumerations\FolderType::INBOX,
\MailSo\Imap\Enumerations\FolderType::SENT,
\MailSo\Imap\Enumerations\FolderType::DRAFTS,
\MailSo\Imap\Enumerations\FolderType::JUNK,