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

Fetch response 'Collection/MessageCollection' to new MessageCollectionModel

Browse source
This commit is contained in:
djmaze 2020-09-16 15:44:36 +02:00
parent 8f07cf4ac6
commit 086a2c1927
4 changed files with 163 additions and 139 deletions
Download patch file Download diff file Expand all files Collapse all files

55
dev/Remote/User/Fetch.js
View file

@ -308,34 +308,25 @@ class RemoteUserFetch extends AbstractFetchRemote {
useThreads = AppStore.threadsAllowed() && SettingsStore.useThreads(),
inboxUidNext = getFolderInboxName() === sFolderFullNameRaw ? getFolderUidNext(sFolderFullNameRaw) : '';
if (folderHash && (!sSearch || !sSearch.includes('is:'))) {
return this.defaultRequest(
fCallback,
'MessageList',
{},
sSearch ? SEARCH_AJAX_TIMEOUT : DEFAULT_AJAX_TIMEOUT,
'MessageList/' +
subQueryPrefix() +
'/' +
urlsafeArray([
sFolderFullNameRaw,
iOffset,
iLimit,
sSearch,
AppStore.projectHash(),
folderHash,
inboxUidNext,
useThreads ? 1 : 0,
useThreads ? sThreadUid : ''
]),
bSilent ? [] : ['MessageList']
);
}
let params = {}, sGetAdd = '';
return this.defaultRequest(
fCallback,
'MessageList',
{
if (folderHash && (!sSearch || !sSearch.includes('is:'))) {
sGetAdd = 'MessageList/' +
subQueryPrefix() +
'/' +
urlsafeArray([
sFolderFullNameRaw,
iOffset,
iLimit,
sSearch,
AppStore.projectHash(),
folderHash,
inboxUidNext,
useThreads ? 1 : 0,
useThreads ? sThreadUid : ''
]);
} else {
params = {
Folder: sFolderFullNameRaw,
Offset: iOffset,
Limit: iLimit,
@ -343,9 +334,15 @@ class RemoteUserFetch extends AbstractFetchRemote {
UidNext: inboxUidNext,
UseThreads: useThreads ? 1 : 0,
ThreadUid: useThreads ? sThreadUid : ''
},
};
}
return this.defaultRequest(
fCallback,
'MessageList',
params,
sSearch ? SEARCH_AJAX_TIMEOUT : DEFAULT_AJAX_TIMEOUT,
'',
sGetAdd,
bSilent ? [] : ['MessageList']
);
}