Use JMAP rfc8621 section-2 totalEmails, unreadEmails and isSubscribed

dev/App/User.js

@@ -229,11 +229,11 @@ export class AppUser extends AbstractApp {
 
 							setFolderHash(result.Folder, result.Hash);
 
-							folderFromCache.messageCountAll(result.MessageCount);
+							folderFromCache.messageCountAll(result.totalEmails);
 
-							let unreadCountChange = (folderFromCache.messageCountUnread() !== result.MessageUnseenCount);
+							let unreadCountChange = (folderFromCache.messageCountUnread() !== result.unreadEmails);
 
-							folderFromCache.messageCountUnread(result.MessageUnseenCount);
+							folderFromCache.messageCountUnread(result.unreadEmails);
 
 							if (unreadCountChange) {
 								MessageFlagsCache.clearFolder(folderFromCache.fullName);

dev/Common/Folders.js

@@ -148,11 +148,11 @@ folderInformationMultiply = (boot = false) => {
 
 						setFolderHash(item.Folder, item.Hash);
 
-						folder.messageCountAll(item.MessageCount);
+						folder.messageCountAll(item.totalEmails);
 
-						let unreadCountChange = folder.messageCountUnread() !== item.MessageUnseenCount;
+						let unreadCountChange = folder.messageCountUnread() !== item.unreadEmails;
 
-						folder.messageCountUnread(item.MessageUnseenCount);
+						folder.messageCountUnread(item.unreadEmails);
 
 						if (unreadCountChange) {
 							MessageFlagsCache.clearFolder(folder.fullName);

dev/Model/FolderCollection.js

@@ -158,19 +158,18 @@ export class FolderCollectionModel extends AbstractCollectionModel
 				|| !isArray(expandedFolders)
 				|| !expandedFolders.includes(oCacheFolder.fullName));
 
-			if (oFolder.Extended) {
+			if (oFolder.Hash) {
-				if (oFolder.Extended.Hash) {
+				setFolderHash(oCacheFolder.fullName, oFolder.Hash);
-					setFolderHash(oCacheFolder.fullName, oFolder.Extended.Hash);
 			}
 
-				if (null != oFolder.Extended.MessageCount) {
+			if (null != oFolder.totalEmails) {
-					oCacheFolder.messageCountAll(oFolder.Extended.MessageCount);
+				oCacheFolder.messageCountAll(oFolder.totalEmails);
 			}
 
-				if (null != oFolder.Extended.MessageUnseenCount) {
+			if (null != oFolder.unreadEmails) {
-					oCacheFolder.messageCountUnread(oFolder.Extended.MessageUnseenCount);
+				oCacheFolder.messageCountUnread(oFolder.unreadEmails);
-				}
 			}
+
 			return oCacheFolder;
 		});
 
@@ -252,7 +251,7 @@ export class FolderModel extends AbstractModel {
 			focused: false,
 			selected: false,
 			edited: false,
-			subscribed: true,
+			isSubscribed: true,
 			checkable: false, // Check for new messages
 			askDelete: false,
 
@@ -336,7 +335,7 @@ export class FolderModel extends AbstractModel {
 
 				hasVisibleSubfolders: () => !!folder.subFolders().find(folder => folder.visible()),
 
-				hasSubscriptions: () => folder.subscribed() | !!folder.subFolders().find(
+				hasSubscriptions: () => folder.isSubscribed() | !!folder.subFolders().find(
 						oFolder => {
 							const subscribed = oFolder.hasSubscriptions();
 							return !oFolder.isSystemFolder() && subscribed;
@@ -359,13 +358,13 @@ export class FolderModel extends AbstractModel {
 				 * - hasVisibleSubfolders()
 				 * Or when all below conditions are true:
 				 * - selectable()
-				 * - subscribed() OR hideUnsubscribed = false
+				 * - isSubscribed() OR hideUnsubscribed = false
 				 * - FolderType.User
 				 * - not kolabType()
 				 */
 				visible: () => {
 					const selectable = folder.canBeSelected(),
-						visible = (folder.subscribed() | !SettingsUserStore.hideUnsubscribed()) && selectable;
+						visible = (folder.isSubscribed() | !SettingsUserStore.hideUnsubscribed()) && selectable;
 					return folder.hasVisibleSubfolders() | visible;
 				},
 

dev/Model/MessageCollection.js

@@ -17,8 +17,8 @@ export class MessageCollectionModel extends AbstractCollectionModel
 		this.Folder
 		this.FolderHash
 		this.Limit
-		this.MessageCount
+		this.totalEmails
-		this.MessageUnseenCount
+		this.unreadEmails
 		this.MessageResultCount
 		this.NewMessages
 		this.Offset

dev/Settings/User/Folders.js

@@ -71,7 +71,7 @@ export class UserSettingsFolders /*extends AbstractViewSettings*/ {
 			Remote.abort('Folders').post('FolderRename', FolderUserStore.foldersRenaming, {
 					Folder: folder.fullName,
 					NewFolderName: nameToEdit,
-					Subscribe: folder.subscribed() ? 1 : 0
+					Subscribe: folder.isSubscribed() ? 1 : 0
 				})
 				.then(data => {
 					folder.name(nameToEdit/*data.Name*/);
@@ -138,7 +138,7 @@ export class UserSettingsFolders /*extends AbstractViewSettings*/ {
 							() => {
 //								folderToRemove.flags.push('\\nonexistent');
 								folderToRemove.selectable(false);
-//								folderToRemove.subscribed(false);
+//								folderToRemove.isSubscribed(false);
 //								folderToRemove.checkable(false);
 								if (!folderToRemove.subFolders.length) {
 									removeFolderFromCacheList(folderToRemove.fullName);
@@ -170,12 +170,12 @@ export class UserSettingsFolders /*extends AbstractViewSettings*/ {
 	}
 
 	toggleFolderSubscription(folder) {
-		let subscribe = !folder.subscribed();
+		let subscribe = !folder.isSubscribed();
 		Remote.request('FolderSubscribe', null, {
 			Folder: folder.fullName,
 			Subscribe: subscribe ? 1 : 0
 		});
-		folder.subscribed(subscribe);
+		folder.isSubscribed(subscribe);
 	}
 
 	toggleFolderCheckable(folder) {

dev/Stores/User/Folder.js

@@ -138,7 +138,7 @@ export const FolderUserStore = new class {
 						folder.selectable() &&
 						folder.exists &&
 						timeout > folder.expires &&
-						(folder.isSystemFolder() || (folder.subscribed() && (folder.checkable() || !bDisplaySpecSetting)))
+						(folder.isSystemFolder() || (folder.isSubscribed() && (folder.checkable() || !bDisplaySpecSetting)))
 					) {
 						timeouts.push([folder.expires, folder.fullName]);
 					}

dev/Stores/User/Messagelist.js

@@ -193,17 +193,17 @@ MessagelistUserStore.reload = (bDropPagePosition = false, bDropCurrenFolderCache
 
 						setFolderHash(collection.Folder, collection.FolderHash);
 
-						if (null != collection.MessageCount) {
+						if (null != collection.totalEmails) {
-							folder.messageCountAll(collection.MessageCount);
+							folder.messageCountAll(collection.totalEmails);
 						}
 
-						if (null != collection.MessageUnseenCount) {
+						if (null != collection.unreadEmails) {
-							if (pInt(folder.messageCountUnread()) !== pInt(collection.MessageUnseenCount)) {
+							if (pInt(folder.messageCountUnread()) !== pInt(collection.unreadEmails)) {
 								unreadCountChange = true;
 								MessageFlagsCache.clearFolder(folder.fullName);
 							}
 
-							folder.messageCountUnread(collection.MessageUnseenCount);
+							folder.messageCountUnread(collection.unreadEmails);
 						}
 
 						MessagelistUserStore.initUidNextAndNewMessages(folder.fullName, collection.UidNext, collection.NewMessages);

dev/Styles/User/MessageList.less

@@ -338,14 +338,14 @@ html:not(rl-mobile) {
 	.flagParent {
 		padding: 0 10px 0 5px;
 	}
+	.flagParent::after {
+		content: '☆'; /*⚐*/
+	}
 	&.flag-\\flagged .flagParent::after,
 	&.hasFlaggedSubMessage .flagParent::after {
 		color: orange;
 		content: '★'; /*⚑*/
 	}
-	&:not(.flag-\\flagged):not(.hasFlaggedSubMessage) .flagParent::after {
-		content: '☆'; /*⚐*/
-	}
 	&:not(.flag-\\flagged):not(.hasFlaggedSubMessage) .flagParent:not(:hover) {
 		opacity: 0.5;
 	}

snappymail/v/0.0.0/app/libraries/MailSo/Imap/FolderInformation.php

@@ -67,9 +67,8 @@ class FolderInformation implements \JsonSerializable
 			'Flags' => $this->Flags,
 			'PermanentFlags' => $this->PermanentFlags,
 /*
-			'Messages' => $this->MESSAGES,
+			'totalEmails'   => $this->MESSAGES,
-			'Unseen' => $this->UNSEEN,
+			'unreadEmails'  => $this->UNSEEN,
-			'Recent'        => $this->RECENT,
 			'UidNext'       => $this->UIDNEXT,
 			'UidValidity'   => $this->UIDVALIDITY,
 			'Highestmodseq' => $this->HIGHESTMODSEQ,

snappymail/v/0.0.0/app/libraries/MailSo/Mail/Folder.php

@@ -209,8 +209,8 @@ class Folder implements \JsonSerializable
 		$aStatus = $this->oImapFolder->getStatusItems();
 		if ($aStatus && isset($aStatus['MESSAGES'], $aStatus['UNSEEN'], $aStatus['UIDNEXT'])) {
 			$aExtended = array(
-				'MessageCount' => (int) $aStatus['MESSAGES'],
+				'totalEmails' => (int) $aStatus['MESSAGES'],
-				'MessageUnseenCount' => (int) $aStatus['UNSEEN'],
+				'unreadEmails' => (int) $aStatus['UNSEEN'],
 				'UidNext' => (int) $aStatus['UIDNEXT'],
 //				'Hash' => $this->MailClient()->GenerateFolderHash(
 //					$this->FullName(), $aStatus['MESSAGES'], $aStatus['UIDNEXT'],
@@ -223,7 +223,7 @@ class Folder implements \JsonSerializable
 			'Name' => $this->Name(),
 			'FullName' => $this->FullName(),
 			'Delimiter' => (string) $this->Delimiter(),
-			'Subscribed' => $this->bSubscribed,
+			'isSubscribed' => $this->bSubscribed,
 			'Exists' => $this->bExists,
 			'Selectable' => $this->IsSelectable(),
 			'Flags' => $this->FlagsLowerCase(),

snappymail/v/0.0.0/app/libraries/MailSo/Mail/MailClient.php

@@ -546,8 +546,8 @@ class MailClient
 		return array(
 			'Folder' => $sFolderName,
 			'Hash' => $this->GenerateFolderHash($sFolderName, $iCount, $iUidNext, $iHighestModSeq),
-			'MessageCount' => $iCount,
+			'totalEmails' => $iCount,
-			'MessageUnseenCount' => $iUnseenCount,
+			'unreadEmails' => $iUnseenCount,
 			'UidNext' => $iUidNext,
 			'MessagesFlags' => $aFlags,
 			'HighestModSeq' => $iHighestModSeq,
@@ -836,8 +836,8 @@ class MailClient
 		$oMessageCollection->Search = $sSearch;
 		$oMessageCollection->ThreadUid = $oParams->iThreadUid;
 		$oMessageCollection->Filtered = '' !== \MailSo\Config::$MessageListPermanentFilter;
-		$oMessageCollection->MessageCount = $iMessageRealCount;
+		$oMessageCollection->totalEmails = $iMessageRealCount;
-		$oMessageCollection->MessageUnseenCount = $iMessageUnseenCount;
+		$oMessageCollection->unreadEmails = $iMessageUnseenCount;
 
 		$aUids = array();
 		$aAllThreads = [];

snappymail/v/0.0.0/app/libraries/MailSo/Mail/MessageCollection.php

@@ -25,12 +25,12 @@ class MessageCollection extends \MailSo\Base\Collection
 	/**
 	 * @var int
 	 */
-	public $MessageCount = 0;
+	public $totalEmails = 0;
 
 	/**
 	 * @var int
 	 */
-	public $MessageUnseenCount = 0;
+	public $unreadEmails = 0;
 
 	/**
 	 * @var int
@@ -95,8 +95,8 @@ class MessageCollection extends \MailSo\Base\Collection
 	public function jsonSerialize()
 	{
 		return array_merge(parent::jsonSerialize(), array(
-			'MessageCount' => $this->MessageCount,
+			'totalEmails' => $this->totalEmails,
-			'MessageUnseenCount' => $this->MessageUnseenCount,
+			'unreadEmails' => $this->unreadEmails,
 			'MessageResultCount' => $this->MessageResultCount,
 			'Folder' => $this->FolderName,
 			'FolderHash' => $this->FolderHash,

snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Folders.php

@@ -457,8 +457,8 @@ trait Folders
 							$aResult[] = [
 								'Folder' => $aInboxInformation['Folder'],
 								'Hash' => $aInboxInformation['Hash'],
-								'MessageCount' => $aInboxInformation['MessageCount'],
+								'totalEmails' => $aInboxInformation['totalEmails'],
-								'MessageUnseenCount' => $aInboxInformation['MessageUnseenCount'],
+								'unreadEmails' => $aInboxInformation['unreadEmails'],
 							];
 						}
 					}

snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Response.php

@@ -266,21 +266,24 @@ trait Response
 
 		if ($mResponse instanceof \MailSo\Mail\Folder)
 		{
-			$aExtended = null;
+			$aResult = $mResponse->jsonSerialize();
+
 			$aStatus = $mResponse->Status();
 			if ($aStatus && isset($aStatus['MESSAGES'], $aStatus['UNSEEN'], $aStatus['UIDNEXT'])) {
-				$aExtended = array(
+				$aResult = \array_merge(
-					'MessageCount' => (int) $aStatus['MESSAGES'],
+					$aResult,
-					'MessageUnseenCount' => (int) $aStatus['UNSEEN'],
+					[
+						'totalEmails' => (int) $aStatus['MESSAGES'],
+						'unreadEmails' => (int) $aStatus['UNSEEN'],
 						'UidNext' => (int) $aStatus['UIDNEXT'],
 						'Hash' => $this->MailClient()->GenerateFolderHash(
 							$mResponse->FullName(), $aStatus['MESSAGES'], $aStatus['UIDNEXT'],
 								empty($aStatus['HIGHESTMODSEQ']) ? 0 : $aStatus['HIGHESTMODSEQ'])
+					]
 				);
 			}
 
-			if (null === $this->aCheckableFolder)
+			if (null === $this->aCheckableFolder) {
-			{
 				$aCheckable = \json_decode(
 					$this->SettingsProvider(true)
 					->Load($this->getAccountFromToken())
@@ -288,14 +291,9 @@ trait Response
 				);
 				$this->aCheckableFolder = \is_array($aCheckable) ? $aCheckable : array();
 			}
+			$aResult['Checkable'] = \in_array($mResponse->FullName(), $this->aCheckableFolder);
 
-			return \array_merge(
+			return $aResult;
-				$mResponse->jsonSerialize(),
-				array(
-					'Checkable' => \in_array($mResponse->FullName(), $this->aCheckableFolder),
-					'Extended' => $aExtended,
-				)
-			);
 		}
 
 		if ($mResponse instanceof \MailSo\Base\Collection)

snappymail/v/0.0.0/app/templates/Views/User/SettingsFolderItem.html

@@ -15,11 +15,11 @@
 		<span class="e-action fontastic" data-bind="visible: canBeDeleted() && !askDelete(), click: $root.folderForDeletion">🗑</span>
 	</td>
 	<td data-i18n="[title]SETTINGS_FOLDERS/HELP_SHOW_HIDE_FOLDER">
-		<span class="e-action fontastic" data-bind="css: {'unsubscribed-folder':!subscribed()}, visible: canBeSubscribed(), click: $root.toggleFolderSubscription">👁</span>
+		<span class="e-action fontastic" data-bind="css: {'unsubscribed-folder':!isSubscribed()}, visible: canBeSubscribed(), click: $root.toggleFolderSubscription">👁</span>
 	</td>
 	<!-- ko if: $root.displaySpecSetting -->
 	<td data-i18n="[title]SETTINGS_FOLDERS/HELP_CHECK_FOR_NEW_MESSAGES">
-		<span class="e-action" data-bind="css: {'check-folder':checkable(), 'unchecked-folder':!checkable()}, visible: canBeSelected() && subscribed(), click: $root.toggleFolderCheckable">
+		<span class="e-action" data-bind="css: {'check-folder':checkable(), 'unchecked-folder':!checkable()}, visible: canBeSelected() && isSubscribed(), click: $root.toggleFolderCheckable">
 			<i class="icon-check-mark-circle-two"></i>
 		</span>
 	</td>