UniqueId always included in Items filter

danzuep · Sep 20, 2023 · 70515e2 · 70515e2
1 parent 4d3549b
commit 70515e2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/source/MailKitSimplified.Receiver/Abstractions/IMailReader.cs b/source/MailKitSimplified.Receiver/Abstractions/IMailReader.cs
@@ -53,7 +53,7 @@ public interface IMailReader
         IMailReader Query(SearchQuery searchQuery);
 
         /// <summary>
-        /// Set a which message summary parts to fetch.
+        /// Set which message summary parts to fetch. UniqueId is always included.
         /// </summary>
         /// <param name="messageSummaryItems">Message summary item filter.</param>
         /// <returns>Fluent <see cref="IMailReader"/>.</returns>

diff --git a/source/MailKitSimplified.Receiver/Services/MailFolderReader.cs b/source/MailKitSimplified.Receiver/Services/MailFolderReader.cs
@@ -143,7 +143,7 @@ public IMailReader Query(SearchQuery searchQuery)
 
         public IMailReader Items(MessageSummaryItems messageSummaryItems)
         {
-            _messageSummaryItems = messageSummaryItems;
+            _messageSummaryItems = messageSummaryItems | MessageSummaryItems.UniqueId;
             return this;
         }
 
@@ -217,7 +217,6 @@ private async Task<IList<IMessageSummary>> GetMessageSummariesAsync(IMailFolder
                 return Array.Empty<IMessageSummary>();
             }
             IList<IMessageSummary> filteredSummaries;
-            filter |= MessageSummaryItems.UniqueId;
             if (_uniqueIds != null)
             {
                 filteredSummaries = await mailFolder.FetchAsync(_uniqueIds, filter, cancellationToken).ConfigureAwait(false);
@@ -269,6 +268,7 @@ public async Task<IList<IMessageSummary>> GetMessageSummariesAsync(MessageSummar
                 _logger.LogInformation("Take(0) means no results will be returned.");
                 return Array.Empty<IMessageSummary>();
             }
+            filter |= MessageSummaryItems.UniqueId;
             (var mailFolder, var closeWhenFinished) = await OpenMailFolderAsync(cancellationToken).ConfigureAwait(false);
             var messageSummaries = await GetMessageSummariesAsync(mailFolder, filter, cancellationToken).ConfigureAwait(false);
             await CloseMailFolderAsync(mailFolder, closeWhenFinished, messageSummaries.Count).ConfigureAwait(false);