merged with master

1 files changed, 9 insertions, 9 deletions

diff --git a/src/server/index.ts b/src/server/index.ts
index ee6a497ba..ddd909479 100644
--- a/src/server/index.ts
+++ b/src/server/index.ts
@@ -1049,23 +1049,22 @@ addSecureRoute({
 
         let failed: number[] = [];
 
-        const newMediaItems = await BatchedArray.from<GooglePhotosUploadUtils.MediaInput>(media, { batchSize: 25 }).batchedMapPatientInterval(
+        const batched = BatchedArray.from<GooglePhotosUploadUtils.MediaInput>(media, { batchSize: 25 });
+        const newMediaItems = await batched.batchedMapPatientInterval<NewMediaItem>(
             { magnitude: 100, unit: TimeUnit.Milliseconds },
-            async (batch: GooglePhotosUploadUtils.MediaInput[]) => {
-                const newMediaItems: NewMediaItem[] = [];
+            async (batch, collector) => {
                 for (let index = 0; index < batch.length; index++) {
-                    const element = batch[index];
-                    const uploadToken = await GooglePhotosUploadUtils.DispatchGooglePhotosUpload(element.url);
+                    const { url, description } = batch[index];
+                    const uploadToken = await GooglePhotosUploadUtils.DispatchGooglePhotosUpload(url);
                     if (!uploadToken) {
                         failed.push(index);
                     } else {
-                        newMediaItems.push({
-                            description: element.description,
+                        collector.push({
+                            description,
                             simpleMediaItem: { uploadToken }
                         });
                     }
                 }
-                return newMediaItems;
             }
         );
 
@@ -1075,7 +1074,7 @@ addSecureRoute({
         }
 
         GooglePhotosUploadUtils.CreateMediaItems(newMediaItems, req.body.album).then(
-            result => _success(res, { results: result.newMediaItemResults, failed }),
+            results => _success(res, { results, failed }),
             error => _error(res, mediaError, error)
         );
     }
@@ -1164,6 +1163,7 @@ const suffixMap: { [type: string]: (string | [string, string | ((json: any) => a
     "pdf": ["_t", "url"],
     "audio": ["_t", "url"],
     "web": ["_t", "url"],
+    "RichTextField": ["_t", value => value.Text],
     "date": ["_d", value => new Date(value.date).toISOString()],
     "proxy": ["_i", "fieldId"],
     "list": ["_l", list => {