Rebase changes
This commit is contained in:
parent
9f68f379e7
commit
eb6376e641
@ -382,8 +382,7 @@ func (col *lazyFetchCollection[C, I]) streamItems(ctx context.Context, errs *fau
|
|||||||
"item_id", id,
|
"item_id", id,
|
||||||
"parent_path", path.LoggableDir(col.LocationPath().String()))
|
"parent_path", path.LoggableDir(col.LocationPath().String()))
|
||||||
|
|
||||||
// Conversation posts carry a .data suffix, while channel messages
|
// Channel message files don't carry .data suffix, post files do.
|
||||||
// don't have any suffix. Metadata files are only supported for conversations.
|
|
||||||
dataFile := id
|
dataFile := id
|
||||||
|
|
||||||
// Handle metadata before data so that if metadata file fails,
|
// 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,
|
modTime: modTime,
|
||||||
getAndAugment: col.getAndAugment,
|
getAndAugment: col.getAndAugment,
|
||||||
resourceID: col.protectedResource,
|
resourceID: col.protectedResource,
|
||||||
itemID: dataFile,
|
itemID: id,
|
||||||
containerIDs: col.FullPath().Folders(),
|
containerIDs: col.FullPath().Folders(),
|
||||||
contains: col.contains,
|
contains: col.contains,
|
||||||
parentPath: col.LocationPath().String(),
|
parentPath: col.LocationPath().String(),
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user