From eb6376e6416c3373563371f99cfd054d6ab4320c Mon Sep 17 00:00:00 2001 From: Abhishek Pandey Date: Fri, 26 Jan 2024 18:40:46 -0800 Subject: [PATCH] Rebase changes --- src/internal/m365/collection/groups/collection.go | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/internal/m365/collection/groups/collection.go b/src/internal/m365/collection/groups/collection.go index 30d48977b..3f622ac92 100644 --- a/src/internal/m365/collection/groups/collection.go +++ b/src/internal/m365/collection/groups/collection.go @@ -382,8 +382,7 @@ func (col *lazyFetchCollection[C, I]) streamItems(ctx context.Context, errs *fau "item_id", id, "parent_path", path.LoggableDir(col.LocationPath().String())) - // Conversation posts carry a .data suffix, while channel messages - // don't have any suffix. Metadata files are only supported for conversations. + // Channel message files don't carry .data suffix, post files do. dataFile := id // Handle metadata before data so that if metadata file fails, @@ -433,7 +432,7 @@ func (col *lazyFetchCollection[C, I]) streamItems(ctx context.Context, errs *fau modTime: modTime, getAndAugment: col.getAndAugment, resourceID: col.protectedResource, - itemID: dataFile, + itemID: id, containerIDs: col.FullPath().Folders(), contains: col.contains, parentPath: col.LocationPath().String(),