From 4bc6c202d9a464f3d58468cf3304d4e0c44252e9 Mon Sep 17 00:00:00 2001
From: Jake Barnby <jakeb994@gmail.com>
Date: Tue, 20 Feb 2024 18:25:57 +1300
Subject: [PATCH] Use compound ID for push notification image

---
 app/controllers/api/messaging.php           | 20 ++++++++++++--------
 src/Appwrite/Platform/Workers/Messaging.php |  2 ++
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/app/controllers/api/messaging.php b/app/controllers/api/messaging.php
index 232582f19..c3112e117 100644
--- a/app/controllers/api/messaging.php
+++ b/app/controllers/api/messaging.php
@@ -2830,7 +2830,7 @@ App::post('/v1/messaging/messages/push')
     ->param('targets', [], new ArrayList(new UID()), 'List of Targets IDs.', true)
     ->param('data', null, new JSON(), 'Additional Data for push notification.', true)
     ->param('action', '', new Text(256), 'Action for push notification.', true)
-    ->param('image', '', new Key(), 'Image for push notification. Must be the ID of a jpeg or png image in Appwrite Storage.', true)
+    ->param('image', '', new CompoundUID(), 'Image for push notification. Must be a compound bucket ID to file ID of a jpeg, png, or bmp image in Appwrite Storage.', true)
     ->param('icon', '', new Text(256), 'Icon for push notification. Available only for Android and Web Platform.', true)
     ->param('sound', '', new Text(256), 'Sound for push notification. Available only for Android and IOS Platform.', true)
     ->param('color', '', new Text(256), 'Color for push notification. Available only for Android Platform.', true)
@@ -2876,19 +2876,23 @@ App::post('/v1/messaging/messages/push')
         }
 
         if (!empty($image)) {
-            $image = $dbForProject->getDocument('files', $image);
+            [$bucketId, $fileId] = CompoundUID::parse($image);
 
-            if ($image->isEmpty()) {
-                throw new Exception(Exception::STORAGE_FILE_NOT_FOUND);
+            $bucket = $dbForProject->getDocument('buckets', $bucketId);
+            if ($bucket->isEmpty()) {
+                throw new Exception(Exception::STORAGE_BUCKET_NOT_FOUND);
             }
 
-            $bucket = $dbForProject->getDocument('buckets', $image->getAttribute('bucketId'));
+            $file = $dbForProject->getDocument('bucket_' . $bucket->getInternalId(), $fileId);
+            if ($file->isEmpty()) {
+                throw new Exception(Exception::STORAGE_BUCKET_NOT_FOUND);
+            }
 
-            if (!\in_array(Permission::read(Role::any()), \array_merge($image->getRead(), $bucket->getRead()))) {
+            if (!\in_array(Permission::read(Role::any()), \array_merge($file->getRead(), $bucket->getRead()))) {
                 throw new Exception(Exception::STORAGE_FILE_NOT_PUBLIC);
             }
 
-            if (!\in_array($image->getAttribute('mimeType'), ['image/png', 'image/jpeg'])) {
+            if (!\in_array($file->getAttribute('mimeType'), ['image/png', 'image/jpeg'])) {
                 throw new Exception(Exception::STORAGE_FILE_TYPE_UNSUPPORTED);
             }
 
@@ -2900,7 +2904,7 @@ App::post('/v1/messaging/messages/push')
                 throw new Exception(Exception::STORAGE_FILE_NOT_PUBLIC);
             }
 
-            $image = "{$protocol}://{$host}/v1/storage/buckets/{$bucket->getId()}/files/{$image->getId()}/view?project={$project->getId()}";
+            $image = "{$protocol}://{$host}/v1/storage/buckets/{$bucket->getId()}/files/{$file->getId()}/view?project={$project->getId()}";
         }
 
         $pushData = [];
diff --git a/src/Appwrite/Platform/Workers/Messaging.php b/src/Appwrite/Platform/Workers/Messaging.php
index ef2d55307..a54f6e49f 100644
--- a/src/Appwrite/Platform/Workers/Messaging.php
+++ b/src/Appwrite/Platform/Workers/Messaging.php
@@ -636,6 +636,7 @@ class Messaging extends Action
         $body = $message['data']['body'];
         $data = $message['data']['data'] ?? null;
         $action = $message['data']['action'] ?? null;
+        $image = $message['data']['image'] ?? null;
         $sound = $message['data']['sound'] ?? null;
         $icon = $message['data']['icon'] ?? null;
         $color = $message['data']['color'] ?? null;
@@ -649,6 +650,7 @@ class Messaging extends Action
             $data,
             $action,
             $sound,
+            $image,
             $icon,
             $color,
             $tag,