From 8d96bd4ccdeede24d1b729623a1d990594f134e1 Mon Sep 17 00:00:00 2001
From: Aetherinox <aetherinox@proton.me>
Date: Fri, 26 Apr 2024 15:15:13 -0700
Subject: [PATCH] fix: handle google drive shortcuts [#2008]

---
 app/scripts/storage/impl/storage-gdrive.js | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/app/scripts/storage/impl/storage-gdrive.js b/app/scripts/storage/impl/storage-gdrive.js
index 63a8460b..b33e59b2 100644
--- a/app/scripts/storage/impl/storage-gdrive.js
+++ b/app/scripts/storage/impl/storage-gdrive.js
@@ -212,7 +212,7 @@ class StorageGDrive extends StorageBase {
                 }
 
                 const urlParams = {
-                    fields: 'files(id,name,mimeType,headRevisionId)',
+                    fields: 'files(id,name,mimeType,headRevisionId,shortcutDetails)',
                     q: query,
                     pageSize: 1000,
                     includeItemsFromAllDrives: true,
@@ -233,9 +233,12 @@ class StorageGDrive extends StorageBase {
 
                         const fileList = response.files.map((f) => ({
                             name: f.name,
-                            path: f.id,
+                            path: f.shortcutDetails?.targetId ?? f.id,
                             rev: f.headRevisionId,
-                            dir: f.mimeType === 'application/vnd.google-apps.folder'
+                            dir:
+                                f.mimeType === 'application/vnd.google-apps.folder' ||
+                                f.shortcutDetails?.targetMimeType ===
+                                    'application/vnd.google-apps.folder'
                         }));
                         if (!dir) {
                             fileList.unshift({