From ab900d16d45d81c5677b62d1851c5ce0b5e9424f Mon Sep 17 00:00:00 2001
From: Jake Barnby <jakeb994@gmail.com>
Date: Tue, 3 Dec 2024 17:19:06 +1300
Subject: [PATCH 01/24] Allow apns content available

---
 app/controllers/api/messaging.php           |  9 +++---
 composer.json                               |  2 +-
 composer.lock                               | 33 +++++++++++++--------
 src/Appwrite/Platform/Workers/Messaging.php |  4 ++-
 4 files changed, 30 insertions(+), 18 deletions(-)

diff --git a/app/controllers/api/messaging.php b/app/controllers/api/messaging.php
index e4a627d027a..7116d31ba78 100644
--- a/app/controllers/api/messaging.php
+++ b/app/controllers/api/messaging.php
@@ -2915,10 +2915,11 @@
     ->param('action', '', new Text(256), 'Action for push notification.', 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. It should be formatted as <BUCKET_ID>:<FILE_ID>.', 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('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)
     ->param('tag', '', new Text(256), 'Tag for push notification. Available only for Android Platform.', true)
-    ->param('badge', '', new Text(256), 'Badge for push notification. Available only for IOS Platform.', true)
+    ->param('badge', '', new Text(256), 'Badge for push notification. Available only for iOS Platform.', true)
+    ->param('contentAvailable', false, new Boolean(), 'Content available for push notification. Available only for iOS Platform.', true)
     ->param('draft', false, new Boolean(), 'Is message a draft', true)
     ->param('scheduledAt', null, new DatetimeValidator(requireDateInFuture: true), 'Scheduled delivery time for message in [ISO 8601](https://www.iso.org/iso-8601-date-and-time-format.html) format. DateTime value must be in future.', true)
     ->inject('queueForEvents')
@@ -2927,7 +2928,7 @@
     ->inject('project')
     ->inject('queueForMessaging')
     ->inject('response')
-    ->action(function (string $messageId, string $title, string $body, array $topics, array $users, array $targets, ?array $data, string $action, string $image, string $icon, string $sound, string $color, string $tag, string $badge, bool $draft, ?string $scheduledAt, Event $queueForEvents, Database $dbForProject, Database $dbForConsole, Document $project, Messaging $queueForMessaging, Response $response) {
+    ->action(function (string $messageId, string $title, string $body, array $topics, array $users, array $targets, ?array $data, string $action, string $image, string $icon, string $sound, string $color, string $tag, string $badge, bool $contentAvailable, bool $draft, ?string $scheduledAt, Event $queueForEvents, Database $dbForProject, Database $dbForConsole, Document $project, Messaging $queueForMessaging, Response $response) {
         $messageId = $messageId == 'unique()'
             ? ID::unique()
             : $messageId;
@@ -3010,7 +3011,7 @@
 
         $pushData = [];
 
-        $keys = ['title', 'body', 'data', 'action', 'image', 'icon', 'sound', 'color', 'tag', 'badge'];
+        $keys = ['title', 'body', 'data', 'action', 'image', 'icon', 'sound', 'color', 'tag', 'badge', 'contentAvailable'];
 
         foreach ($keys as $key) {
             if (!empty($$key)) {
diff --git a/composer.json b/composer.json
index 512e203a5ed..7ecf0791257 100644
--- a/composer.json
+++ b/composer.json
@@ -59,7 +59,7 @@
         "utopia-php/image": "0.7.*",
         "utopia-php/locale": "0.4.*",
         "utopia-php/logger": "0.6.*",
-        "utopia-php/messaging": "0.12.*",
+        "utopia-php/messaging": "dev-feat-apns-content-available as 0.12.2",
         "utopia-php/migration": "0.6.*",
         "utopia-php/orchestration": "0.9.*",
         "utopia-php/platform": "0.7.*",
diff --git a/composer.lock b/composer.lock
index e5aacef40c7..b6e84656b6b 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "fae350df93342992edd8f639948e1570",
+    "content-hash": "04b9739820be8136d62de48c6325e763",
     "packages": [
         {
             "name": "adhocore/jwt",
@@ -3878,16 +3878,16 @@
         },
         {
             "name": "utopia-php/messaging",
-            "version": "0.12.2",
+            "version": "dev-feat-apns-content-available",
             "source": {
                 "type": "git",
                 "url": "https://github.com/utopia-php/messaging.git",
-                "reference": "f6790fba1fcee12163d51c65d2c226a7856295d9"
+                "reference": "2580b8357d2dde6ed567a52e5164cfe58fb9b6dd"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/utopia-php/messaging/zipball/f6790fba1fcee12163d51c65d2c226a7856295d9",
-                "reference": "f6790fba1fcee12163d51c65d2c226a7856295d9",
+                "url": "https://api.github.com/repos/utopia-php/messaging/zipball/2580b8357d2dde6ed567a52e5164cfe58fb9b6dd",
+                "reference": "2580b8357d2dde6ed567a52e5164cfe58fb9b6dd",
                 "shasum": ""
             },
             "require": {
@@ -3898,9 +3898,9 @@
                 "phpmailer/phpmailer": "6.9.1"
             },
             "require-dev": {
-                "laravel/pint": "1.13.11",
-                "phpstan/phpstan": "1.10.58",
-                "phpunit/phpunit": "10.5.10"
+                "laravel/pint": "1.*",
+                "phpstan/phpstan": "1.*",
+                "phpunit/phpunit": "11.*"
             },
             "type": "library",
             "autoload": {
@@ -3923,9 +3923,9 @@
             ],
             "support": {
                 "issues": "https://github.com/utopia-php/messaging/issues",
-                "source": "https://github.com/utopia-php/messaging/tree/0.12.2"
+                "source": "https://github.com/utopia-php/messaging/tree/feat-apns-content-available"
             },
-            "time": "2024-10-22T01:02:20+00:00"
+            "time": "2024-12-03T04:09:05+00:00"
         },
         {
             "name": "utopia-php/migration",
@@ -8556,9 +8556,18 @@
             "time": "2024-03-07T20:33:40+00:00"
         }
     ],
-    "aliases": [],
+    "aliases": [
+        {
+            "package": "utopia-php/messaging",
+            "version": "dev-feat-apns-content-available",
+            "alias": "0.12.2",
+            "alias_normalized": "0.12.2.0"
+        }
+    ],
     "minimum-stability": "stable",
-    "stability-flags": [],
+    "stability-flags": {
+        "utopia-php/messaging": 20
+    },
     "prefer-stable": false,
     "prefer-lowest": false,
     "platform": {
diff --git a/src/Appwrite/Platform/Workers/Messaging.php b/src/Appwrite/Platform/Workers/Messaging.php
index 58f6265ff47..5dee0fa72f0 100644
--- a/src/Appwrite/Platform/Workers/Messaging.php
+++ b/src/Appwrite/Platform/Workers/Messaging.php
@@ -686,6 +686,7 @@ private function buildPushMessage(Document $message): Push
         $color = $message['data']['color'] ?? null;
         $tag = $message['data']['tag'] ?? null;
         $badge = $message['data']['badge'] ?? null;
+        $contentAvailable = $message['data']['contentAvailable'] ?? false;
 
         return new Push(
             $to,
@@ -698,7 +699,8 @@ private function buildPushMessage(Document $message): Push
             $icon,
             $color,
             $tag,
-            $badge
+            $badge,
+            $contentAvailable
         );
     }
 

From fa49244b4b9ea481af6f61d8dfeeefdcd6e9c965 Mon Sep 17 00:00:00 2001
From: Jake Barnby <jakeb994@gmail.com>
Date: Tue, 3 Dec 2024 22:50:40 +1300
Subject: [PATCH 02/24] Fix param type

---
 app/controllers/api/messaging.php           | 2 +-
 src/Appwrite/Platform/Workers/Messaging.php | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/controllers/api/messaging.php b/app/controllers/api/messaging.php
index 7116d31ba78..54b3eb83cb2 100644
--- a/app/controllers/api/messaging.php
+++ b/app/controllers/api/messaging.php
@@ -2918,7 +2918,7 @@
     ->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)
     ->param('tag', '', new Text(256), 'Tag for push notification. Available only for Android Platform.', true)
-    ->param('badge', '', new Text(256), 'Badge for push notification. Available only for iOS Platform.', true)
+    ->param('badge', 0, new Integer(), 'Badge for push notification. Available only for iOS Platform.', true)
     ->param('contentAvailable', false, new Boolean(), 'Content available for push notification. Available only for iOS Platform.', true)
     ->param('draft', false, new Boolean(), 'Is message a draft', true)
     ->param('scheduledAt', null, new DatetimeValidator(requireDateInFuture: true), 'Scheduled delivery time for message in [ISO 8601](https://www.iso.org/iso-8601-date-and-time-format.html) format. DateTime value must be in future.', true)
diff --git a/src/Appwrite/Platform/Workers/Messaging.php b/src/Appwrite/Platform/Workers/Messaging.php
index 5dee0fa72f0..3edb0c2aed5 100644
--- a/src/Appwrite/Platform/Workers/Messaging.php
+++ b/src/Appwrite/Platform/Workers/Messaging.php
@@ -333,7 +333,6 @@ private function sendExternalMessage(
             $message->setAttribute('status', MessageStatus::SENT);
         }
 
-
         $message->removeAttribute('to');
 
         foreach ($providers as $provider) {

From a4611985476c5b8129f92bd3f66dcfc84e241705 Mon Sep 17 00:00:00 2001
From: Jake Barnby <jakeb994@gmail.com>
Date: Wed, 4 Dec 2024 19:27:55 +1300
Subject: [PATCH 03/24] Add critical and priority params

---
 app/controllers/api/messaging.php           | 25 +++++++++++++++++----
 composer.lock                               |  8 +++----
 src/Appwrite/Platform/Workers/Messaging.php | 10 ++++++++-
 3 files changed, 34 insertions(+), 9 deletions(-)

diff --git a/app/controllers/api/messaging.php b/app/controllers/api/messaging.php
index 54b3eb83cb2..45eba6e4346 100644
--- a/app/controllers/api/messaging.php
+++ b/app/controllers/api/messaging.php
@@ -2919,7 +2919,9 @@
     ->param('color', '', new Text(256), 'Color for push notification. Available only for Android Platform.', true)
     ->param('tag', '', new Text(256), 'Tag for push notification. Available only for Android Platform.', true)
     ->param('badge', 0, new Integer(), 'Badge for push notification. Available only for iOS Platform.', true)
-    ->param('contentAvailable', false, new Boolean(), 'Content available for push notification. Available only for iOS Platform.', true)
+    ->param('contentAvailable', false, new Boolean(), 'If set to true, the notification will be delivered in the background. Available only for iOS Platform.', true)
+    ->param('critical', false, new Boolean(), 'If set to true, the notification will be marked as critical. This requires the app to have the critical notification entitlement. Available only for iOS Platform.', true)
+    ->param('priority', 'high', new WhiteList(['normal', 'high']), 'Set the notification priority. "normal" will consider device battery state and may send notifications later. "high" will always attempt to immediately deliver the notification.', true)
     ->param('draft', false, new Boolean(), 'Is message a draft', true)
     ->param('scheduledAt', null, new DatetimeValidator(requireDateInFuture: true), 'Scheduled delivery time for message in [ISO 8601](https://www.iso.org/iso-8601-date-and-time-format.html) format. DateTime value must be in future.', true)
     ->inject('queueForEvents')
@@ -2928,7 +2930,7 @@
     ->inject('project')
     ->inject('queueForMessaging')
     ->inject('response')
-    ->action(function (string $messageId, string $title, string $body, array $topics, array $users, array $targets, ?array $data, string $action, string $image, string $icon, string $sound, string $color, string $tag, string $badge, bool $contentAvailable, bool $draft, ?string $scheduledAt, Event $queueForEvents, Database $dbForProject, Database $dbForConsole, Document $project, Messaging $queueForMessaging, Response $response) {
+    ->action(function (string $messageId, string $title, string $body, array $topics, array $users, array $targets, ?array $data, string $action, string $image, string $icon, string $sound, string $color, string $tag, string $badge, bool $contentAvailable, bool $critical, string $priority, bool $draft, ?string $scheduledAt, Event $queueForEvents, Database $dbForProject, Database $dbForConsole, Document $project, Messaging $queueForMessaging, Response $response) {
         $messageId = $messageId == 'unique()'
             ? ID::unique()
             : $messageId;
@@ -3011,7 +3013,7 @@
 
         $pushData = [];
 
-        $keys = ['title', 'body', 'data', 'action', 'image', 'icon', 'sound', 'color', 'tag', 'badge', 'contentAvailable'];
+        $keys = ['title', 'body', 'data', 'action', 'image', 'icon', 'sound', 'color', 'tag', 'badge', 'contentAvailable', 'critical', 'priority'];
 
         foreach ($keys as $key) {
             if (!empty($$key)) {
@@ -3697,6 +3699,9 @@
     ->param('color', null, new Text(256), 'Color for push notification. Available only for Android platforms.', true)
     ->param('tag', null, new Text(256), 'Tag for push notification. Available only for Android platforms.', true)
     ->param('badge', null, new Integer(), 'Badge for push notification. Available only for iOS platforms.', true)
+    ->param('contentAvailable', null, new Boolean(), 'If set to true, the notification will be delivered in the background. Available only for iOS Platform.', true)
+    ->param('critical', null, new Boolean(), 'If set to true, the notification will be marked as critical. This requires the app to have the critical notification entitlement. Available only for iOS Platform.', true)
+    ->param('priority', null, new WhiteList(['normal', 'high']), 'Set the notification priority. "normal" will consider device battery state and may send notifications later. "high" will always attempt to immediately deliver the notification.', true)
     ->param('draft', null, new Boolean(), 'Is message a draft', true)
     ->param('scheduledAt', null, new DatetimeValidator(requireDateInFuture: true), 'Scheduled delivery time for message in [ISO 8601](https://www.iso.org/iso-8601-date-and-time-format.html) format. DateTime value must be in future.', true)
     ->inject('queueForEvents')
@@ -3705,7 +3710,7 @@
     ->inject('project')
     ->inject('queueForMessaging')
     ->inject('response')
-    ->action(function (string $messageId, ?array $topics, ?array $users, ?array $targets, ?string $title, ?string $body, ?array $data, ?string $action, ?string $image, ?string $icon, ?string $sound, ?string $color, ?string $tag, ?int $badge, ?bool $draft, ?string $scheduledAt, Event $queueForEvents, Database $dbForProject, Database $dbForConsole, Document $project, Messaging $queueForMessaging, Response $response) {
+    ->action(function (string $messageId, ?array $topics, ?array $users, ?array $targets, ?string $title, ?string $body, ?array $data, ?string $action, ?string $image, ?string $icon, ?string $sound, ?string $color, ?string $tag, ?int $badge, ?bool $contentAvailable, ?bool $critical, ?string $priority, ?bool $draft, ?string $scheduledAt, Event $queueForEvents, Database $dbForProject, Database $dbForConsole, Document $project, Messaging $queueForMessaging, Response $response) {
         $message = $dbForProject->getDocument('messages', $messageId);
 
         if ($message->isEmpty()) {
@@ -3844,6 +3849,18 @@
             $pushData['badge'] = $badge;
         }
 
+        if (!\is_null($contentAvailable)) {
+            $pushData['contentAvailable'] = $contentAvailable;
+        }
+
+        if (!\is_null($critical)) {
+            $pushData['critical'] = $critical;
+        }
+
+        if (!\is_null($priority)) {
+            $pushData['priority'] = $priority;
+        }
+
         if (!\is_null($image)) {
             [$bucketId, $fileId] = CompoundUID::parse($image);
 
diff --git a/composer.lock b/composer.lock
index b6e84656b6b..8cddc64940c 100644
--- a/composer.lock
+++ b/composer.lock
@@ -3882,12 +3882,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/utopia-php/messaging.git",
-                "reference": "2580b8357d2dde6ed567a52e5164cfe58fb9b6dd"
+                "reference": "02ccc85424eabb680b5a2f1458a471f19bac56c0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/utopia-php/messaging/zipball/2580b8357d2dde6ed567a52e5164cfe58fb9b6dd",
-                "reference": "2580b8357d2dde6ed567a52e5164cfe58fb9b6dd",
+                "url": "https://api.github.com/repos/utopia-php/messaging/zipball/02ccc85424eabb680b5a2f1458a471f19bac56c0",
+                "reference": "02ccc85424eabb680b5a2f1458a471f19bac56c0",
                 "shasum": ""
             },
             "require": {
@@ -3925,7 +3925,7 @@
                 "issues": "https://github.com/utopia-php/messaging/issues",
                 "source": "https://github.com/utopia-php/messaging/tree/feat-apns-content-available"
             },
-            "time": "2024-12-03T04:09:05+00:00"
+            "time": "2024-12-03T09:44:33+00:00"
         },
         {
             "name": "utopia-php/migration",
diff --git a/src/Appwrite/Platform/Workers/Messaging.php b/src/Appwrite/Platform/Workers/Messaging.php
index 3edb0c2aed5..a5339c3764f 100644
--- a/src/Appwrite/Platform/Workers/Messaging.php
+++ b/src/Appwrite/Platform/Workers/Messaging.php
@@ -32,6 +32,7 @@
 use Utopia\Messaging\Messages\Email\Attachment;
 use Utopia\Messaging\Messages\Push;
 use Utopia\Messaging\Messages\SMS;
+use Utopia\Messaging\Priority;
 use Utopia\Platform\Action;
 use Utopia\Queue\Message;
 use Utopia\Storage\Device;
@@ -686,6 +687,11 @@ private function buildPushMessage(Document $message): Push
         $tag = $message['data']['tag'] ?? null;
         $badge = $message['data']['badge'] ?? null;
         $contentAvailable = $message['data']['contentAvailable'] ?? false;
+        $critical = $message['data']['critical'] ?? false;
+
+        $priority = $message['data']['priority'] === 'normal'
+            ? Priority::NORMAL
+            : Priority::HIGH;
 
         return new Push(
             $to,
@@ -699,7 +705,9 @@ private function buildPushMessage(Document $message): Push
             $color,
             $tag,
             $badge,
-            $contentAvailable
+            $contentAvailable,
+            $critical,
+            $priority
         );
     }
 

From 2934bdbd3ba7b223a90f5ca93d9711f69eba5832 Mon Sep 17 00:00:00 2001
From: Jake Barnby <jakeb994@gmail.com>
Date: Wed, 4 Dec 2024 20:16:13 +1300
Subject: [PATCH 04/24] Update messaging

---
 composer.lock | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/composer.lock b/composer.lock
index 8cddc64940c..dadea47a55c 100644
--- a/composer.lock
+++ b/composer.lock
@@ -3882,12 +3882,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/utopia-php/messaging.git",
-                "reference": "02ccc85424eabb680b5a2f1458a471f19bac56c0"
+                "reference": "4947ee3819a28aea303456a462051601e4d12ec9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/utopia-php/messaging/zipball/02ccc85424eabb680b5a2f1458a471f19bac56c0",
-                "reference": "02ccc85424eabb680b5a2f1458a471f19bac56c0",
+                "url": "https://api.github.com/repos/utopia-php/messaging/zipball/4947ee3819a28aea303456a462051601e4d12ec9",
+                "reference": "4947ee3819a28aea303456a462051601e4d12ec9",
                 "shasum": ""
             },
             "require": {
@@ -3925,7 +3925,7 @@
                 "issues": "https://github.com/utopia-php/messaging/issues",
                 "source": "https://github.com/utopia-php/messaging/tree/feat-apns-content-available"
             },
-            "time": "2024-12-03T09:44:33+00:00"
+            "time": "2024-12-04T07:10:23+00:00"
         },
         {
             "name": "utopia-php/migration",

From f4917f7bc6a18e98d71a036bc68734855623cded Mon Sep 17 00:00:00 2001
From: Jake Barnby <jakeb994@gmail.com>
Date: Thu, 5 Dec 2024 17:04:11 +1300
Subject: [PATCH 05/24] Reorder params

---
 app/controllers/api/messaging.php | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/app/controllers/api/messaging.php b/app/controllers/api/messaging.php
index 45eba6e4346..394f836164c 100644
--- a/app/controllers/api/messaging.php
+++ b/app/controllers/api/messaging.php
@@ -2906,12 +2906,12 @@
     ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
     ->label('sdk.response.model', Response::MODEL_MESSAGE)
     ->param('messageId', '', new CustomId(), 'Message ID. Choose a custom ID or generate a random ID with `ID.unique()`. Valid chars are a-z, A-Z, 0-9, period, hyphen, and underscore. Can\'t start with a special char. Max length is 36 chars.')
-    ->param('title', '', new Text(256), 'Title for push notification.')
-    ->param('body', '', new Text(64230), 'Body for push notification.')
+    ->param('title', null, new Text(256), 'Title for push notification.', true)
+    ->param('body', null, new Text(64230), 'Body for push notification.', true)
     ->param('topics', [], new ArrayList(new UID()), 'List of Topic IDs.', true)
     ->param('users', [], new ArrayList(new UID()), 'List of User IDs.', true)
     ->param('targets', [], new ArrayList(new UID()), 'List of Targets IDs.', true)
-    ->param('data', null, new JSON(), 'Additional Data for push notification.', true)
+    ->param('data', null, new JSON(), 'Additional key-value pair data for push notification.', true)
     ->param('action', '', new Text(256), 'Action for push notification.', 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. It should be formatted as <BUCKET_ID>:<FILE_ID>.', true)
     ->param('icon', '', new Text(256), 'Icon for push notification. Available only for Android and Web Platform.', true)
@@ -2919,18 +2919,18 @@
     ->param('color', '', new Text(256), 'Color for push notification. Available only for Android Platform.', true)
     ->param('tag', '', new Text(256), 'Tag for push notification. Available only for Android Platform.', true)
     ->param('badge', 0, new Integer(), 'Badge for push notification. Available only for iOS Platform.', true)
+    ->param('draft', false, new Boolean(), 'Is message a draft', true)
+    ->param('scheduledAt', null, new DatetimeValidator(requireDateInFuture: true), 'Scheduled delivery time for message in [ISO 8601](https://www.iso.org/iso-8601-date-and-time-format.html) format. DateTime value must be in future.', true)
     ->param('contentAvailable', false, new Boolean(), 'If set to true, the notification will be delivered in the background. Available only for iOS Platform.', true)
     ->param('critical', false, new Boolean(), 'If set to true, the notification will be marked as critical. This requires the app to have the critical notification entitlement. Available only for iOS Platform.', true)
     ->param('priority', 'high', new WhiteList(['normal', 'high']), 'Set the notification priority. "normal" will consider device battery state and may send notifications later. "high" will always attempt to immediately deliver the notification.', true)
-    ->param('draft', false, new Boolean(), 'Is message a draft', true)
-    ->param('scheduledAt', null, new DatetimeValidator(requireDateInFuture: true), 'Scheduled delivery time for message in [ISO 8601](https://www.iso.org/iso-8601-date-and-time-format.html) format. DateTime value must be in future.', true)
     ->inject('queueForEvents')
     ->inject('dbForProject')
     ->inject('dbForConsole')
     ->inject('project')
     ->inject('queueForMessaging')
     ->inject('response')
-    ->action(function (string $messageId, string $title, string $body, array $topics, array $users, array $targets, ?array $data, string $action, string $image, string $icon, string $sound, string $color, string $tag, string $badge, bool $contentAvailable, bool $critical, string $priority, bool $draft, ?string $scheduledAt, Event $queueForEvents, Database $dbForProject, Database $dbForConsole, Document $project, Messaging $queueForMessaging, Response $response) {
+    ->action(function (string $messageId, ?string $title, ?string $body, array $topics, array $users, array $targets, ?array $data, string $action, string $image, string $icon, string $sound, string $color, string $tag, string $badge, bool $draft, ?string $scheduledAt, bool $contentAvailable, bool $critical, string $priority, Event $queueForEvents, Database $dbForProject, Database $dbForConsole, Document $project, Messaging $queueForMessaging, Response $response) {
         $messageId = $messageId == 'unique()'
             ? ID::unique()
             : $messageId;
@@ -3699,18 +3699,18 @@
     ->param('color', null, new Text(256), 'Color for push notification. Available only for Android platforms.', true)
     ->param('tag', null, new Text(256), 'Tag for push notification. Available only for Android platforms.', true)
     ->param('badge', null, new Integer(), 'Badge for push notification. Available only for iOS platforms.', true)
+    ->param('draft', null, new Boolean(), 'Is message a draft', true)
+    ->param('scheduledAt', null, new DatetimeValidator(requireDateInFuture: true), 'Scheduled delivery time for message in [ISO 8601](https://www.iso.org/iso-8601-date-and-time-format.html) format. DateTime value must be in future.', true)
     ->param('contentAvailable', null, new Boolean(), 'If set to true, the notification will be delivered in the background. Available only for iOS Platform.', true)
     ->param('critical', null, new Boolean(), 'If set to true, the notification will be marked as critical. This requires the app to have the critical notification entitlement. Available only for iOS Platform.', true)
     ->param('priority', null, new WhiteList(['normal', 'high']), 'Set the notification priority. "normal" will consider device battery state and may send notifications later. "high" will always attempt to immediately deliver the notification.', true)
-    ->param('draft', null, new Boolean(), 'Is message a draft', true)
-    ->param('scheduledAt', null, new DatetimeValidator(requireDateInFuture: true), 'Scheduled delivery time for message in [ISO 8601](https://www.iso.org/iso-8601-date-and-time-format.html) format. DateTime value must be in future.', true)
     ->inject('queueForEvents')
     ->inject('dbForProject')
     ->inject('dbForConsole')
     ->inject('project')
     ->inject('queueForMessaging')
     ->inject('response')
-    ->action(function (string $messageId, ?array $topics, ?array $users, ?array $targets, ?string $title, ?string $body, ?array $data, ?string $action, ?string $image, ?string $icon, ?string $sound, ?string $color, ?string $tag, ?int $badge, ?bool $contentAvailable, ?bool $critical, ?string $priority, ?bool $draft, ?string $scheduledAt, Event $queueForEvents, Database $dbForProject, Database $dbForConsole, Document $project, Messaging $queueForMessaging, Response $response) {
+    ->action(function (string $messageId, ?array $topics, ?array $users, ?array $targets, ?string $title, ?string $body, ?array $data, ?string $action, ?string $image, ?string $icon, ?string $sound, ?string $color, ?string $tag, ?int $badge, ?bool $draft, ?string $scheduledAt, ?bool $contentAvailable, ?bool $critical, ?string $priority, Event $queueForEvents, Database $dbForProject, Database $dbForConsole, Document $project, Messaging $queueForMessaging, Response $response) {
         $message = $dbForProject->getDocument('messages', $messageId);
 
         if ($message->isEmpty()) {

From 98149f56b51e85a56746ca6ecaf808d525fc2359 Mon Sep 17 00:00:00 2001
From: Jake Barnby <jakeb994@gmail.com>
Date: Thu, 5 Dec 2024 17:20:20 +1300
Subject: [PATCH 06/24] Default empty title and body

---
 app/controllers/api/messaging.php           | 6 +++---
 src/Appwrite/Platform/Workers/Messaging.php | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/controllers/api/messaging.php b/app/controllers/api/messaging.php
index 394f836164c..dea43add264 100644
--- a/app/controllers/api/messaging.php
+++ b/app/controllers/api/messaging.php
@@ -2906,8 +2906,8 @@
     ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
     ->label('sdk.response.model', Response::MODEL_MESSAGE)
     ->param('messageId', '', new CustomId(), 'Message ID. Choose a custom ID or generate a random ID with `ID.unique()`. Valid chars are a-z, A-Z, 0-9, period, hyphen, and underscore. Can\'t start with a special char. Max length is 36 chars.')
-    ->param('title', null, new Text(256), 'Title for push notification.', true)
-    ->param('body', null, new Text(64230), 'Body for push notification.', true)
+    ->param('title', '', new Text(256), 'Title for push notification.', true)
+    ->param('body', '', new Text(64230), 'Body for push notification.', true)
     ->param('topics', [], new ArrayList(new UID()), 'List of Topic IDs.', true)
     ->param('users', [], new ArrayList(new UID()), 'List of User IDs.', true)
     ->param('targets', [], new ArrayList(new UID()), 'List of Targets IDs.', true)
@@ -2930,7 +2930,7 @@
     ->inject('project')
     ->inject('queueForMessaging')
     ->inject('response')
-    ->action(function (string $messageId, ?string $title, ?string $body, array $topics, array $users, array $targets, ?array $data, string $action, string $image, string $icon, string $sound, string $color, string $tag, string $badge, bool $draft, ?string $scheduledAt, bool $contentAvailable, bool $critical, string $priority, Event $queueForEvents, Database $dbForProject, Database $dbForConsole, Document $project, Messaging $queueForMessaging, Response $response) {
+    ->action(function (string $messageId, string $title, string $body, array $topics, array $users, array $targets, ?array $data, string $action, string $image, string $icon, string $sound, string $color, string $tag, string $badge, bool $draft, ?string $scheduledAt, bool $contentAvailable, bool $critical, string $priority, Event $queueForEvents, Database $dbForProject, Database $dbForConsole, Document $project, Messaging $queueForMessaging, Response $response) {
         $messageId = $messageId == 'unique()'
             ? ID::unique()
             : $messageId;
diff --git a/src/Appwrite/Platform/Workers/Messaging.php b/src/Appwrite/Platform/Workers/Messaging.php
index a5339c3764f..e3febc72d69 100644
--- a/src/Appwrite/Platform/Workers/Messaging.php
+++ b/src/Appwrite/Platform/Workers/Messaging.php
@@ -676,8 +676,8 @@ private function buildSmsMessage(Document $message, Document $provider): SMS
     private function buildPushMessage(Document $message): Push
     {
         $to = $message['to'];
-        $title = $message['data']['title'];
-        $body = $message['data']['body'];
+        $title = $message['data']['title'] === '' ? null : $message['data']['title'];
+        $body = $message['data']['body'] === '' ? null : $message['data']['body'];
         $data = $message['data']['data'] ?? null;
         $action = $message['data']['action'] ?? null;
         $image = $message['data']['image']['url'] ?? null;

From 526f54cf06515b1eeff4aad5d6c73e284a277671 Mon Sep 17 00:00:00 2001
From: Jake Barnby <jakeb994@gmail.com>
Date: Thu, 5 Dec 2024 21:09:52 +1300
Subject: [PATCH 07/24] Update src/Appwrite/Platform/Workers/Messaging.php

Co-authored-by: Damodar Lohani <lohanidamodar@users.noreply.github.com>
---
 src/Appwrite/Platform/Workers/Messaging.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Appwrite/Platform/Workers/Messaging.php b/src/Appwrite/Platform/Workers/Messaging.php
index e3febc72d69..76e1ad35729 100644
--- a/src/Appwrite/Platform/Workers/Messaging.php
+++ b/src/Appwrite/Platform/Workers/Messaging.php
@@ -689,9 +689,9 @@ private function buildPushMessage(Document $message): Push
         $contentAvailable = $message['data']['contentAvailable'] ?? false;
         $critical = $message['data']['critical'] ?? false;
 
-        $priority = $message['data']['priority'] === 'normal'
-            ? Priority::NORMAL
-            : Priority::HIGH;
+        $priority = $message['data']['priority'] === 'high'
+            ? Priority::HIGH
+            : Priority::NORMAL;
 
         return new Push(
             $to,

From 5b75fcc39814bfdd9b2e3f9d46ea28a953431663 Mon Sep 17 00:00:00 2001
From: Jake Barnby <jakeb994@gmail.com>
Date: Thu, 5 Dec 2024 21:39:43 +1300
Subject: [PATCH 08/24] Update lock

---
 composer.json |  2 +-
 composer.lock | 27 +++++++++------------------
 2 files changed, 10 insertions(+), 19 deletions(-)

diff --git a/composer.json b/composer.json
index 7ecf0791257..71fcb358f60 100644
--- a/composer.json
+++ b/composer.json
@@ -59,7 +59,7 @@
         "utopia-php/image": "0.7.*",
         "utopia-php/locale": "0.4.*",
         "utopia-php/logger": "0.6.*",
-        "utopia-php/messaging": "dev-feat-apns-content-available as 0.12.2",
+        "utopia-php/messaging": "0.13.*",
         "utopia-php/migration": "0.6.*",
         "utopia-php/orchestration": "0.9.*",
         "utopia-php/platform": "0.7.*",
diff --git a/composer.lock b/composer.lock
index dadea47a55c..5d84cfb2235 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "04b9739820be8136d62de48c6325e763",
+    "content-hash": "d54809ddf7cd4b318f4606b56827037e",
     "packages": [
         {
             "name": "adhocore/jwt",
@@ -3878,16 +3878,16 @@
         },
         {
             "name": "utopia-php/messaging",
-            "version": "dev-feat-apns-content-available",
+            "version": "0.13.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/utopia-php/messaging.git",
-                "reference": "4947ee3819a28aea303456a462051601e4d12ec9"
+                "reference": "0e3e57351fe4fe875ef3ab9a01a7fff5f022de90"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/utopia-php/messaging/zipball/4947ee3819a28aea303456a462051601e4d12ec9",
-                "reference": "4947ee3819a28aea303456a462051601e4d12ec9",
+                "url": "https://api.github.com/repos/utopia-php/messaging/zipball/0e3e57351fe4fe875ef3ab9a01a7fff5f022de90",
+                "reference": "0e3e57351fe4fe875ef3ab9a01a7fff5f022de90",
                 "shasum": ""
             },
             "require": {
@@ -3923,9 +3923,9 @@
             ],
             "support": {
                 "issues": "https://github.com/utopia-php/messaging/issues",
-                "source": "https://github.com/utopia-php/messaging/tree/feat-apns-content-available"
+                "source": "https://github.com/utopia-php/messaging/tree/0.13.0"
             },
-            "time": "2024-12-04T07:10:23+00:00"
+            "time": "2024-12-05T08:36:07+00:00"
         },
         {
             "name": "utopia-php/migration",
@@ -8556,18 +8556,9 @@
             "time": "2024-03-07T20:33:40+00:00"
         }
     ],
-    "aliases": [
-        {
-            "package": "utopia-php/messaging",
-            "version": "dev-feat-apns-content-available",
-            "alias": "0.12.2",
-            "alias_normalized": "0.12.2.0"
-        }
-    ],
+    "aliases": [],
     "minimum-stability": "stable",
-    "stability-flags": {
-        "utopia-php/messaging": 20
-    },
+    "stability-flags": {},
     "prefer-stable": false,
     "prefer-lowest": false,
     "platform": {

From 45f6d9c0b9c18058b7204dd19d7f6626054ba08c Mon Sep 17 00:00:00 2001
From: Jake Barnby <jakeb994@gmail.com>
Date: Thu, 5 Dec 2024 23:12:06 +1300
Subject: [PATCH 09/24] Specs

---
 app/config/specs/open-api3-latest-client.json |  2 +-
 .../specs/open-api3-latest-console.json       | 66 +++++++++++++---
 app/config/specs/open-api3-latest-server.json | 66 +++++++++++++---
 app/config/specs/swagger2-latest-client.json  |  2 +-
 app/config/specs/swagger2-latest-console.json | 78 +++++++++++++++----
 app/config/specs/swagger2-latest-server.json  | 78 +++++++++++++++----
 6 files changed, 236 insertions(+), 56 deletions(-)

diff --git a/app/config/specs/open-api3-latest-client.json b/app/config/specs/open-api3-latest-client.json
index d948a101f2a..1013698073f 100644
--- a/app/config/specs/open-api3-latest-client.json
+++ b/app/config/specs/open-api3-latest-client.json
@@ -1,7 +1,7 @@
 {
     "openapi": "3.0.0",
     "info": {
-        "version": "1.6.0",
+        "version": "1.6.1",
         "title": "Appwrite",
         "description": "Appwrite backend as a service cuts up to 70% of the time and costs required for building a modern application. We abstract and simplify common development tasks behind a REST APIs, to help you develop your app in a fast and secure way. For full API documentation and tutorials go to [https:\/\/appwrite.io\/docs](https:\/\/appwrite.io\/docs)",
         "termsOfService": "https:\/\/appwrite.io\/policy\/terms",
diff --git a/app/config/specs/open-api3-latest-console.json b/app/config/specs/open-api3-latest-console.json
index fb01509ecdb..32985d9c58b 100644
--- a/app/config/specs/open-api3-latest-console.json
+++ b/app/config/specs/open-api3-latest-console.json
@@ -1,7 +1,7 @@
 {
     "openapi": "3.0.0",
     "info": {
-        "version": "1.6.0",
+        "version": "1.6.1",
         "title": "Appwrite",
         "description": "Appwrite backend as a service cuts up to 70% of the time and costs required for building a modern application. We abstract and simplify common development tasks behind a REST APIs, to help you develop your app in a fast and secure way. For full API documentation and tutorials go to [https:\/\/appwrite.io\/docs](https:\/\/appwrite.io\/docs)",
         "termsOfService": "https:\/\/appwrite.io\/policy\/terms",
@@ -9488,7 +9488,8 @@
                                             "bun-1.0",
                                             "bun-1.1",
                                             "go-1.23",
-                                            "static-1"
+                                            "static-1",
+                                            "flutter-3.24"
                                         ],
                                         "x-enum-name": null,
                                         "x-enum-keys": []
@@ -10145,7 +10146,8 @@
                                             "bun-1.0",
                                             "bun-1.1",
                                             "go-1.23",
-                                            "static-1"
+                                            "static-1",
+                                            "flutter-3.24"
                                         ],
                                         "x-enum-name": null,
                                         "x-enum-keys": []
@@ -14120,7 +14122,7 @@
                                     },
                                     "data": {
                                         "type": "object",
-                                        "description": "Additional Data for push notification.",
+                                        "description": "Additional key-value pair data for push notification.",
                                         "x-example": "{}"
                                     },
                                     "action": {
@@ -14140,7 +14142,7 @@
                                     },
                                     "sound": {
                                         "type": "string",
-                                        "description": "Sound for push notification. Available only for Android and IOS Platform.",
+                                        "description": "Sound for push notification. Available only for Android and iOS Platform.",
                                         "x-example": "<SOUND>"
                                     },
                                     "color": {
@@ -14154,9 +14156,9 @@
                                         "x-example": "<TAG>"
                                     },
                                     "badge": {
-                                        "type": "string",
-                                        "description": "Badge for push notification. Available only for IOS Platform.",
-                                        "x-example": "<BADGE>"
+                                        "type": "integer",
+                                        "description": "Badge for push notification. Available only for iOS Platform.",
+                                        "x-example": null
                                     },
                                     "draft": {
                                         "type": "boolean",
@@ -14167,12 +14169,31 @@
                                         "type": "string",
                                         "description": "Scheduled delivery time for message in [ISO 8601](https:\/\/www.iso.org\/iso-8601-date-and-time-format.html) format. DateTime value must be in future.",
                                         "x-example": null
+                                    },
+                                    "contentAvailable": {
+                                        "type": "boolean",
+                                        "description": "If set to true, the notification will be delivered in the background. Available only for iOS Platform.",
+                                        "x-example": false
+                                    },
+                                    "critical": {
+                                        "type": "boolean",
+                                        "description": "If set to true, the notification will be marked as critical. This requires the app to have the critical notification entitlement. Available only for iOS Platform.",
+                                        "x-example": false
+                                    },
+                                    "priority": {
+                                        "type": "string",
+                                        "description": "Set the notification priority. \"normal\" will consider device battery state and may send notifications later. \"high\" will always attempt to immediately deliver the notification.",
+                                        "x-example": "normal",
+                                        "enum": [
+                                            "normal",
+                                            "high"
+                                        ],
+                                        "x-enum-name": null,
+                                        "x-enum-keys": []
                                     }
                                 },
                                 "required": [
-                                    "messageId",
-                                    "title",
-                                    "body"
+                                    "messageId"
                                 ]
                             }
                         }
@@ -14331,6 +14352,27 @@
                                         "type": "string",
                                         "description": "Scheduled delivery time for message in [ISO 8601](https:\/\/www.iso.org\/iso-8601-date-and-time-format.html) format. DateTime value must be in future.",
                                         "x-example": null
+                                    },
+                                    "contentAvailable": {
+                                        "type": "boolean",
+                                        "description": "If set to true, the notification will be delivered in the background. Available only for iOS Platform.",
+                                        "x-example": false
+                                    },
+                                    "critical": {
+                                        "type": "boolean",
+                                        "description": "If set to true, the notification will be marked as critical. This requires the app to have the critical notification entitlement. Available only for iOS Platform.",
+                                        "x-example": false
+                                    },
+                                    "priority": {
+                                        "type": "string",
+                                        "description": "Set the notification priority. \"normal\" will consider device battery state and may send notifications later. \"high\" will always attempt to immediately deliver the notification.",
+                                        "x-example": "normal",
+                                        "enum": [
+                                            "normal",
+                                            "high"
+                                        ],
+                                        "x-enum-name": null,
+                                        "x-enum-keys": []
                                     }
                                 }
                             }
@@ -35109,7 +35151,7 @@
                     },
                     "schedule": {
                         "type": "string",
-                        "description": "Function execution schedult in CRON format.",
+                        "description": "Function execution schedule in CRON format.",
                         "x-example": "5 4 * * *"
                     },
                     "timeout": {
diff --git a/app/config/specs/open-api3-latest-server.json b/app/config/specs/open-api3-latest-server.json
index 1504322456b..12d1337c5ed 100644
--- a/app/config/specs/open-api3-latest-server.json
+++ b/app/config/specs/open-api3-latest-server.json
@@ -1,7 +1,7 @@
 {
     "openapi": "3.0.0",
     "info": {
-        "version": "1.6.0",
+        "version": "1.6.1",
         "title": "Appwrite",
         "description": "Appwrite backend as a service cuts up to 70% of the time and costs required for building a modern application. We abstract and simplify common development tasks behind a REST APIs, to help you develop your app in a fast and secure way. For full API documentation and tutorials go to [https:\/\/appwrite.io\/docs](https:\/\/appwrite.io\/docs)",
         "termsOfService": "https:\/\/appwrite.io\/policy\/terms",
@@ -8596,7 +8596,8 @@
                                             "bun-1.0",
                                             "bun-1.1",
                                             "go-1.23",
-                                            "static-1"
+                                            "static-1",
+                                            "flutter-3.24"
                                         ],
                                         "x-enum-name": null,
                                         "x-enum-keys": []
@@ -9019,7 +9020,8 @@
                                             "bun-1.0",
                                             "bun-1.1",
                                             "go-1.23",
-                                            "static-1"
+                                            "static-1",
+                                            "flutter-3.24"
                                         ],
                                         "x-enum-name": null,
                                         "x-enum-keys": []
@@ -12978,7 +12980,7 @@
                                     },
                                     "data": {
                                         "type": "object",
-                                        "description": "Additional Data for push notification.",
+                                        "description": "Additional key-value pair data for push notification.",
                                         "x-example": "{}"
                                     },
                                     "action": {
@@ -12998,7 +13000,7 @@
                                     },
                                     "sound": {
                                         "type": "string",
-                                        "description": "Sound for push notification. Available only for Android and IOS Platform.",
+                                        "description": "Sound for push notification. Available only for Android and iOS Platform.",
                                         "x-example": "<SOUND>"
                                     },
                                     "color": {
@@ -13012,9 +13014,9 @@
                                         "x-example": "<TAG>"
                                     },
                                     "badge": {
-                                        "type": "string",
-                                        "description": "Badge for push notification. Available only for IOS Platform.",
-                                        "x-example": "<BADGE>"
+                                        "type": "integer",
+                                        "description": "Badge for push notification. Available only for iOS Platform.",
+                                        "x-example": null
                                     },
                                     "draft": {
                                         "type": "boolean",
@@ -13025,12 +13027,31 @@
                                         "type": "string",
                                         "description": "Scheduled delivery time for message in [ISO 8601](https:\/\/www.iso.org\/iso-8601-date-and-time-format.html) format. DateTime value must be in future.",
                                         "x-example": null
+                                    },
+                                    "contentAvailable": {
+                                        "type": "boolean",
+                                        "description": "If set to true, the notification will be delivered in the background. Available only for iOS Platform.",
+                                        "x-example": false
+                                    },
+                                    "critical": {
+                                        "type": "boolean",
+                                        "description": "If set to true, the notification will be marked as critical. This requires the app to have the critical notification entitlement. Available only for iOS Platform.",
+                                        "x-example": false
+                                    },
+                                    "priority": {
+                                        "type": "string",
+                                        "description": "Set the notification priority. \"normal\" will consider device battery state and may send notifications later. \"high\" will always attempt to immediately deliver the notification.",
+                                        "x-example": "normal",
+                                        "enum": [
+                                            "normal",
+                                            "high"
+                                        ],
+                                        "x-enum-name": null,
+                                        "x-enum-keys": []
                                     }
                                 },
                                 "required": [
-                                    "messageId",
-                                    "title",
-                                    "body"
+                                    "messageId"
                                 ]
                             }
                         }
@@ -13190,6 +13211,27 @@
                                         "type": "string",
                                         "description": "Scheduled delivery time for message in [ISO 8601](https:\/\/www.iso.org\/iso-8601-date-and-time-format.html) format. DateTime value must be in future.",
                                         "x-example": null
+                                    },
+                                    "contentAvailable": {
+                                        "type": "boolean",
+                                        "description": "If set to true, the notification will be delivered in the background. Available only for iOS Platform.",
+                                        "x-example": false
+                                    },
+                                    "critical": {
+                                        "type": "boolean",
+                                        "description": "If set to true, the notification will be marked as critical. This requires the app to have the critical notification entitlement. Available only for iOS Platform.",
+                                        "x-example": false
+                                    },
+                                    "priority": {
+                                        "type": "string",
+                                        "description": "Set the notification priority. \"normal\" will consider device battery state and may send notifications later. \"high\" will always attempt to immediately deliver the notification.",
+                                        "x-example": "normal",
+                                        "enum": [
+                                            "normal",
+                                            "high"
+                                        ],
+                                        "x-enum-name": null,
+                                        "x-enum-keys": []
                                     }
                                 }
                             }
@@ -25746,7 +25788,7 @@
                     },
                     "schedule": {
                         "type": "string",
-                        "description": "Function execution schedult in CRON format.",
+                        "description": "Function execution schedule in CRON format.",
                         "x-example": "5 4 * * *"
                     },
                     "timeout": {
diff --git a/app/config/specs/swagger2-latest-client.json b/app/config/specs/swagger2-latest-client.json
index 3ac70ffe28f..4b6366f2bf4 100644
--- a/app/config/specs/swagger2-latest-client.json
+++ b/app/config/specs/swagger2-latest-client.json
@@ -1,7 +1,7 @@
 {
     "swagger": "2.0",
     "info": {
-        "version": "1.6.0",
+        "version": "1.6.1",
         "title": "Appwrite",
         "description": "Appwrite backend as a service cuts up to 70% of the time and costs required for building a modern application. We abstract and simplify common development tasks behind a REST APIs, to help you develop your app in a fast and secure way. For full API documentation and tutorials go to [https:\/\/appwrite.io\/docs](https:\/\/appwrite.io\/docs)",
         "termsOfService": "https:\/\/appwrite.io\/policy\/terms",
diff --git a/app/config/specs/swagger2-latest-console.json b/app/config/specs/swagger2-latest-console.json
index 25c0c289b37..a51fc316cba 100644
--- a/app/config/specs/swagger2-latest-console.json
+++ b/app/config/specs/swagger2-latest-console.json
@@ -1,7 +1,7 @@
 {
     "swagger": "2.0",
     "info": {
-        "version": "1.6.0",
+        "version": "1.6.1",
         "title": "Appwrite",
         "description": "Appwrite backend as a service cuts up to 70% of the time and costs required for building a modern application. We abstract and simplify common development tasks behind a REST APIs, to help you develop your app in a fast and secure way. For full API documentation and tutorials go to [https:\/\/appwrite.io\/docs](https:\/\/appwrite.io\/docs)",
         "termsOfService": "https:\/\/appwrite.io\/policy\/terms",
@@ -9610,7 +9610,8 @@
                                         "bun-1.0",
                                         "bun-1.1",
                                         "go-1.23",
-                                        "static-1"
+                                        "static-1",
+                                        "flutter-3.24"
                                     ],
                                     "x-enum-name": null,
                                     "x-enum-keys": []
@@ -10286,7 +10287,8 @@
                                         "bun-1.0",
                                         "bun-1.1",
                                         "go-1.23",
-                                        "static-1"
+                                        "static-1",
+                                        "flutter-3.24"
                                     ],
                                     "x-enum-name": null,
                                     "x-enum-keys": []
@@ -14328,13 +14330,13 @@
                                 "title": {
                                     "type": "string",
                                     "description": "Title for push notification.",
-                                    "default": null,
+                                    "default": "",
                                     "x-example": "<TITLE>"
                                 },
                                 "body": {
                                     "type": "string",
                                     "description": "Body for push notification.",
-                                    "default": null,
+                                    "default": "",
                                     "x-example": "<BODY>"
                                 },
                                 "topics": {
@@ -14366,7 +14368,7 @@
                                 },
                                 "data": {
                                     "type": "object",
-                                    "description": "Additional Data for push notification.",
+                                    "description": "Additional key-value pair data for push notification.",
                                     "default": {},
                                     "x-example": "{}"
                                 },
@@ -14390,7 +14392,7 @@
                                 },
                                 "sound": {
                                     "type": "string",
-                                    "description": "Sound for push notification. Available only for Android and IOS Platform.",
+                                    "description": "Sound for push notification. Available only for Android and iOS Platform.",
                                     "default": "",
                                     "x-example": "<SOUND>"
                                 },
@@ -14407,10 +14409,10 @@
                                     "x-example": "<TAG>"
                                 },
                                 "badge": {
-                                    "type": "string",
-                                    "description": "Badge for push notification. Available only for IOS Platform.",
-                                    "default": "",
-                                    "x-example": "<BADGE>"
+                                    "type": "integer",
+                                    "description": "Badge for push notification. Available only for iOS Platform.",
+                                    "default": 0,
+                                    "x-example": null
                                 },
                                 "draft": {
                                     "type": "boolean",
@@ -14423,12 +14425,34 @@
                                     "description": "Scheduled delivery time for message in [ISO 8601](https:\/\/www.iso.org\/iso-8601-date-and-time-format.html) format. DateTime value must be in future.",
                                     "default": null,
                                     "x-example": null
+                                },
+                                "contentAvailable": {
+                                    "type": "boolean",
+                                    "description": "If set to true, the notification will be delivered in the background. Available only for iOS Platform.",
+                                    "default": false,
+                                    "x-example": false
+                                },
+                                "critical": {
+                                    "type": "boolean",
+                                    "description": "If set to true, the notification will be marked as critical. This requires the app to have the critical notification entitlement. Available only for iOS Platform.",
+                                    "default": false,
+                                    "x-example": false
+                                },
+                                "priority": {
+                                    "type": "string",
+                                    "description": "Set the notification priority. \"normal\" will consider device battery state and may send notifications later. \"high\" will always attempt to immediately deliver the notification.",
+                                    "default": "high",
+                                    "x-example": "normal",
+                                    "enum": [
+                                        "normal",
+                                        "high"
+                                    ],
+                                    "x-enum-name": null,
+                                    "x-enum-keys": []
                                 }
                             },
                             "required": [
-                                "messageId",
-                                "title",
-                                "body"
+                                "messageId"
                             ]
                         }
                     }
@@ -14600,6 +14624,30 @@
                                     "description": "Scheduled delivery time for message in [ISO 8601](https:\/\/www.iso.org\/iso-8601-date-and-time-format.html) format. DateTime value must be in future.",
                                     "default": null,
                                     "x-example": null
+                                },
+                                "contentAvailable": {
+                                    "type": "boolean",
+                                    "description": "If set to true, the notification will be delivered in the background. Available only for iOS Platform.",
+                                    "default": null,
+                                    "x-example": false
+                                },
+                                "critical": {
+                                    "type": "boolean",
+                                    "description": "If set to true, the notification will be marked as critical. This requires the app to have the critical notification entitlement. Available only for iOS Platform.",
+                                    "default": null,
+                                    "x-example": false
+                                },
+                                "priority": {
+                                    "type": "string",
+                                    "description": "Set the notification priority. \"normal\" will consider device battery state and may send notifications later. \"high\" will always attempt to immediately deliver the notification.",
+                                    "default": null,
+                                    "x-example": "normal",
+                                    "enum": [
+                                        "normal",
+                                        "high"
+                                    ],
+                                    "x-enum-name": null,
+                                    "x-enum-keys": []
                                 }
                             }
                         }
@@ -35618,7 +35666,7 @@
                 },
                 "schedule": {
                     "type": "string",
-                    "description": "Function execution schedult in CRON format.",
+                    "description": "Function execution schedule in CRON format.",
                     "x-example": "5 4 * * *"
                 },
                 "timeout": {
diff --git a/app/config/specs/swagger2-latest-server.json b/app/config/specs/swagger2-latest-server.json
index 68bcf268fb2..5a06a27a638 100644
--- a/app/config/specs/swagger2-latest-server.json
+++ b/app/config/specs/swagger2-latest-server.json
@@ -1,7 +1,7 @@
 {
     "swagger": "2.0",
     "info": {
-        "version": "1.6.0",
+        "version": "1.6.1",
         "title": "Appwrite",
         "description": "Appwrite backend as a service cuts up to 70% of the time and costs required for building a modern application. We abstract and simplify common development tasks behind a REST APIs, to help you develop your app in a fast and secure way. For full API documentation and tutorials go to [https:\/\/appwrite.io\/docs](https:\/\/appwrite.io\/docs)",
         "termsOfService": "https:\/\/appwrite.io\/policy\/terms",
@@ -8720,7 +8720,8 @@
                                         "bun-1.0",
                                         "bun-1.1",
                                         "go-1.23",
-                                        "static-1"
+                                        "static-1",
+                                        "flutter-3.24"
                                     ],
                                     "x-enum-name": null,
                                     "x-enum-keys": []
@@ -9166,7 +9167,8 @@
                                         "bun-1.0",
                                         "bun-1.1",
                                         "go-1.23",
-                                        "static-1"
+                                        "static-1",
+                                        "flutter-3.24"
                                     ],
                                     "x-enum-name": null,
                                     "x-enum-keys": []
@@ -13194,13 +13196,13 @@
                                 "title": {
                                     "type": "string",
                                     "description": "Title for push notification.",
-                                    "default": null,
+                                    "default": "",
                                     "x-example": "<TITLE>"
                                 },
                                 "body": {
                                     "type": "string",
                                     "description": "Body for push notification.",
-                                    "default": null,
+                                    "default": "",
                                     "x-example": "<BODY>"
                                 },
                                 "topics": {
@@ -13232,7 +13234,7 @@
                                 },
                                 "data": {
                                     "type": "object",
-                                    "description": "Additional Data for push notification.",
+                                    "description": "Additional key-value pair data for push notification.",
                                     "default": {},
                                     "x-example": "{}"
                                 },
@@ -13256,7 +13258,7 @@
                                 },
                                 "sound": {
                                     "type": "string",
-                                    "description": "Sound for push notification. Available only for Android and IOS Platform.",
+                                    "description": "Sound for push notification. Available only for Android and iOS Platform.",
                                     "default": "",
                                     "x-example": "<SOUND>"
                                 },
@@ -13273,10 +13275,10 @@
                                     "x-example": "<TAG>"
                                 },
                                 "badge": {
-                                    "type": "string",
-                                    "description": "Badge for push notification. Available only for IOS Platform.",
-                                    "default": "",
-                                    "x-example": "<BADGE>"
+                                    "type": "integer",
+                                    "description": "Badge for push notification. Available only for iOS Platform.",
+                                    "default": 0,
+                                    "x-example": null
                                 },
                                 "draft": {
                                     "type": "boolean",
@@ -13289,12 +13291,34 @@
                                     "description": "Scheduled delivery time for message in [ISO 8601](https:\/\/www.iso.org\/iso-8601-date-and-time-format.html) format. DateTime value must be in future.",
                                     "default": null,
                                     "x-example": null
+                                },
+                                "contentAvailable": {
+                                    "type": "boolean",
+                                    "description": "If set to true, the notification will be delivered in the background. Available only for iOS Platform.",
+                                    "default": false,
+                                    "x-example": false
+                                },
+                                "critical": {
+                                    "type": "boolean",
+                                    "description": "If set to true, the notification will be marked as critical. This requires the app to have the critical notification entitlement. Available only for iOS Platform.",
+                                    "default": false,
+                                    "x-example": false
+                                },
+                                "priority": {
+                                    "type": "string",
+                                    "description": "Set the notification priority. \"normal\" will consider device battery state and may send notifications later. \"high\" will always attempt to immediately deliver the notification.",
+                                    "default": "high",
+                                    "x-example": "normal",
+                                    "enum": [
+                                        "normal",
+                                        "high"
+                                    ],
+                                    "x-enum-name": null,
+                                    "x-enum-keys": []
                                 }
                             },
                             "required": [
-                                "messageId",
-                                "title",
-                                "body"
+                                "messageId"
                             ]
                         }
                     }
@@ -13467,6 +13491,30 @@
                                     "description": "Scheduled delivery time for message in [ISO 8601](https:\/\/www.iso.org\/iso-8601-date-and-time-format.html) format. DateTime value must be in future.",
                                     "default": null,
                                     "x-example": null
+                                },
+                                "contentAvailable": {
+                                    "type": "boolean",
+                                    "description": "If set to true, the notification will be delivered in the background. Available only for iOS Platform.",
+                                    "default": null,
+                                    "x-example": false
+                                },
+                                "critical": {
+                                    "type": "boolean",
+                                    "description": "If set to true, the notification will be marked as critical. This requires the app to have the critical notification entitlement. Available only for iOS Platform.",
+                                    "default": null,
+                                    "x-example": false
+                                },
+                                "priority": {
+                                    "type": "string",
+                                    "description": "Set the notification priority. \"normal\" will consider device battery state and may send notifications later. \"high\" will always attempt to immediately deliver the notification.",
+                                    "default": null,
+                                    "x-example": "normal",
+                                    "enum": [
+                                        "normal",
+                                        "high"
+                                    ],
+                                    "x-enum-name": null,
+                                    "x-enum-keys": []
                                 }
                             }
                         }
@@ -26233,7 +26281,7 @@
                 },
                 "schedule": {
                     "type": "string",
-                    "description": "Function execution schedult in CRON format.",
+                    "description": "Function execution schedule in CRON format.",
                     "x-example": "5 4 * * *"
                 },
                 "timeout": {

From 44d3a4f22349a8fdc8958abcbe2d2bc0b8651a37 Mon Sep 17 00:00:00 2001
From: Jake Barnby <jakeb994@gmail.com>
Date: Mon, 9 Dec 2024 15:42:20 +1300
Subject: [PATCH 10/24] Update specs

---
 app/config/specs/open-api3-1.6.x-client.json  |  4 +-
 app/config/specs/open-api3-1.6.x-console.json | 68 +++++++++++++---
 app/config/specs/open-api3-1.6.x-server.json  | 68 +++++++++++++---
 app/config/specs/swagger2-1.6.x-client.json   |  4 +-
 app/config/specs/swagger2-1.6.x-console.json  | 80 +++++++++++++++----
 app/config/specs/swagger2-1.6.x-server.json   | 80 +++++++++++++++----
 src/Appwrite/Platform/Workers/Messaging.php   |  9 +--
 7 files changed, 246 insertions(+), 67 deletions(-)

diff --git a/app/config/specs/open-api3-1.6.x-client.json b/app/config/specs/open-api3-1.6.x-client.json
index e3cd909b4ee..1013698073f 100644
--- a/app/config/specs/open-api3-1.6.x-client.json
+++ b/app/config/specs/open-api3-1.6.x-client.json
@@ -1,7 +1,7 @@
 {
     "openapi": "3.0.0",
     "info": {
-        "version": "1.6.0",
+        "version": "1.6.1",
         "title": "Appwrite",
         "description": "Appwrite backend as a service cuts up to 70% of the time and costs required for building a modern application. We abstract and simplify common development tasks behind a REST APIs, to help you develop your app in a fast and secure way. For full API documentation and tutorials go to [https:\/\/appwrite.io\/docs](https:\/\/appwrite.io\/docs)",
         "termsOfService": "https:\/\/appwrite.io\/policy\/terms",
@@ -2784,7 +2784,7 @@
                 "tags": [
                     "account"
                 ],
-                "description": "Sends the user an email with a secret key for creating a session. If the provided user ID has not been registered, a new user will be created. When the user clicks the link in the email, the user is redirected back to the URL you provided with the secret key and userId values attached to the URL query string. Use the query string parameters to submit a request to the [POST \/v1\/account\/sessions\/token](https:\/\/appwrite.io\/docs\/references\/cloud\/client-web\/account#createSession) endpoint to complete the login process. The link sent to the user's email address is valid for 1 hour. If you are on a mobile device you can leave the URL parameter empty, so that the login completion will be handled by your Appwrite instance by default.\n\nA user is limited to 10 active sessions at a time by default. [Learn more about session limits](https:\/\/appwrite.io\/docs\/authentication-security#limits).\n",
+                "description": "Sends the user an email with a secret key for creating a session. If the provided user ID has not been registered, a new user will be created. When the user clicks the link in the email, the user is redirected back to the URL you provided with the secret key and userId values attached to the URL query string. Use the query string parameters to submit a request to the [POST \/v1\/account\/sessions\/token](https:\/\/appwrite.io\/docs\/references\/cloud\/client-web\/account#createSession) endpoint to complete the login process. The link sent to the user's email address is valid for 1 hour.\n\nA user is limited to 10 active sessions at a time by default. [Learn more about session limits](https:\/\/appwrite.io\/docs\/authentication-security#limits).\n",
                 "responses": {
                     "201": {
                         "description": "Token",
diff --git a/app/config/specs/open-api3-1.6.x-console.json b/app/config/specs/open-api3-1.6.x-console.json
index 369fea741a4..32985d9c58b 100644
--- a/app/config/specs/open-api3-1.6.x-console.json
+++ b/app/config/specs/open-api3-1.6.x-console.json
@@ -1,7 +1,7 @@
 {
     "openapi": "3.0.0",
     "info": {
-        "version": "1.6.0",
+        "version": "1.6.1",
         "title": "Appwrite",
         "description": "Appwrite backend as a service cuts up to 70% of the time and costs required for building a modern application. We abstract and simplify common development tasks behind a REST APIs, to help you develop your app in a fast and secure way. For full API documentation and tutorials go to [https:\/\/appwrite.io\/docs](https:\/\/appwrite.io\/docs)",
         "termsOfService": "https:\/\/appwrite.io\/policy\/terms",
@@ -2795,7 +2795,7 @@
                 "tags": [
                     "account"
                 ],
-                "description": "Sends the user an email with a secret key for creating a session. If the provided user ID has not been registered, a new user will be created. When the user clicks the link in the email, the user is redirected back to the URL you provided with the secret key and userId values attached to the URL query string. Use the query string parameters to submit a request to the [POST \/v1\/account\/sessions\/token](https:\/\/appwrite.io\/docs\/references\/cloud\/client-web\/account#createSession) endpoint to complete the login process. The link sent to the user's email address is valid for 1 hour. If you are on a mobile device you can leave the URL parameter empty, so that the login completion will be handled by your Appwrite instance by default.\n\nA user is limited to 10 active sessions at a time by default. [Learn more about session limits](https:\/\/appwrite.io\/docs\/authentication-security#limits).\n",
+                "description": "Sends the user an email with a secret key for creating a session. If the provided user ID has not been registered, a new user will be created. When the user clicks the link in the email, the user is redirected back to the URL you provided with the secret key and userId values attached to the URL query string. Use the query string parameters to submit a request to the [POST \/v1\/account\/sessions\/token](https:\/\/appwrite.io\/docs\/references\/cloud\/client-web\/account#createSession) endpoint to complete the login process. The link sent to the user's email address is valid for 1 hour.\n\nA user is limited to 10 active sessions at a time by default. [Learn more about session limits](https:\/\/appwrite.io\/docs\/authentication-security#limits).\n",
                 "responses": {
                     "201": {
                         "description": "Token",
@@ -9488,7 +9488,8 @@
                                             "bun-1.0",
                                             "bun-1.1",
                                             "go-1.23",
-                                            "static-1"
+                                            "static-1",
+                                            "flutter-3.24"
                                         ],
                                         "x-enum-name": null,
                                         "x-enum-keys": []
@@ -10145,7 +10146,8 @@
                                             "bun-1.0",
                                             "bun-1.1",
                                             "go-1.23",
-                                            "static-1"
+                                            "static-1",
+                                            "flutter-3.24"
                                         ],
                                         "x-enum-name": null,
                                         "x-enum-keys": []
@@ -14120,7 +14122,7 @@
                                     },
                                     "data": {
                                         "type": "object",
-                                        "description": "Additional Data for push notification.",
+                                        "description": "Additional key-value pair data for push notification.",
                                         "x-example": "{}"
                                     },
                                     "action": {
@@ -14140,7 +14142,7 @@
                                     },
                                     "sound": {
                                         "type": "string",
-                                        "description": "Sound for push notification. Available only for Android and IOS Platform.",
+                                        "description": "Sound for push notification. Available only for Android and iOS Platform.",
                                         "x-example": "<SOUND>"
                                     },
                                     "color": {
@@ -14154,9 +14156,9 @@
                                         "x-example": "<TAG>"
                                     },
                                     "badge": {
-                                        "type": "string",
-                                        "description": "Badge for push notification. Available only for IOS Platform.",
-                                        "x-example": "<BADGE>"
+                                        "type": "integer",
+                                        "description": "Badge for push notification. Available only for iOS Platform.",
+                                        "x-example": null
                                     },
                                     "draft": {
                                         "type": "boolean",
@@ -14167,12 +14169,31 @@
                                         "type": "string",
                                         "description": "Scheduled delivery time for message in [ISO 8601](https:\/\/www.iso.org\/iso-8601-date-and-time-format.html) format. DateTime value must be in future.",
                                         "x-example": null
+                                    },
+                                    "contentAvailable": {
+                                        "type": "boolean",
+                                        "description": "If set to true, the notification will be delivered in the background. Available only for iOS Platform.",
+                                        "x-example": false
+                                    },
+                                    "critical": {
+                                        "type": "boolean",
+                                        "description": "If set to true, the notification will be marked as critical. This requires the app to have the critical notification entitlement. Available only for iOS Platform.",
+                                        "x-example": false
+                                    },
+                                    "priority": {
+                                        "type": "string",
+                                        "description": "Set the notification priority. \"normal\" will consider device battery state and may send notifications later. \"high\" will always attempt to immediately deliver the notification.",
+                                        "x-example": "normal",
+                                        "enum": [
+                                            "normal",
+                                            "high"
+                                        ],
+                                        "x-enum-name": null,
+                                        "x-enum-keys": []
                                     }
                                 },
                                 "required": [
-                                    "messageId",
-                                    "title",
-                                    "body"
+                                    "messageId"
                                 ]
                             }
                         }
@@ -14331,6 +14352,27 @@
                                         "type": "string",
                                         "description": "Scheduled delivery time for message in [ISO 8601](https:\/\/www.iso.org\/iso-8601-date-and-time-format.html) format. DateTime value must be in future.",
                                         "x-example": null
+                                    },
+                                    "contentAvailable": {
+                                        "type": "boolean",
+                                        "description": "If set to true, the notification will be delivered in the background. Available only for iOS Platform.",
+                                        "x-example": false
+                                    },
+                                    "critical": {
+                                        "type": "boolean",
+                                        "description": "If set to true, the notification will be marked as critical. This requires the app to have the critical notification entitlement. Available only for iOS Platform.",
+                                        "x-example": false
+                                    },
+                                    "priority": {
+                                        "type": "string",
+                                        "description": "Set the notification priority. \"normal\" will consider device battery state and may send notifications later. \"high\" will always attempt to immediately deliver the notification.",
+                                        "x-example": "normal",
+                                        "enum": [
+                                            "normal",
+                                            "high"
+                                        ],
+                                        "x-enum-name": null,
+                                        "x-enum-keys": []
                                     }
                                 }
                             }
@@ -35109,7 +35151,7 @@
                     },
                     "schedule": {
                         "type": "string",
-                        "description": "Function execution schedult in CRON format.",
+                        "description": "Function execution schedule in CRON format.",
                         "x-example": "5 4 * * *"
                     },
                     "timeout": {
diff --git a/app/config/specs/open-api3-1.6.x-server.json b/app/config/specs/open-api3-1.6.x-server.json
index e84b7517437..12d1337c5ed 100644
--- a/app/config/specs/open-api3-1.6.x-server.json
+++ b/app/config/specs/open-api3-1.6.x-server.json
@@ -1,7 +1,7 @@
 {
     "openapi": "3.0.0",
     "info": {
-        "version": "1.6.0",
+        "version": "1.6.1",
         "title": "Appwrite",
         "description": "Appwrite backend as a service cuts up to 70% of the time and costs required for building a modern application. We abstract and simplify common development tasks behind a REST APIs, to help you develop your app in a fast and secure way. For full API documentation and tutorials go to [https:\/\/appwrite.io\/docs](https:\/\/appwrite.io\/docs)",
         "termsOfService": "https:\/\/appwrite.io\/policy\/terms",
@@ -2451,7 +2451,7 @@
                 "tags": [
                     "account"
                 ],
-                "description": "Sends the user an email with a secret key for creating a session. If the provided user ID has not been registered, a new user will be created. When the user clicks the link in the email, the user is redirected back to the URL you provided with the secret key and userId values attached to the URL query string. Use the query string parameters to submit a request to the [POST \/v1\/account\/sessions\/token](https:\/\/appwrite.io\/docs\/references\/cloud\/client-web\/account#createSession) endpoint to complete the login process. The link sent to the user's email address is valid for 1 hour. If you are on a mobile device you can leave the URL parameter empty, so that the login completion will be handled by your Appwrite instance by default.\n\nA user is limited to 10 active sessions at a time by default. [Learn more about session limits](https:\/\/appwrite.io\/docs\/authentication-security#limits).\n",
+                "description": "Sends the user an email with a secret key for creating a session. If the provided user ID has not been registered, a new user will be created. When the user clicks the link in the email, the user is redirected back to the URL you provided with the secret key and userId values attached to the URL query string. Use the query string parameters to submit a request to the [POST \/v1\/account\/sessions\/token](https:\/\/appwrite.io\/docs\/references\/cloud\/client-web\/account#createSession) endpoint to complete the login process. The link sent to the user's email address is valid for 1 hour.\n\nA user is limited to 10 active sessions at a time by default. [Learn more about session limits](https:\/\/appwrite.io\/docs\/authentication-security#limits).\n",
                 "responses": {
                     "201": {
                         "description": "Token",
@@ -8596,7 +8596,8 @@
                                             "bun-1.0",
                                             "bun-1.1",
                                             "go-1.23",
-                                            "static-1"
+                                            "static-1",
+                                            "flutter-3.24"
                                         ],
                                         "x-enum-name": null,
                                         "x-enum-keys": []
@@ -9019,7 +9020,8 @@
                                             "bun-1.0",
                                             "bun-1.1",
                                             "go-1.23",
-                                            "static-1"
+                                            "static-1",
+                                            "flutter-3.24"
                                         ],
                                         "x-enum-name": null,
                                         "x-enum-keys": []
@@ -12978,7 +12980,7 @@
                                     },
                                     "data": {
                                         "type": "object",
-                                        "description": "Additional Data for push notification.",
+                                        "description": "Additional key-value pair data for push notification.",
                                         "x-example": "{}"
                                     },
                                     "action": {
@@ -12998,7 +13000,7 @@
                                     },
                                     "sound": {
                                         "type": "string",
-                                        "description": "Sound for push notification. Available only for Android and IOS Platform.",
+                                        "description": "Sound for push notification. Available only for Android and iOS Platform.",
                                         "x-example": "<SOUND>"
                                     },
                                     "color": {
@@ -13012,9 +13014,9 @@
                                         "x-example": "<TAG>"
                                     },
                                     "badge": {
-                                        "type": "string",
-                                        "description": "Badge for push notification. Available only for IOS Platform.",
-                                        "x-example": "<BADGE>"
+                                        "type": "integer",
+                                        "description": "Badge for push notification. Available only for iOS Platform.",
+                                        "x-example": null
                                     },
                                     "draft": {
                                         "type": "boolean",
@@ -13025,12 +13027,31 @@
                                         "type": "string",
                                         "description": "Scheduled delivery time for message in [ISO 8601](https:\/\/www.iso.org\/iso-8601-date-and-time-format.html) format. DateTime value must be in future.",
                                         "x-example": null
+                                    },
+                                    "contentAvailable": {
+                                        "type": "boolean",
+                                        "description": "If set to true, the notification will be delivered in the background. Available only for iOS Platform.",
+                                        "x-example": false
+                                    },
+                                    "critical": {
+                                        "type": "boolean",
+                                        "description": "If set to true, the notification will be marked as critical. This requires the app to have the critical notification entitlement. Available only for iOS Platform.",
+                                        "x-example": false
+                                    },
+                                    "priority": {
+                                        "type": "string",
+                                        "description": "Set the notification priority. \"normal\" will consider device battery state and may send notifications later. \"high\" will always attempt to immediately deliver the notification.",
+                                        "x-example": "normal",
+                                        "enum": [
+                                            "normal",
+                                            "high"
+                                        ],
+                                        "x-enum-name": null,
+                                        "x-enum-keys": []
                                     }
                                 },
                                 "required": [
-                                    "messageId",
-                                    "title",
-                                    "body"
+                                    "messageId"
                                 ]
                             }
                         }
@@ -13190,6 +13211,27 @@
                                         "type": "string",
                                         "description": "Scheduled delivery time for message in [ISO 8601](https:\/\/www.iso.org\/iso-8601-date-and-time-format.html) format. DateTime value must be in future.",
                                         "x-example": null
+                                    },
+                                    "contentAvailable": {
+                                        "type": "boolean",
+                                        "description": "If set to true, the notification will be delivered in the background. Available only for iOS Platform.",
+                                        "x-example": false
+                                    },
+                                    "critical": {
+                                        "type": "boolean",
+                                        "description": "If set to true, the notification will be marked as critical. This requires the app to have the critical notification entitlement. Available only for iOS Platform.",
+                                        "x-example": false
+                                    },
+                                    "priority": {
+                                        "type": "string",
+                                        "description": "Set the notification priority. \"normal\" will consider device battery state and may send notifications later. \"high\" will always attempt to immediately deliver the notification.",
+                                        "x-example": "normal",
+                                        "enum": [
+                                            "normal",
+                                            "high"
+                                        ],
+                                        "x-enum-name": null,
+                                        "x-enum-keys": []
                                     }
                                 }
                             }
@@ -25746,7 +25788,7 @@
                     },
                     "schedule": {
                         "type": "string",
-                        "description": "Function execution schedult in CRON format.",
+                        "description": "Function execution schedule in CRON format.",
                         "x-example": "5 4 * * *"
                     },
                     "timeout": {
diff --git a/app/config/specs/swagger2-1.6.x-client.json b/app/config/specs/swagger2-1.6.x-client.json
index b1b9ce8dcac..4b6366f2bf4 100644
--- a/app/config/specs/swagger2-1.6.x-client.json
+++ b/app/config/specs/swagger2-1.6.x-client.json
@@ -1,7 +1,7 @@
 {
     "swagger": "2.0",
     "info": {
-        "version": "1.6.0",
+        "version": "1.6.1",
         "title": "Appwrite",
         "description": "Appwrite backend as a service cuts up to 70% of the time and costs required for building a modern application. We abstract and simplify common development tasks behind a REST APIs, to help you develop your app in a fast and secure way. For full API documentation and tutorials go to [https:\/\/appwrite.io\/docs](https:\/\/appwrite.io\/docs)",
         "termsOfService": "https:\/\/appwrite.io\/policy\/terms",
@@ -2922,7 +2922,7 @@
                 "tags": [
                     "account"
                 ],
-                "description": "Sends the user an email with a secret key for creating a session. If the provided user ID has not been registered, a new user will be created. When the user clicks the link in the email, the user is redirected back to the URL you provided with the secret key and userId values attached to the URL query string. Use the query string parameters to submit a request to the [POST \/v1\/account\/sessions\/token](https:\/\/appwrite.io\/docs\/references\/cloud\/client-web\/account#createSession) endpoint to complete the login process. The link sent to the user's email address is valid for 1 hour. If you are on a mobile device you can leave the URL parameter empty, so that the login completion will be handled by your Appwrite instance by default.\n\nA user is limited to 10 active sessions at a time by default. [Learn more about session limits](https:\/\/appwrite.io\/docs\/authentication-security#limits).\n",
+                "description": "Sends the user an email with a secret key for creating a session. If the provided user ID has not been registered, a new user will be created. When the user clicks the link in the email, the user is redirected back to the URL you provided with the secret key and userId values attached to the URL query string. Use the query string parameters to submit a request to the [POST \/v1\/account\/sessions\/token](https:\/\/appwrite.io\/docs\/references\/cloud\/client-web\/account#createSession) endpoint to complete the login process. The link sent to the user's email address is valid for 1 hour.\n\nA user is limited to 10 active sessions at a time by default. [Learn more about session limits](https:\/\/appwrite.io\/docs\/authentication-security#limits).\n",
                 "responses": {
                     "201": {
                         "description": "Token",
diff --git a/app/config/specs/swagger2-1.6.x-console.json b/app/config/specs/swagger2-1.6.x-console.json
index 9ce9d5f60d9..a51fc316cba 100644
--- a/app/config/specs/swagger2-1.6.x-console.json
+++ b/app/config/specs/swagger2-1.6.x-console.json
@@ -1,7 +1,7 @@
 {
     "swagger": "2.0",
     "info": {
-        "version": "1.6.0",
+        "version": "1.6.1",
         "title": "Appwrite",
         "description": "Appwrite backend as a service cuts up to 70% of the time and costs required for building a modern application. We abstract and simplify common development tasks behind a REST APIs, to help you develop your app in a fast and secure way. For full API documentation and tutorials go to [https:\/\/appwrite.io\/docs](https:\/\/appwrite.io\/docs)",
         "termsOfService": "https:\/\/appwrite.io\/policy\/terms",
@@ -2949,7 +2949,7 @@
                 "tags": [
                     "account"
                 ],
-                "description": "Sends the user an email with a secret key for creating a session. If the provided user ID has not been registered, a new user will be created. When the user clicks the link in the email, the user is redirected back to the URL you provided with the secret key and userId values attached to the URL query string. Use the query string parameters to submit a request to the [POST \/v1\/account\/sessions\/token](https:\/\/appwrite.io\/docs\/references\/cloud\/client-web\/account#createSession) endpoint to complete the login process. The link sent to the user's email address is valid for 1 hour. If you are on a mobile device you can leave the URL parameter empty, so that the login completion will be handled by your Appwrite instance by default.\n\nA user is limited to 10 active sessions at a time by default. [Learn more about session limits](https:\/\/appwrite.io\/docs\/authentication-security#limits).\n",
+                "description": "Sends the user an email with a secret key for creating a session. If the provided user ID has not been registered, a new user will be created. When the user clicks the link in the email, the user is redirected back to the URL you provided with the secret key and userId values attached to the URL query string. Use the query string parameters to submit a request to the [POST \/v1\/account\/sessions\/token](https:\/\/appwrite.io\/docs\/references\/cloud\/client-web\/account#createSession) endpoint to complete the login process. The link sent to the user's email address is valid for 1 hour.\n\nA user is limited to 10 active sessions at a time by default. [Learn more about session limits](https:\/\/appwrite.io\/docs\/authentication-security#limits).\n",
                 "responses": {
                     "201": {
                         "description": "Token",
@@ -9610,7 +9610,8 @@
                                         "bun-1.0",
                                         "bun-1.1",
                                         "go-1.23",
-                                        "static-1"
+                                        "static-1",
+                                        "flutter-3.24"
                                     ],
                                     "x-enum-name": null,
                                     "x-enum-keys": []
@@ -10286,7 +10287,8 @@
                                         "bun-1.0",
                                         "bun-1.1",
                                         "go-1.23",
-                                        "static-1"
+                                        "static-1",
+                                        "flutter-3.24"
                                     ],
                                     "x-enum-name": null,
                                     "x-enum-keys": []
@@ -14328,13 +14330,13 @@
                                 "title": {
                                     "type": "string",
                                     "description": "Title for push notification.",
-                                    "default": null,
+                                    "default": "",
                                     "x-example": "<TITLE>"
                                 },
                                 "body": {
                                     "type": "string",
                                     "description": "Body for push notification.",
-                                    "default": null,
+                                    "default": "",
                                     "x-example": "<BODY>"
                                 },
                                 "topics": {
@@ -14366,7 +14368,7 @@
                                 },
                                 "data": {
                                     "type": "object",
-                                    "description": "Additional Data for push notification.",
+                                    "description": "Additional key-value pair data for push notification.",
                                     "default": {},
                                     "x-example": "{}"
                                 },
@@ -14390,7 +14392,7 @@
                                 },
                                 "sound": {
                                     "type": "string",
-                                    "description": "Sound for push notification. Available only for Android and IOS Platform.",
+                                    "description": "Sound for push notification. Available only for Android and iOS Platform.",
                                     "default": "",
                                     "x-example": "<SOUND>"
                                 },
@@ -14407,10 +14409,10 @@
                                     "x-example": "<TAG>"
                                 },
                                 "badge": {
-                                    "type": "string",
-                                    "description": "Badge for push notification. Available only for IOS Platform.",
-                                    "default": "",
-                                    "x-example": "<BADGE>"
+                                    "type": "integer",
+                                    "description": "Badge for push notification. Available only for iOS Platform.",
+                                    "default": 0,
+                                    "x-example": null
                                 },
                                 "draft": {
                                     "type": "boolean",
@@ -14423,12 +14425,34 @@
                                     "description": "Scheduled delivery time for message in [ISO 8601](https:\/\/www.iso.org\/iso-8601-date-and-time-format.html) format. DateTime value must be in future.",
                                     "default": null,
                                     "x-example": null
+                                },
+                                "contentAvailable": {
+                                    "type": "boolean",
+                                    "description": "If set to true, the notification will be delivered in the background. Available only for iOS Platform.",
+                                    "default": false,
+                                    "x-example": false
+                                },
+                                "critical": {
+                                    "type": "boolean",
+                                    "description": "If set to true, the notification will be marked as critical. This requires the app to have the critical notification entitlement. Available only for iOS Platform.",
+                                    "default": false,
+                                    "x-example": false
+                                },
+                                "priority": {
+                                    "type": "string",
+                                    "description": "Set the notification priority. \"normal\" will consider device battery state and may send notifications later. \"high\" will always attempt to immediately deliver the notification.",
+                                    "default": "high",
+                                    "x-example": "normal",
+                                    "enum": [
+                                        "normal",
+                                        "high"
+                                    ],
+                                    "x-enum-name": null,
+                                    "x-enum-keys": []
                                 }
                             },
                             "required": [
-                                "messageId",
-                                "title",
-                                "body"
+                                "messageId"
                             ]
                         }
                     }
@@ -14600,6 +14624,30 @@
                                     "description": "Scheduled delivery time for message in [ISO 8601](https:\/\/www.iso.org\/iso-8601-date-and-time-format.html) format. DateTime value must be in future.",
                                     "default": null,
                                     "x-example": null
+                                },
+                                "contentAvailable": {
+                                    "type": "boolean",
+                                    "description": "If set to true, the notification will be delivered in the background. Available only for iOS Platform.",
+                                    "default": null,
+                                    "x-example": false
+                                },
+                                "critical": {
+                                    "type": "boolean",
+                                    "description": "If set to true, the notification will be marked as critical. This requires the app to have the critical notification entitlement. Available only for iOS Platform.",
+                                    "default": null,
+                                    "x-example": false
+                                },
+                                "priority": {
+                                    "type": "string",
+                                    "description": "Set the notification priority. \"normal\" will consider device battery state and may send notifications later. \"high\" will always attempt to immediately deliver the notification.",
+                                    "default": null,
+                                    "x-example": "normal",
+                                    "enum": [
+                                        "normal",
+                                        "high"
+                                    ],
+                                    "x-enum-name": null,
+                                    "x-enum-keys": []
                                 }
                             }
                         }
@@ -35618,7 +35666,7 @@
                 },
                 "schedule": {
                     "type": "string",
-                    "description": "Function execution schedult in CRON format.",
+                    "description": "Function execution schedule in CRON format.",
                     "x-example": "5 4 * * *"
                 },
                 "timeout": {
diff --git a/app/config/specs/swagger2-1.6.x-server.json b/app/config/specs/swagger2-1.6.x-server.json
index 2c8e80c65ee..5a06a27a638 100644
--- a/app/config/specs/swagger2-1.6.x-server.json
+++ b/app/config/specs/swagger2-1.6.x-server.json
@@ -1,7 +1,7 @@
 {
     "swagger": "2.0",
     "info": {
-        "version": "1.6.0",
+        "version": "1.6.1",
         "title": "Appwrite",
         "description": "Appwrite backend as a service cuts up to 70% of the time and costs required for building a modern application. We abstract and simplify common development tasks behind a REST APIs, to help you develop your app in a fast and secure way. For full API documentation and tutorials go to [https:\/\/appwrite.io\/docs](https:\/\/appwrite.io\/docs)",
         "termsOfService": "https:\/\/appwrite.io\/policy\/terms",
@@ -2604,7 +2604,7 @@
                 "tags": [
                     "account"
                 ],
-                "description": "Sends the user an email with a secret key for creating a session. If the provided user ID has not been registered, a new user will be created. When the user clicks the link in the email, the user is redirected back to the URL you provided with the secret key and userId values attached to the URL query string. Use the query string parameters to submit a request to the [POST \/v1\/account\/sessions\/token](https:\/\/appwrite.io\/docs\/references\/cloud\/client-web\/account#createSession) endpoint to complete the login process. The link sent to the user's email address is valid for 1 hour. If you are on a mobile device you can leave the URL parameter empty, so that the login completion will be handled by your Appwrite instance by default.\n\nA user is limited to 10 active sessions at a time by default. [Learn more about session limits](https:\/\/appwrite.io\/docs\/authentication-security#limits).\n",
+                "description": "Sends the user an email with a secret key for creating a session. If the provided user ID has not been registered, a new user will be created. When the user clicks the link in the email, the user is redirected back to the URL you provided with the secret key and userId values attached to the URL query string. Use the query string parameters to submit a request to the [POST \/v1\/account\/sessions\/token](https:\/\/appwrite.io\/docs\/references\/cloud\/client-web\/account#createSession) endpoint to complete the login process. The link sent to the user's email address is valid for 1 hour.\n\nA user is limited to 10 active sessions at a time by default. [Learn more about session limits](https:\/\/appwrite.io\/docs\/authentication-security#limits).\n",
                 "responses": {
                     "201": {
                         "description": "Token",
@@ -8720,7 +8720,8 @@
                                         "bun-1.0",
                                         "bun-1.1",
                                         "go-1.23",
-                                        "static-1"
+                                        "static-1",
+                                        "flutter-3.24"
                                     ],
                                     "x-enum-name": null,
                                     "x-enum-keys": []
@@ -9166,7 +9167,8 @@
                                         "bun-1.0",
                                         "bun-1.1",
                                         "go-1.23",
-                                        "static-1"
+                                        "static-1",
+                                        "flutter-3.24"
                                     ],
                                     "x-enum-name": null,
                                     "x-enum-keys": []
@@ -13194,13 +13196,13 @@
                                 "title": {
                                     "type": "string",
                                     "description": "Title for push notification.",
-                                    "default": null,
+                                    "default": "",
                                     "x-example": "<TITLE>"
                                 },
                                 "body": {
                                     "type": "string",
                                     "description": "Body for push notification.",
-                                    "default": null,
+                                    "default": "",
                                     "x-example": "<BODY>"
                                 },
                                 "topics": {
@@ -13232,7 +13234,7 @@
                                 },
                                 "data": {
                                     "type": "object",
-                                    "description": "Additional Data for push notification.",
+                                    "description": "Additional key-value pair data for push notification.",
                                     "default": {},
                                     "x-example": "{}"
                                 },
@@ -13256,7 +13258,7 @@
                                 },
                                 "sound": {
                                     "type": "string",
-                                    "description": "Sound for push notification. Available only for Android and IOS Platform.",
+                                    "description": "Sound for push notification. Available only for Android and iOS Platform.",
                                     "default": "",
                                     "x-example": "<SOUND>"
                                 },
@@ -13273,10 +13275,10 @@
                                     "x-example": "<TAG>"
                                 },
                                 "badge": {
-                                    "type": "string",
-                                    "description": "Badge for push notification. Available only for IOS Platform.",
-                                    "default": "",
-                                    "x-example": "<BADGE>"
+                                    "type": "integer",
+                                    "description": "Badge for push notification. Available only for iOS Platform.",
+                                    "default": 0,
+                                    "x-example": null
                                 },
                                 "draft": {
                                     "type": "boolean",
@@ -13289,12 +13291,34 @@
                                     "description": "Scheduled delivery time for message in [ISO 8601](https:\/\/www.iso.org\/iso-8601-date-and-time-format.html) format. DateTime value must be in future.",
                                     "default": null,
                                     "x-example": null
+                                },
+                                "contentAvailable": {
+                                    "type": "boolean",
+                                    "description": "If set to true, the notification will be delivered in the background. Available only for iOS Platform.",
+                                    "default": false,
+                                    "x-example": false
+                                },
+                                "critical": {
+                                    "type": "boolean",
+                                    "description": "If set to true, the notification will be marked as critical. This requires the app to have the critical notification entitlement. Available only for iOS Platform.",
+                                    "default": false,
+                                    "x-example": false
+                                },
+                                "priority": {
+                                    "type": "string",
+                                    "description": "Set the notification priority. \"normal\" will consider device battery state and may send notifications later. \"high\" will always attempt to immediately deliver the notification.",
+                                    "default": "high",
+                                    "x-example": "normal",
+                                    "enum": [
+                                        "normal",
+                                        "high"
+                                    ],
+                                    "x-enum-name": null,
+                                    "x-enum-keys": []
                                 }
                             },
                             "required": [
-                                "messageId",
-                                "title",
-                                "body"
+                                "messageId"
                             ]
                         }
                     }
@@ -13467,6 +13491,30 @@
                                     "description": "Scheduled delivery time for message in [ISO 8601](https:\/\/www.iso.org\/iso-8601-date-and-time-format.html) format. DateTime value must be in future.",
                                     "default": null,
                                     "x-example": null
+                                },
+                                "contentAvailable": {
+                                    "type": "boolean",
+                                    "description": "If set to true, the notification will be delivered in the background. Available only for iOS Platform.",
+                                    "default": null,
+                                    "x-example": false
+                                },
+                                "critical": {
+                                    "type": "boolean",
+                                    "description": "If set to true, the notification will be marked as critical. This requires the app to have the critical notification entitlement. Available only for iOS Platform.",
+                                    "default": null,
+                                    "x-example": false
+                                },
+                                "priority": {
+                                    "type": "string",
+                                    "description": "Set the notification priority. \"normal\" will consider device battery state and may send notifications later. \"high\" will always attempt to immediately deliver the notification.",
+                                    "default": null,
+                                    "x-example": "normal",
+                                    "enum": [
+                                        "normal",
+                                        "high"
+                                    ],
+                                    "x-enum-name": null,
+                                    "x-enum-keys": []
                                 }
                             }
                         }
@@ -26233,7 +26281,7 @@
                 },
                 "schedule": {
                     "type": "string",
-                    "description": "Function execution schedult in CRON format.",
+                    "description": "Function execution schedule in CRON format.",
                     "x-example": "5 4 * * *"
                 },
                 "timeout": {
diff --git a/src/Appwrite/Platform/Workers/Messaging.php b/src/Appwrite/Platform/Workers/Messaging.php
index 76e1ad35729..1de503cd9a8 100644
--- a/src/Appwrite/Platform/Workers/Messaging.php
+++ b/src/Appwrite/Platform/Workers/Messaging.php
@@ -276,7 +276,7 @@ private function sendExternalMessage(
                                         Query::equal('identifier', [$result['recipient']])
                                     ]);
 
-                                    if ($target instanceof Document && !$target->isEmpty()) {
+                                    if (!$target->isEmpty()) {
                                         $dbForProject->updateDocument(
                                             'targets',
                                             $target->getId(),
@@ -288,7 +288,7 @@ private function sendExternalMessage(
                         } catch (\Throwable $e) {
                             $deliveryErrors[] = 'Failed sending to targets with error: ' . $e->getMessage();
                         } finally {
-                            $errorTotal = count($deliveryErrors);
+                            $errorTotal = \count($deliveryErrors);
                             $queueForUsage
                                 ->setProject($project)
                                 ->addMetric(METRIC_MESSAGES, ($deliveredTotal + $errorTotal))
@@ -676,8 +676,8 @@ private function buildSmsMessage(Document $message, Document $provider): SMS
     private function buildPushMessage(Document $message): Push
     {
         $to = $message['to'];
-        $title = $message['data']['title'] === '' ? null : $message['data']['title'];
-        $body = $message['data']['body'] === '' ? null : $message['data']['body'];
+        $title = ($message['data']['title'] ?? null) === '' ? null : $message['data']['title'];
+        $body = ($message['data']['body'] ?? null) === '' ? null : $message['data']['body'];
         $data = $message['data']['data'] ?? null;
         $action = $message['data']['action'] ?? null;
         $image = $message['data']['image']['url'] ?? null;
@@ -688,7 +688,6 @@ private function buildPushMessage(Document $message): Push
         $badge = $message['data']['badge'] ?? null;
         $contentAvailable = $message['data']['contentAvailable'] ?? false;
         $critical = $message['data']['critical'] ?? false;
-
         $priority = $message['data']['priority'] === 'high'
             ? Priority::HIGH
             : Priority::NORMAL;

From 8649032b734ac9a40db08d31bcec1df752a2e814 Mon Sep 17 00:00:00 2001
From: Jake Barnby <jakeb994@gmail.com>
Date: Tue, 10 Dec 2024 22:52:39 +1300
Subject: [PATCH 11/24] Fix badge param type

---
 app/controllers/api/messaging.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/api/messaging.php b/app/controllers/api/messaging.php
index dea43add264..28bc9d28967 100644
--- a/app/controllers/api/messaging.php
+++ b/app/controllers/api/messaging.php
@@ -2930,7 +2930,7 @@
     ->inject('project')
     ->inject('queueForMessaging')
     ->inject('response')
-    ->action(function (string $messageId, string $title, string $body, array $topics, array $users, array $targets, ?array $data, string $action, string $image, string $icon, string $sound, string $color, string $tag, string $badge, bool $draft, ?string $scheduledAt, bool $contentAvailable, bool $critical, string $priority, Event $queueForEvents, Database $dbForProject, Database $dbForConsole, Document $project, Messaging $queueForMessaging, Response $response) {
+    ->action(function (string $messageId, string $title, string $body, array $topics, array $users, array $targets, ?array $data, string $action, string $image, string $icon, string $sound, string $color, string $tag, int $badge, bool $draft, ?string $scheduledAt, bool $contentAvailable, bool $critical, string $priority, Event $queueForEvents, Database $dbForProject, Database $dbForConsole, Document $project, Messaging $queueForMessaging, Response $response) {
         $messageId = $messageId == 'unique()'
             ? ID::unique()
             : $messageId;

From 15855e2406d1763648dd0e15208a098d9bd94d1b Mon Sep 17 00:00:00 2001
From: Jake Barnby <jakeb994@gmail.com>
Date: Tue, 10 Dec 2024 22:53:03 +1300
Subject: [PATCH 12/24] Fix message search builder subquery

---
 app/init.php | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/app/init.php b/app/init.php
index 30ece745539..059fb412f7a 100644
--- a/app/init.php
+++ b/app/init.php
@@ -721,12 +721,19 @@ function (mixed $value, Document $message) {
         $data = \json_decode($message->getAttribute('data', []), true);
         $providerType = $message->getAttribute('providerType', '');
 
-        if ($providerType === MESSAGE_TYPE_EMAIL) {
-            $searchValues = \array_merge($searchValues, [$data['subject'], MESSAGE_TYPE_EMAIL]);
-        } elseif ($providerType === MESSAGE_TYPE_SMS) {
-            $searchValues = \array_merge($searchValues, [$data['content'], MESSAGE_TYPE_SMS]);
-        } else {
-            $searchValues = \array_merge($searchValues, [$data['title'], MESSAGE_TYPE_PUSH]);
+        switch ($providerType) {
+            case MESSAGE_TYPE_EMAIL:
+                $searchValues[] = $data['subject'];
+                $searchValues[] = MESSAGE_TYPE_EMAIL;
+                break;
+            case MESSAGE_TYPE_SMS:
+                $searchValues[] = $data['content'];
+                $searchValues[] = MESSAGE_TYPE_SMS;
+                break;
+            case MESSAGE_TYPE_PUSH:
+                $searchValues[] = $data['title'] ?? '';
+                $searchValues[] = MESSAGE_TYPE_PUSH;
+                break;
         }
 
         $search = \implode(' ', \array_filter($searchValues));

From f2b202aa52548dfd034cd5d078b1570e93dbba13 Mon Sep 17 00:00:00 2001
From: Jake Barnby <jakeb994@gmail.com>
Date: Tue, 10 Dec 2024 22:53:40 +1300
Subject: [PATCH 13/24] Update push message builder

---
 src/Appwrite/Platform/Workers/Messaging.php | 24 +++++++++++++++------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/src/Appwrite/Platform/Workers/Messaging.php b/src/Appwrite/Platform/Workers/Messaging.php
index 1de503cd9a8..8e60425da34 100644
--- a/src/Appwrite/Platform/Workers/Messaging.php
+++ b/src/Appwrite/Platform/Workers/Messaging.php
@@ -676,8 +676,8 @@ private function buildSmsMessage(Document $message, Document $provider): SMS
     private function buildPushMessage(Document $message): Push
     {
         $to = $message['to'];
-        $title = ($message['data']['title'] ?? null) === '' ? null : $message['data']['title'];
-        $body = ($message['data']['body'] ?? null) === '' ? null : $message['data']['body'];
+        $title = $message['data']['title'] ?? null;
+        $body = $message['data']['body'] ?? null;
         $data = $message['data']['data'] ?? null;
         $action = $message['data']['action'] ?? null;
         $image = $message['data']['image']['url'] ?? null;
@@ -686,11 +686,21 @@ private function buildPushMessage(Document $message): Push
         $color = $message['data']['color'] ?? null;
         $tag = $message['data']['tag'] ?? null;
         $badge = $message['data']['badge'] ?? null;
-        $contentAvailable = $message['data']['contentAvailable'] ?? false;
-        $critical = $message['data']['critical'] ?? false;
-        $priority = $message['data']['priority'] === 'high'
-            ? Priority::HIGH
-            : Priority::NORMAL;
+        $contentAvailable = $message['data']['contentAvailable'] ?? null;
+        $critical = $message['data']['critical'] ?? null;
+        $priority = $message['data']['priority'] ?? null;
+
+        if ($title === '') {
+            $title = null;
+        }
+        if ($body === '') {
+            $body = null;
+        }
+        if ($priority !== null) {
+            $priority = $priority === 'high'
+                ? Priority::HIGH
+                : Priority::NORMAL;
+        }
 
         return new Push(
             $to,

From 30fed93e2aa76259395e453821d143fe6ab112eb Mon Sep 17 00:00:00 2001
From: Jake Barnby <jakeb994@gmail.com>
Date: Tue, 10 Dec 2024 23:33:49 +1300
Subject: [PATCH 14/24] Remove variable variable usage

---
 app/controllers/api/messaging.php | 44 ++++++++++++++++++++++++++-----
 1 file changed, 38 insertions(+), 6 deletions(-)

diff --git a/app/controllers/api/messaging.php b/app/controllers/api/messaging.php
index 28bc9d28967..6c5fdf6df32 100644
--- a/app/controllers/api/messaging.php
+++ b/app/controllers/api/messaging.php
@@ -3013,12 +3013,44 @@
 
         $pushData = [];
 
-        $keys = ['title', 'body', 'data', 'action', 'image', 'icon', 'sound', 'color', 'tag', 'badge', 'contentAvailable', 'critical', 'priority'];
-
-        foreach ($keys as $key) {
-            if (!empty($$key)) {
-                $pushData[$key] = $$key;
-            }
+        if (!empty($title)) {
+            $pushData['title'] = $title;
+        }
+        if (!empty($body)) {
+            $pushData['body'] = $body;
+        }
+        if (!empty($data)) {
+            $pushData['data'] = $data;
+        }
+        if (!empty($action)) {
+            $pushData['action'] = $action;
+        }
+        if (!empty($image)) {
+            $pushData['image'] = $image;
+        }
+        if (!empty($icon)) {
+            $pushData['icon'] = $icon;
+        }
+        if (!empty($sound)) {
+            $pushData['sound'] = $sound;
+        }
+        if (!empty($color)) {
+            $pushData['color'] = $color;
+        }
+        if (!empty($tag)) {
+            $pushData['tag'] = $tag;
+        }
+        if ($badge >= 0) {
+            $pushData['badge'] = $badge;
+        }
+        if ($contentAvailable) {
+            $pushData['contentAvailable'] = true;
+        }
+        if ($critical) {
+            $pushData['critical'] = true;
+        }
+        if (!empty($priority)) {
+            $pushData['priority'] = $priority;
         }
 
         $message = $dbForProject->createDocument('messages', new Document([

From 6c83eba693089b9928b1b5fd9e3b83c7c7864400 Mon Sep 17 00:00:00 2001
From: Jake Barnby <jakeb994@gmail.com>
Date: Tue, 10 Dec 2024 23:34:24 +1300
Subject: [PATCH 15/24] Fix badge default to allow sending clear badge
 notifications

---
 app/controllers/api/messaging.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/controllers/api/messaging.php b/app/controllers/api/messaging.php
index 6c5fdf6df32..fe75a0529bf 100644
--- a/app/controllers/api/messaging.php
+++ b/app/controllers/api/messaging.php
@@ -2918,12 +2918,12 @@
     ->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)
     ->param('tag', '', new Text(256), 'Tag for push notification. Available only for Android Platform.', true)
-    ->param('badge', 0, new Integer(), 'Badge for push notification. Available only for iOS Platform.', true)
+    ->param('badge', -1, new Integer(), 'Badge for push notification. Available only for iOS Platform.', true)
     ->param('draft', false, new Boolean(), 'Is message a draft', true)
     ->param('scheduledAt', null, new DatetimeValidator(requireDateInFuture: true), 'Scheduled delivery time for message in [ISO 8601](https://www.iso.org/iso-8601-date-and-time-format.html) format. DateTime value must be in future.', true)
     ->param('contentAvailable', false, new Boolean(), 'If set to true, the notification will be delivered in the background. Available only for iOS Platform.', true)
     ->param('critical', false, new Boolean(), 'If set to true, the notification will be marked as critical. This requires the app to have the critical notification entitlement. Available only for iOS Platform.', true)
-    ->param('priority', 'high', new WhiteList(['normal', 'high']), 'Set the notification priority. "normal" will consider device battery state and may send notifications later. "high" will always attempt to immediately deliver the notification.', true)
+    ->param('priority', 'high', new WhiteList(['normal', 'high']), 'Set the notification priority. "normal" will consider device state and may not deliver notifications immediately. "high" will always attempt to immediately deliver the notification.', true)
     ->inject('queueForEvents')
     ->inject('dbForProject')
     ->inject('dbForConsole')

From 636dc8fe9faef5de29f57be8f045b02d48928cbf Mon Sep 17 00:00:00 2001
From: Jake Barnby <jakeb994@gmail.com>
Date: Tue, 10 Dec 2024 23:53:56 +1300
Subject: [PATCH 16/24] Update specs

---
 app/config/specs/open-api3-1.6.x-console.json  | 2 +-
 app/config/specs/open-api3-1.6.x-server.json   | 2 +-
 app/config/specs/open-api3-latest-console.json | 2 +-
 app/config/specs/open-api3-latest-server.json  | 2 +-
 app/config/specs/swagger2-1.6.x-console.json   | 4 ++--
 app/config/specs/swagger2-1.6.x-server.json    | 4 ++--
 app/config/specs/swagger2-latest-console.json  | 4 ++--
 app/config/specs/swagger2-latest-server.json   | 4 ++--
 8 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/app/config/specs/open-api3-1.6.x-console.json b/app/config/specs/open-api3-1.6.x-console.json
index 32985d9c58b..a9e502c1ddf 100644
--- a/app/config/specs/open-api3-1.6.x-console.json
+++ b/app/config/specs/open-api3-1.6.x-console.json
@@ -14182,7 +14182,7 @@
                                     },
                                     "priority": {
                                         "type": "string",
-                                        "description": "Set the notification priority. \"normal\" will consider device battery state and may send notifications later. \"high\" will always attempt to immediately deliver the notification.",
+                                        "description": "Set the notification priority. \"normal\" will consider device state and may not deliver notifications immediately. \"high\" will always attempt to immediately deliver the notification.",
                                         "x-example": "normal",
                                         "enum": [
                                             "normal",
diff --git a/app/config/specs/open-api3-1.6.x-server.json b/app/config/specs/open-api3-1.6.x-server.json
index 12d1337c5ed..38a0fe242bd 100644
--- a/app/config/specs/open-api3-1.6.x-server.json
+++ b/app/config/specs/open-api3-1.6.x-server.json
@@ -13040,7 +13040,7 @@
                                     },
                                     "priority": {
                                         "type": "string",
-                                        "description": "Set the notification priority. \"normal\" will consider device battery state and may send notifications later. \"high\" will always attempt to immediately deliver the notification.",
+                                        "description": "Set the notification priority. \"normal\" will consider device state and may not deliver notifications immediately. \"high\" will always attempt to immediately deliver the notification.",
                                         "x-example": "normal",
                                         "enum": [
                                             "normal",
diff --git a/app/config/specs/open-api3-latest-console.json b/app/config/specs/open-api3-latest-console.json
index 32985d9c58b..a9e502c1ddf 100644
--- a/app/config/specs/open-api3-latest-console.json
+++ b/app/config/specs/open-api3-latest-console.json
@@ -14182,7 +14182,7 @@
                                     },
                                     "priority": {
                                         "type": "string",
-                                        "description": "Set the notification priority. \"normal\" will consider device battery state and may send notifications later. \"high\" will always attempt to immediately deliver the notification.",
+                                        "description": "Set the notification priority. \"normal\" will consider device state and may not deliver notifications immediately. \"high\" will always attempt to immediately deliver the notification.",
                                         "x-example": "normal",
                                         "enum": [
                                             "normal",
diff --git a/app/config/specs/open-api3-latest-server.json b/app/config/specs/open-api3-latest-server.json
index 12d1337c5ed..38a0fe242bd 100644
--- a/app/config/specs/open-api3-latest-server.json
+++ b/app/config/specs/open-api3-latest-server.json
@@ -13040,7 +13040,7 @@
                                     },
                                     "priority": {
                                         "type": "string",
-                                        "description": "Set the notification priority. \"normal\" will consider device battery state and may send notifications later. \"high\" will always attempt to immediately deliver the notification.",
+                                        "description": "Set the notification priority. \"normal\" will consider device state and may not deliver notifications immediately. \"high\" will always attempt to immediately deliver the notification.",
                                         "x-example": "normal",
                                         "enum": [
                                             "normal",
diff --git a/app/config/specs/swagger2-1.6.x-console.json b/app/config/specs/swagger2-1.6.x-console.json
index a51fc316cba..c62d82fac77 100644
--- a/app/config/specs/swagger2-1.6.x-console.json
+++ b/app/config/specs/swagger2-1.6.x-console.json
@@ -14411,7 +14411,7 @@
                                 "badge": {
                                     "type": "integer",
                                     "description": "Badge for push notification. Available only for iOS Platform.",
-                                    "default": 0,
+                                    "default": -1,
                                     "x-example": null
                                 },
                                 "draft": {
@@ -14440,7 +14440,7 @@
                                 },
                                 "priority": {
                                     "type": "string",
-                                    "description": "Set the notification priority. \"normal\" will consider device battery state and may send notifications later. \"high\" will always attempt to immediately deliver the notification.",
+                                    "description": "Set the notification priority. \"normal\" will consider device state and may not deliver notifications immediately. \"high\" will always attempt to immediately deliver the notification.",
                                     "default": "high",
                                     "x-example": "normal",
                                     "enum": [
diff --git a/app/config/specs/swagger2-1.6.x-server.json b/app/config/specs/swagger2-1.6.x-server.json
index 5a06a27a638..43363135883 100644
--- a/app/config/specs/swagger2-1.6.x-server.json
+++ b/app/config/specs/swagger2-1.6.x-server.json
@@ -13277,7 +13277,7 @@
                                 "badge": {
                                     "type": "integer",
                                     "description": "Badge for push notification. Available only for iOS Platform.",
-                                    "default": 0,
+                                    "default": -1,
                                     "x-example": null
                                 },
                                 "draft": {
@@ -13306,7 +13306,7 @@
                                 },
                                 "priority": {
                                     "type": "string",
-                                    "description": "Set the notification priority. \"normal\" will consider device battery state and may send notifications later. \"high\" will always attempt to immediately deliver the notification.",
+                                    "description": "Set the notification priority. \"normal\" will consider device state and may not deliver notifications immediately. \"high\" will always attempt to immediately deliver the notification.",
                                     "default": "high",
                                     "x-example": "normal",
                                     "enum": [
diff --git a/app/config/specs/swagger2-latest-console.json b/app/config/specs/swagger2-latest-console.json
index a51fc316cba..c62d82fac77 100644
--- a/app/config/specs/swagger2-latest-console.json
+++ b/app/config/specs/swagger2-latest-console.json
@@ -14411,7 +14411,7 @@
                                 "badge": {
                                     "type": "integer",
                                     "description": "Badge for push notification. Available only for iOS Platform.",
-                                    "default": 0,
+                                    "default": -1,
                                     "x-example": null
                                 },
                                 "draft": {
@@ -14440,7 +14440,7 @@
                                 },
                                 "priority": {
                                     "type": "string",
-                                    "description": "Set the notification priority. \"normal\" will consider device battery state and may send notifications later. \"high\" will always attempt to immediately deliver the notification.",
+                                    "description": "Set the notification priority. \"normal\" will consider device state and may not deliver notifications immediately. \"high\" will always attempt to immediately deliver the notification.",
                                     "default": "high",
                                     "x-example": "normal",
                                     "enum": [
diff --git a/app/config/specs/swagger2-latest-server.json b/app/config/specs/swagger2-latest-server.json
index 5a06a27a638..43363135883 100644
--- a/app/config/specs/swagger2-latest-server.json
+++ b/app/config/specs/swagger2-latest-server.json
@@ -13277,7 +13277,7 @@
                                 "badge": {
                                     "type": "integer",
                                     "description": "Badge for push notification. Available only for iOS Platform.",
-                                    "default": 0,
+                                    "default": -1,
                                     "x-example": null
                                 },
                                 "draft": {
@@ -13306,7 +13306,7 @@
                                 },
                                 "priority": {
                                     "type": "string",
-                                    "description": "Set the notification priority. \"normal\" will consider device battery state and may send notifications later. \"high\" will always attempt to immediately deliver the notification.",
+                                    "description": "Set the notification priority. \"normal\" will consider device state and may not deliver notifications immediately. \"high\" will always attempt to immediately deliver the notification.",
                                     "default": "high",
                                     "x-example": "normal",
                                     "enum": [

From 478e19f52fc8df3bfcfca025c0cbe8d8334d6c46 Mon Sep 17 00:00:00 2001
From: Jake Barnby <jakeb994@gmail.com>
Date: Wed, 11 Dec 2024 00:26:01 +1300
Subject: [PATCH 17/24] Map push priority enum name

---
 app/config/specs/open-api3-1.6.x-console.json  | 4 ++--
 app/config/specs/open-api3-1.6.x-server.json   | 4 ++--
 app/config/specs/open-api3-latest-console.json | 4 ++--
 app/config/specs/open-api3-latest-server.json  | 4 ++--
 app/config/specs/swagger2-1.6.x-console.json   | 4 ++--
 app/config/specs/swagger2-1.6.x-server.json    | 4 ++--
 app/config/specs/swagger2-latest-console.json  | 4 ++--
 app/config/specs/swagger2-latest-server.json   | 4 ++--
 8 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/app/config/specs/open-api3-1.6.x-console.json b/app/config/specs/open-api3-1.6.x-console.json
index a9e502c1ddf..3c16ebc0668 100644
--- a/app/config/specs/open-api3-1.6.x-console.json
+++ b/app/config/specs/open-api3-1.6.x-console.json
@@ -14188,7 +14188,7 @@
                                             "normal",
                                             "high"
                                         ],
-                                        "x-enum-name": null,
+                                        "x-enum-name": "MessagePriority",
                                         "x-enum-keys": []
                                     }
                                 },
@@ -14371,7 +14371,7 @@
                                             "normal",
                                             "high"
                                         ],
-                                        "x-enum-name": null,
+                                        "x-enum-name": "MessagePriority",
                                         "x-enum-keys": []
                                     }
                                 }
diff --git a/app/config/specs/open-api3-1.6.x-server.json b/app/config/specs/open-api3-1.6.x-server.json
index 38a0fe242bd..75ff222ee68 100644
--- a/app/config/specs/open-api3-1.6.x-server.json
+++ b/app/config/specs/open-api3-1.6.x-server.json
@@ -13046,7 +13046,7 @@
                                             "normal",
                                             "high"
                                         ],
-                                        "x-enum-name": null,
+                                        "x-enum-name": "MessagePriority",
                                         "x-enum-keys": []
                                     }
                                 },
@@ -13230,7 +13230,7 @@
                                             "normal",
                                             "high"
                                         ],
-                                        "x-enum-name": null,
+                                        "x-enum-name": "MessagePriority",
                                         "x-enum-keys": []
                                     }
                                 }
diff --git a/app/config/specs/open-api3-latest-console.json b/app/config/specs/open-api3-latest-console.json
index a9e502c1ddf..3c16ebc0668 100644
--- a/app/config/specs/open-api3-latest-console.json
+++ b/app/config/specs/open-api3-latest-console.json
@@ -14188,7 +14188,7 @@
                                             "normal",
                                             "high"
                                         ],
-                                        "x-enum-name": null,
+                                        "x-enum-name": "MessagePriority",
                                         "x-enum-keys": []
                                     }
                                 },
@@ -14371,7 +14371,7 @@
                                             "normal",
                                             "high"
                                         ],
-                                        "x-enum-name": null,
+                                        "x-enum-name": "MessagePriority",
                                         "x-enum-keys": []
                                     }
                                 }
diff --git a/app/config/specs/open-api3-latest-server.json b/app/config/specs/open-api3-latest-server.json
index 38a0fe242bd..75ff222ee68 100644
--- a/app/config/specs/open-api3-latest-server.json
+++ b/app/config/specs/open-api3-latest-server.json
@@ -13046,7 +13046,7 @@
                                             "normal",
                                             "high"
                                         ],
-                                        "x-enum-name": null,
+                                        "x-enum-name": "MessagePriority",
                                         "x-enum-keys": []
                                     }
                                 },
@@ -13230,7 +13230,7 @@
                                             "normal",
                                             "high"
                                         ],
-                                        "x-enum-name": null,
+                                        "x-enum-name": "MessagePriority",
                                         "x-enum-keys": []
                                     }
                                 }
diff --git a/app/config/specs/swagger2-1.6.x-console.json b/app/config/specs/swagger2-1.6.x-console.json
index c62d82fac77..5e42b844786 100644
--- a/app/config/specs/swagger2-1.6.x-console.json
+++ b/app/config/specs/swagger2-1.6.x-console.json
@@ -14447,7 +14447,7 @@
                                         "normal",
                                         "high"
                                     ],
-                                    "x-enum-name": null,
+                                    "x-enum-name": "MessagePriority",
                                     "x-enum-keys": []
                                 }
                             },
@@ -14646,7 +14646,7 @@
                                         "normal",
                                         "high"
                                     ],
-                                    "x-enum-name": null,
+                                    "x-enum-name": "MessagePriority",
                                     "x-enum-keys": []
                                 }
                             }
diff --git a/app/config/specs/swagger2-1.6.x-server.json b/app/config/specs/swagger2-1.6.x-server.json
index 43363135883..3aa1139c09d 100644
--- a/app/config/specs/swagger2-1.6.x-server.json
+++ b/app/config/specs/swagger2-1.6.x-server.json
@@ -13313,7 +13313,7 @@
                                         "normal",
                                         "high"
                                     ],
-                                    "x-enum-name": null,
+                                    "x-enum-name": "MessagePriority",
                                     "x-enum-keys": []
                                 }
                             },
@@ -13513,7 +13513,7 @@
                                         "normal",
                                         "high"
                                     ],
-                                    "x-enum-name": null,
+                                    "x-enum-name": "MessagePriority",
                                     "x-enum-keys": []
                                 }
                             }
diff --git a/app/config/specs/swagger2-latest-console.json b/app/config/specs/swagger2-latest-console.json
index c62d82fac77..5e42b844786 100644
--- a/app/config/specs/swagger2-latest-console.json
+++ b/app/config/specs/swagger2-latest-console.json
@@ -14447,7 +14447,7 @@
                                         "normal",
                                         "high"
                                     ],
-                                    "x-enum-name": null,
+                                    "x-enum-name": "MessagePriority",
                                     "x-enum-keys": []
                                 }
                             },
@@ -14646,7 +14646,7 @@
                                         "normal",
                                         "high"
                                     ],
-                                    "x-enum-name": null,
+                                    "x-enum-name": "MessagePriority",
                                     "x-enum-keys": []
                                 }
                             }
diff --git a/app/config/specs/swagger2-latest-server.json b/app/config/specs/swagger2-latest-server.json
index 43363135883..3aa1139c09d 100644
--- a/app/config/specs/swagger2-latest-server.json
+++ b/app/config/specs/swagger2-latest-server.json
@@ -13313,7 +13313,7 @@
                                         "normal",
                                         "high"
                                     ],
-                                    "x-enum-name": null,
+                                    "x-enum-name": "MessagePriority",
                                     "x-enum-keys": []
                                 }
                             },
@@ -13513,7 +13513,7 @@
                                         "normal",
                                         "high"
                                     ],
-                                    "x-enum-name": null,
+                                    "x-enum-name": "MessagePriority",
                                     "x-enum-keys": []
                                 }
                             }

From 4a49629a34359bcd9cde7649c109e9d822348a7e Mon Sep 17 00:00:00 2001
From: Jake Barnby <jakeb994@gmail.com>
Date: Wed, 11 Dec 2024 00:26:58 +1300
Subject: [PATCH 18/24] Map enum

---
 src/Appwrite/Specification/Format.php          | 2 ++
 src/Appwrite/Specification/Format/Swagger2.php | 2 --
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Appwrite/Specification/Format.php b/src/Appwrite/Specification/Format.php
index 30ce6470e10..8396f5cb7ca 100644
--- a/src/Appwrite/Specification/Format.php
+++ b/src/Appwrite/Specification/Format.php
@@ -215,6 +215,8 @@ protected function getEnumName(string $service, string $method, string $param):
                         switch ($param) {
                             case 'status':
                                 return 'MessageStatus';
+                            case 'priority':
+                                return 'MessagePriority';
                         }
                         break;
                     case 'createSmtpProvider':
diff --git a/src/Appwrite/Specification/Format/Swagger2.php b/src/Appwrite/Specification/Format/Swagger2.php
index 66a540a4d49..b10188525ed 100644
--- a/src/Appwrite/Specification/Format/Swagger2.php
+++ b/src/Appwrite/Specification/Format/Swagger2.php
@@ -34,7 +34,6 @@ protected function getNestedModels(Model $model, array &$usedModels): void
                         foreach ($this->models as $m) {
                             if ($m->getType() === $ruleType) {
                                 $this->getNestedModels($m, $usedModels);
-                                continue;
                             }
                         }
                     }
@@ -46,7 +45,6 @@ protected function getNestedModels(Model $model, array &$usedModels): void
                     foreach ($this->models as $m) {
                         if ($m->getType() === $rule['type']) {
                             $this->getNestedModels($m, $usedModels);
-                            continue;
                         }
                     }
                 }

From d80731e7dbbd160f37dea6b1ad952928e8e9a9b2 Mon Sep 17 00:00:00 2001
From: Jake Barnby <jakeb994@gmail.com>
Date: Wed, 11 Dec 2024 19:14:10 +1300
Subject: [PATCH 19/24] Allow pushing SDK to new branches

---
 src/Appwrite/Platform/Tasks/SDKs.php | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/Appwrite/Platform/Tasks/SDKs.php b/src/Appwrite/Platform/Tasks/SDKs.php
index 6e37f270a46..126dcd7fb49 100644
--- a/src/Appwrite/Platform/Tasks/SDKs.php
+++ b/src/Appwrite/Platform/Tasks/SDKs.php
@@ -41,15 +41,15 @@ public function __construct()
         $this
             ->desc('Generate Appwrite SDKs')
             ->param('platform', null, new Nullable(new Text(256)), 'Selected Platform', optional: true)
-            ->param('sdk', null, new Nullable(new Text(256)), 'Selected SDK', optional:true)
-            ->param('version', null, new Nullable(new Text(256)), 'Selected SDK', optional:true)
+            ->param('sdk', null, new Nullable(new Text(256)), 'Selected SDK', optional: true)
+            ->param('version', null, new Nullable(new Text(256)), 'Selected SDK', optional: true)
             ->param('git', null, new Nullable(new WhiteList(['yes', 'no'])), 'Should we use git push?', optional: true)
-            ->param('production', null, new Nullable(new WhiteList(['yes', 'no'])), 'Should we push to production?', optional:true)
-            ->param('message', null, new Nullable(new Text(256)), 'Commit Message', optional:true)
+            ->param('production', null, new Nullable(new WhiteList(['yes', 'no'])), 'Should we push to production?', optional: true)
+            ->param('message', null, new Nullable(new Text(256)), 'Commit Message', optional: true)
             ->callback([$this, 'action']);
     }
 
-    public function action(?string $selectedPlatform, ?string $selectedSDK, ?string $version, ?string $git, ?string $production, ?string $message)
+    public function action(?string $selectedPlatform, ?string $selectedSDK, ?string $version, ?string $git, ?string $production, ?string $message): void
     {
         $selectedPlatform ??= Console::confirm('Choose Platform ("' . APP_PLATFORM_CLIENT . '", "' . APP_PLATFORM_SERVER . '", "' . APP_PLATFORM_CONSOLE . '" or "*" for all):');
         $selectedSDK ??= \strtolower(Console::confirm('Choose SDK ("*" for all):'));
@@ -275,9 +275,13 @@ public function action(?string $selectedPlatform, ?string $selectedSDK, ?string
                     \exec('rm -rf ' . $target . ' && \
                         mkdir -p ' . $target . ' && \
                         cd ' . $target . ' && \
-                        git init --initial-branch=' . $gitBranch . ' && \
+                        git init && \
                         git remote add origin ' . $gitUrl . ' && \
-                        git fetch origin ' . $gitBranch . ' && \
+                        git fetch origin && \
+                        git checkout main || git checkout -b main && \
+                        git pull origin main && \
+                        git checkout ' . $gitBranch . ' || git checkout -b ' . $gitBranch . ' && \
+                        git fetch origin ' . $gitBranch . ' || git push -u origin ' . $gitBranch . ' && \
                         git pull origin ' . $gitBranch . ' && \
                         rm -rf ' . $target . '/* && \
                         cp -r ' . $result . '/. ' . $target . '/ && \

From bb6da36b36582f70770bbdba481a4a3ffbcd6ab3 Mon Sep 17 00:00:00 2001
From: Jake Barnby <jakeb994@gmail.com>
Date: Wed, 11 Dec 2024 19:15:10 +1300
Subject: [PATCH 20/24] Update versions

---
 app/config/platforms.php | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/app/config/platforms.php b/app/config/platforms.php
index e54fb0a0737..e83076cb9e1 100644
--- a/app/config/platforms.php
+++ b/app/config/platforms.php
@@ -245,7 +245,7 @@
             [
                 'key' => 'nodejs',
                 'name' => 'Node.js',
-                'version' => '14.1.0',
+                'version' => '14.2.0',
                 'url' => 'https://github.com/appwrite/sdk-for-node',
                 'package' => 'https://www.npmjs.com/package/node-appwrite',
                 'enabled' => true,
@@ -263,7 +263,7 @@
             [
                 'key' => 'deno',
                 'name' => 'Deno',
-                'version' => '12.1.0',
+                'version' => '12.2.0',
                 'url' => 'https://github.com/appwrite/sdk-for-deno',
                 'package' => 'https://deno.land/x/appwrite',
                 'enabled' => true,
@@ -281,7 +281,7 @@
             [
                 'key' => 'php',
                 'name' => 'PHP',
-                'version' => '12.1.0',
+                'version' => '12.2.0',
                 'url' => 'https://github.com/appwrite/sdk-for-php',
                 'package' => 'https://packagist.org/packages/appwrite/appwrite',
                 'enabled' => true,
@@ -299,7 +299,7 @@
             [
                 'key' => 'python',
                 'name' => 'Python',
-                'version' => '6.1.0',
+                'version' => '6.2.0',
                 'url' => 'https://github.com/appwrite/sdk-for-python',
                 'package' => 'https://pypi.org/project/appwrite/',
                 'enabled' => true,
@@ -317,7 +317,7 @@
             [
                 'key' => 'ruby',
                 'name' => 'Ruby',
-                'version' => '12.1.1',
+                'version' => '12.2.0',
                 'url' => 'https://github.com/appwrite/sdk-for-ruby',
                 'package' => 'https://rubygems.org/gems/appwrite',
                 'enabled' => true,
@@ -335,7 +335,7 @@
             [
                 'key' => 'go',
                 'name' => 'Go',
-                'version' => '0.2.0',
+                'version' => '0.3.0',
                 'url' => 'https://github.com/appwrite/sdk-for-go',
                 'package' => 'https://github.com/appwrite/sdk-for-go',
                 'enabled' => true,
@@ -353,7 +353,7 @@
             [
                 'key' => 'dotnet',
                 'name' => '.NET',
-                'version' => '0.10.1',
+                'version' => '0.11.0',
                 'url' => 'https://github.com/appwrite/sdk-for-dotnet',
                 'package' => 'https://www.nuget.org/packages/Appwrite',
                 'enabled' => true,
@@ -371,7 +371,7 @@
             [
                 'key' => 'dart',
                 'name' => 'Dart',
-                'version' => '12.1.0',
+                'version' => '12.2.0',
                 'url' => 'https://github.com/appwrite/sdk-for-dart',
                 'package' => 'https://pub.dev/packages/dart_appwrite',
                 'enabled' => true,
@@ -389,7 +389,7 @@
             [
                 'key' => 'kotlin',
                 'name' => 'Kotlin',
-                'version' => '6.1.0',
+                'version' => '6.2.0',
                 'url' => 'https://github.com/appwrite/sdk-for-kotlin',
                 'package' => 'https://search.maven.org/artifact/io.appwrite/sdk-for-kotlin',
                 'enabled' => true,
@@ -411,7 +411,7 @@
             [
                 'key' => 'swift',
                 'name' => 'Swift',
-                'version' => '6.1.0',
+                'version' => '6.2.0',
                 'url' => 'https://github.com/appwrite/sdk-for-swift',
                 'package' => 'https://github.com/appwrite/sdk-for-swift',
                 'enabled' => true,

From 8531b70089cfee3c0c8aa36830b6ccd0519a44ce Mon Sep 17 00:00:00 2001
From: Jake Barnby <jakeb994@gmail.com>
Date: Wed, 11 Dec 2024 19:15:29 +1300
Subject: [PATCH 21/24] Update docs

---
 .../examples/databases/update-string-attribute.md   |  2 +-
 .../server-dart/examples/messaging/create-push.md   |  9 ++++++---
 .../server-dart/examples/messaging/update-push.md   |  3 +++
 .../examples/databases/update-string-attribute.md   |  2 +-
 .../server-deno/examples/messaging/create-push.md   | 13 ++++++++-----
 .../server-deno/examples/messaging/update-push.md   |  7 +++++--
 .../examples/databases/update-string-attribute.md   |  2 +-
 .../server-dotnet/examples/messaging/create-push.md | 12 ++++++++----
 .../server-dotnet/examples/messaging/update-push.md |  6 +++++-
 .../examples/databases/update-string-attribute.md   |  2 +-
 .../server-go/examples/messaging/create-push.md     |  9 ++++++---
 .../server-go/examples/messaging/update-push.md     |  3 +++
 .../1.6.x/server-graphql/examples/account/create.md |  1 +
 .../1.6.x/server-graphql/examples/account/get.md    |  1 +
 .../server-graphql/examples/account/update-email.md |  1 +
 .../server-graphql/examples/account/update-m-f-a.md |  1 +
 .../examples/account/update-mfa-authenticator.md    |  1 +
 .../server-graphql/examples/account/update-name.md  |  1 +
 .../examples/account/update-password.md             |  1 +
 .../server-graphql/examples/account/update-phone.md |  1 +
 .../server-graphql/examples/account/update-prefs.md |  1 +
 .../examples/account/update-status.md               |  1 +
 .../examples/databases/create-boolean-attribute.md  |  2 ++
 .../examples/databases/create-collection.md         |  2 ++
 .../examples/databases/create-datetime-attribute.md |  2 ++
 .../examples/databases/create-email-attribute.md    |  2 ++
 .../examples/databases/create-enum-attribute.md     |  2 ++
 .../examples/databases/create-float-attribute.md    |  2 ++
 .../examples/databases/create-index.md              |  2 ++
 .../examples/databases/create-integer-attribute.md  |  2 ++
 .../examples/databases/create-ip-attribute.md       |  2 ++
 .../databases/create-relationship-attribute.md      |  2 ++
 .../examples/databases/create-string-attribute.md   |  2 ++
 .../examples/databases/create-url-attribute.md      |  2 ++
 .../examples/databases/get-collection.md            |  2 ++
 .../server-graphql/examples/databases/get-index.md  |  2 ++
 .../examples/databases/list-collections.md          |  2 ++
 .../examples/databases/list-indexes.md              |  2 ++
 .../examples/databases/update-boolean-attribute.md  |  2 ++
 .../examples/databases/update-collection.md         |  2 ++
 .../examples/databases/update-datetime-attribute.md |  2 ++
 .../examples/databases/update-email-attribute.md    |  2 ++
 .../examples/databases/update-enum-attribute.md     |  2 ++
 .../examples/databases/update-float-attribute.md    |  2 ++
 .../examples/databases/update-integer-attribute.md  |  2 ++
 .../examples/databases/update-ip-attribute.md       |  2 ++
 .../databases/update-relationship-attribute.md      |  2 ++
 .../examples/databases/update-string-attribute.md   |  4 +++-
 .../examples/databases/update-url-attribute.md      |  2 ++
 .../examples/messaging/create-push.md               |  7 +++++--
 .../examples/messaging/create-subscriber.md         |  1 +
 .../examples/messaging/get-subscriber.md            |  1 +
 .../examples/messaging/list-subscribers.md          |  1 +
 .../examples/messaging/list-targets.md              |  1 +
 .../examples/messaging/update-push.md               |  5 ++++-
 .../examples/users/create-argon2user.md             |  1 +
 .../examples/users/create-bcrypt-user.md            |  1 +
 .../examples/users/create-m-d5user.md               |  1 +
 .../examples/users/create-p-h-pass-user.md          |  1 +
 .../examples/users/create-s-h-a-user.md             |  1 +
 .../examples/users/create-scrypt-modified-user.md   |  1 +
 .../examples/users/create-scrypt-user.md            |  1 +
 .../server-graphql/examples/users/create-target.md  |  1 +
 .../1.6.x/server-graphql/examples/users/create.md   |  1 +
 .../examples/users/delete-mfa-authenticator.md      |  1 +
 .../server-graphql/examples/users/get-target.md     |  1 +
 .../1.6.x/server-graphql/examples/users/get.md      |  1 +
 .../server-graphql/examples/users/list-targets.md   |  1 +
 .../1.6.x/server-graphql/examples/users/list.md     |  1 +
 .../examples/users/update-email-verification.md     |  1 +
 .../server-graphql/examples/users/update-email.md   |  1 +
 .../server-graphql/examples/users/update-labels.md  |  1 +
 .../server-graphql/examples/users/update-mfa.md     |  1 +
 .../server-graphql/examples/users/update-name.md    |  1 +
 .../examples/users/update-password.md               |  1 +
 .../examples/users/update-phone-verification.md     |  1 +
 .../server-graphql/examples/users/update-phone.md   |  1 +
 .../server-graphql/examples/users/update-status.md  |  1 +
 .../server-graphql/examples/users/update-target.md  |  1 +
 .../java/databases/update-string-attribute.md       |  2 +-
 .../server-kotlin/java/messaging/create-push.md     |  9 ++++++---
 .../server-kotlin/java/messaging/update-push.md     |  3 +++
 .../kotlin/databases/update-string-attribute.md     |  2 +-
 .../server-kotlin/kotlin/messaging/create-push.md   | 11 +++++++----
 .../server-kotlin/kotlin/messaging/update-push.md   |  5 ++++-
 .../examples/databases/update-string-attribute.md   |  2 +-
 .../server-nodejs/examples/messaging/create-push.md | 11 +++++++----
 .../server-nodejs/examples/messaging/update-push.md |  5 ++++-
 .../examples/databases/update-string-attribute.md   |  2 +-
 .../server-php/examples/messaging/create-push.md    | 11 +++++++----
 .../server-php/examples/messaging/update-push.md    |  5 ++++-
 .../examples/databases/update-string-attribute.md   |  2 +-
 .../server-python/examples/messaging/create-push.md | 11 +++++++----
 .../server-python/examples/messaging/update-push.md |  5 ++++-
 .../examples/databases/update-string-attribute.md   |  2 +-
 .../server-rest/examples/messaging/create-push.md   |  7 +++++--
 .../server-rest/examples/messaging/update-push.md   |  5 ++++-
 .../examples/databases/update-string-attribute.md   |  2 +-
 .../server-ruby/examples/messaging/create-push.md   | 11 +++++++----
 .../server-ruby/examples/messaging/update-push.md   |  5 ++++-
 .../examples/databases/update-string-attribute.md   |  2 +-
 .../server-swift/examples/messaging/create-push.md  | 12 ++++++++----
 .../server-swift/examples/messaging/update-push.md  |  6 +++++-
 103 files changed, 244 insertions(+), 70 deletions(-)

diff --git a/docs/examples/1.6.x/server-dart/examples/databases/update-string-attribute.md b/docs/examples/1.6.x/server-dart/examples/databases/update-string-attribute.md
index c2f3804c664..f9498aa36bd 100644
--- a/docs/examples/1.6.x/server-dart/examples/databases/update-string-attribute.md
+++ b/docs/examples/1.6.x/server-dart/examples/databases/update-string-attribute.md
@@ -13,6 +13,6 @@ AttributeString result = await databases.updateStringAttribute(
     key: '',
     xrequired: false,
     xdefault: '<DEFAULT>',
-    size: 0, // (optional)
+    size: 1, // (optional)
     newKey: '', // (optional)
 );
diff --git a/docs/examples/1.6.x/server-dart/examples/messaging/create-push.md b/docs/examples/1.6.x/server-dart/examples/messaging/create-push.md
index c3c7d2ffc5d..e496de9d27c 100644
--- a/docs/examples/1.6.x/server-dart/examples/messaging/create-push.md
+++ b/docs/examples/1.6.x/server-dart/examples/messaging/create-push.md
@@ -9,8 +9,8 @@ Messaging messaging = Messaging(client);
 
 Message result = await messaging.createPush(
     messageId: '<MESSAGE_ID>',
-    title: '<TITLE>',
-    body: '<BODY>',
+    title: '<TITLE>', // (optional)
+    body: '<BODY>', // (optional)
     topics: [], // (optional)
     users: [], // (optional)
     targets: [], // (optional)
@@ -21,7 +21,10 @@ Message result = await messaging.createPush(
     sound: '<SOUND>', // (optional)
     color: '<COLOR>', // (optional)
     tag: '<TAG>', // (optional)
-    badge: '<BADGE>', // (optional)
+    badge: 0, // (optional)
     draft: false, // (optional)
     scheduledAt: '', // (optional)
+    contentAvailable: false, // (optional)
+    critical: false, // (optional)
+    priority: MessagePriority.normal, // (optional)
 );
diff --git a/docs/examples/1.6.x/server-dart/examples/messaging/update-push.md b/docs/examples/1.6.x/server-dart/examples/messaging/update-push.md
index dcec9b243f1..f5d75332e24 100644
--- a/docs/examples/1.6.x/server-dart/examples/messaging/update-push.md
+++ b/docs/examples/1.6.x/server-dart/examples/messaging/update-push.md
@@ -24,4 +24,7 @@ Message result = await messaging.updatePush(
     badge: 0, // (optional)
     draft: false, // (optional)
     scheduledAt: '', // (optional)
+    contentAvailable: false, // (optional)
+    critical: false, // (optional)
+    priority: MessagePriority.normal, // (optional)
 );
diff --git a/docs/examples/1.6.x/server-deno/examples/databases/update-string-attribute.md b/docs/examples/1.6.x/server-deno/examples/databases/update-string-attribute.md
index 6603c377cbd..d57f8fd663a 100644
--- a/docs/examples/1.6.x/server-deno/examples/databases/update-string-attribute.md
+++ b/docs/examples/1.6.x/server-deno/examples/databases/update-string-attribute.md
@@ -13,6 +13,6 @@ const response = await databases.updateStringAttribute(
     '', // key
     false, // required
     '<DEFAULT>', // default
-    null, // size (optional)
+    1, // size (optional)
     '' // newKey (optional)
 );
diff --git a/docs/examples/1.6.x/server-deno/examples/messaging/create-push.md b/docs/examples/1.6.x/server-deno/examples/messaging/create-push.md
index 005cca1b77c..7b419119189 100644
--- a/docs/examples/1.6.x/server-deno/examples/messaging/create-push.md
+++ b/docs/examples/1.6.x/server-deno/examples/messaging/create-push.md
@@ -1,4 +1,4 @@
-import { Client, Messaging } from "https://deno.land/x/appwrite/mod.ts";
+import { Client, Messaging, MessagePriority } from "https://deno.land/x/appwrite/mod.ts";
 
 const client = new Client()
     .setEndpoint('https://cloud.appwrite.io/v1') // Your API Endpoint
@@ -9,8 +9,8 @@ const messaging = new Messaging(client);
 
 const response = await messaging.createPush(
     '<MESSAGE_ID>', // messageId
-    '<TITLE>', // title
-    '<BODY>', // body
+    '<TITLE>', // title (optional)
+    '<BODY>', // body (optional)
     [], // topics (optional)
     [], // users (optional)
     [], // targets (optional)
@@ -21,7 +21,10 @@ const response = await messaging.createPush(
     '<SOUND>', // sound (optional)
     '<COLOR>', // color (optional)
     '<TAG>', // tag (optional)
-    '<BADGE>', // badge (optional)
+    null, // badge (optional)
     false, // draft (optional)
-    '' // scheduledAt (optional)
+    '', // scheduledAt (optional)
+    false, // contentAvailable (optional)
+    false, // critical (optional)
+    MessagePriority.Normal // priority (optional)
 );
diff --git a/docs/examples/1.6.x/server-deno/examples/messaging/update-push.md b/docs/examples/1.6.x/server-deno/examples/messaging/update-push.md
index 9c66ab6ab7e..11437fabe1f 100644
--- a/docs/examples/1.6.x/server-deno/examples/messaging/update-push.md
+++ b/docs/examples/1.6.x/server-deno/examples/messaging/update-push.md
@@ -1,4 +1,4 @@
-import { Client, Messaging } from "https://deno.land/x/appwrite/mod.ts";
+import { Client, Messaging, MessagePriority } from "https://deno.land/x/appwrite/mod.ts";
 
 const client = new Client()
     .setEndpoint('https://cloud.appwrite.io/v1') // Your API Endpoint
@@ -23,5 +23,8 @@ const response = await messaging.updatePush(
     '<TAG>', // tag (optional)
     null, // badge (optional)
     false, // draft (optional)
-    '' // scheduledAt (optional)
+    '', // scheduledAt (optional)
+    false, // contentAvailable (optional)
+    false, // critical (optional)
+    MessagePriority.Normal // priority (optional)
 );
diff --git a/docs/examples/1.6.x/server-dotnet/examples/databases/update-string-attribute.md b/docs/examples/1.6.x/server-dotnet/examples/databases/update-string-attribute.md
index e915d23f518..a180815a505 100644
--- a/docs/examples/1.6.x/server-dotnet/examples/databases/update-string-attribute.md
+++ b/docs/examples/1.6.x/server-dotnet/examples/databases/update-string-attribute.md
@@ -15,6 +15,6 @@ AttributeString result = await databases.UpdateStringAttribute(
     key: "",
     required: false,
     default: "<DEFAULT>",
-    size: 0, // optional
+    size: 1, // optional
     newKey: "" // optional
 );
\ No newline at end of file
diff --git a/docs/examples/1.6.x/server-dotnet/examples/messaging/create-push.md b/docs/examples/1.6.x/server-dotnet/examples/messaging/create-push.md
index f83a0ed8df7..588781b3a18 100644
--- a/docs/examples/1.6.x/server-dotnet/examples/messaging/create-push.md
+++ b/docs/examples/1.6.x/server-dotnet/examples/messaging/create-push.md
@@ -1,4 +1,5 @@
 using Appwrite;
+using Appwrite.Enums;
 using Appwrite.Models;
 using Appwrite.Services;
 
@@ -11,8 +12,8 @@ Messaging messaging = new Messaging(client);
 
 Message result = await messaging.CreatePush(
     messageId: "<MESSAGE_ID>",
-    title: "<TITLE>",
-    body: "<BODY>",
+    title: "<TITLE>", // optional
+    body: "<BODY>", // optional
     topics: new List<string>(), // optional
     users: new List<string>(), // optional
     targets: new List<string>(), // optional
@@ -23,7 +24,10 @@ Message result = await messaging.CreatePush(
     sound: "<SOUND>", // optional
     color: "<COLOR>", // optional
     tag: "<TAG>", // optional
-    badge: "<BADGE>", // optional
+    badge: 0, // optional
     draft: false, // optional
-    scheduledAt: "" // optional
+    scheduledAt: "", // optional
+    contentAvailable: false, // optional
+    critical: false, // optional
+    priority: MessagePriority.Normal // optional
 );
\ No newline at end of file
diff --git a/docs/examples/1.6.x/server-dotnet/examples/messaging/update-push.md b/docs/examples/1.6.x/server-dotnet/examples/messaging/update-push.md
index 0de09d570a0..2b48d1827d2 100644
--- a/docs/examples/1.6.x/server-dotnet/examples/messaging/update-push.md
+++ b/docs/examples/1.6.x/server-dotnet/examples/messaging/update-push.md
@@ -1,4 +1,5 @@
 using Appwrite;
+using Appwrite.Enums;
 using Appwrite.Models;
 using Appwrite.Services;
 
@@ -25,5 +26,8 @@ Message result = await messaging.UpdatePush(
     tag: "<TAG>", // optional
     badge: 0, // optional
     draft: false, // optional
-    scheduledAt: "" // optional
+    scheduledAt: "", // optional
+    contentAvailable: false, // optional
+    critical: false, // optional
+    priority: MessagePriority.Normal // optional
 );
\ No newline at end of file
diff --git a/docs/examples/1.6.x/server-go/examples/databases/update-string-attribute.md b/docs/examples/1.6.x/server-go/examples/databases/update-string-attribute.md
index d662060f095..f3e6addb072 100644
--- a/docs/examples/1.6.x/server-go/examples/databases/update-string-attribute.md
+++ b/docs/examples/1.6.x/server-go/examples/databases/update-string-attribute.md
@@ -20,7 +20,7 @@ func main() {
         "",
         false,
         "<DEFAULT>",
-        databases.WithUpdateStringAttributeSize(0),
+        databases.WithUpdateStringAttributeSize(1),
         databases.WithUpdateStringAttributeNewKey(""),
     )
 
diff --git a/docs/examples/1.6.x/server-go/examples/messaging/create-push.md b/docs/examples/1.6.x/server-go/examples/messaging/create-push.md
index 090e0cbca27..b40037472f2 100644
--- a/docs/examples/1.6.x/server-go/examples/messaging/create-push.md
+++ b/docs/examples/1.6.x/server-go/examples/messaging/create-push.md
@@ -16,8 +16,8 @@ func main() {
     service := messaging.NewMessaging(client)
     response, error := service.CreatePush(
         "<MESSAGE_ID>",
-        "<TITLE>",
-        "<BODY>",
+        messaging.WithCreatePushTitle("<TITLE>"),
+        messaging.WithCreatePushBody("<BODY>"),
         messaging.WithCreatePushTopics([]interface{}{}),
         messaging.WithCreatePushUsers([]interface{}{}),
         messaging.WithCreatePushTargets([]interface{}{}),
@@ -28,9 +28,12 @@ func main() {
         messaging.WithCreatePushSound("<SOUND>"),
         messaging.WithCreatePushColor("<COLOR>"),
         messaging.WithCreatePushTag("<TAG>"),
-        messaging.WithCreatePushBadge("<BADGE>"),
+        messaging.WithCreatePushBadge(0),
         messaging.WithCreatePushDraft(false),
         messaging.WithCreatePushScheduledAt(""),
+        messaging.WithCreatePushContentAvailable(false),
+        messaging.WithCreatePushCritical(false),
+        messaging.WithCreatePushPriority("normal"),
     )
 
     if error != nil {
diff --git a/docs/examples/1.6.x/server-go/examples/messaging/update-push.md b/docs/examples/1.6.x/server-go/examples/messaging/update-push.md
index af1b6095cdc..d1b47256c07 100644
--- a/docs/examples/1.6.x/server-go/examples/messaging/update-push.md
+++ b/docs/examples/1.6.x/server-go/examples/messaging/update-push.md
@@ -31,6 +31,9 @@ func main() {
         messaging.WithUpdatePushBadge(0),
         messaging.WithUpdatePushDraft(false),
         messaging.WithUpdatePushScheduledAt(""),
+        messaging.WithUpdatePushContentAvailable(false),
+        messaging.WithUpdatePushCritical(false),
+        messaging.WithUpdatePushPriority("normal"),
     )
 
     if error != nil {
diff --git a/docs/examples/1.6.x/server-graphql/examples/account/create.md b/docs/examples/1.6.x/server-graphql/examples/account/create.md
index 3f8e3c3cf7c..0d39394a3d0 100644
--- a/docs/examples/1.6.x/server-graphql/examples/account/create.md
+++ b/docs/examples/1.6.x/server-graphql/examples/account/create.md
@@ -33,6 +33,7 @@ mutation {
             providerId
             providerType
             identifier
+            expired
         }
         accessedAt
     }
diff --git a/docs/examples/1.6.x/server-graphql/examples/account/get.md b/docs/examples/1.6.x/server-graphql/examples/account/get.md
index e4db8f0e414..f4f07c187f2 100644
--- a/docs/examples/1.6.x/server-graphql/examples/account/get.md
+++ b/docs/examples/1.6.x/server-graphql/examples/account/get.md
@@ -28,6 +28,7 @@ query {
             providerId
             providerType
             identifier
+            expired
         }
         accessedAt
     }
diff --git a/docs/examples/1.6.x/server-graphql/examples/account/update-email.md b/docs/examples/1.6.x/server-graphql/examples/account/update-email.md
index b207bad4bbb..c879e24a43a 100644
--- a/docs/examples/1.6.x/server-graphql/examples/account/update-email.md
+++ b/docs/examples/1.6.x/server-graphql/examples/account/update-email.md
@@ -31,6 +31,7 @@ mutation {
             providerId
             providerType
             identifier
+            expired
         }
         accessedAt
     }
diff --git a/docs/examples/1.6.x/server-graphql/examples/account/update-m-f-a.md b/docs/examples/1.6.x/server-graphql/examples/account/update-m-f-a.md
index d2cd3d6ae54..787c2e08608 100644
--- a/docs/examples/1.6.x/server-graphql/examples/account/update-m-f-a.md
+++ b/docs/examples/1.6.x/server-graphql/examples/account/update-m-f-a.md
@@ -30,6 +30,7 @@ mutation {
             providerId
             providerType
             identifier
+            expired
         }
         accessedAt
     }
diff --git a/docs/examples/1.6.x/server-graphql/examples/account/update-mfa-authenticator.md b/docs/examples/1.6.x/server-graphql/examples/account/update-mfa-authenticator.md
index c74062c7d4a..9cfe9150be6 100644
--- a/docs/examples/1.6.x/server-graphql/examples/account/update-mfa-authenticator.md
+++ b/docs/examples/1.6.x/server-graphql/examples/account/update-mfa-authenticator.md
@@ -31,6 +31,7 @@ mutation {
             providerId
             providerType
             identifier
+            expired
         }
         accessedAt
     }
diff --git a/docs/examples/1.6.x/server-graphql/examples/account/update-name.md b/docs/examples/1.6.x/server-graphql/examples/account/update-name.md
index 850b5760a0a..8ba2c99d9c2 100644
--- a/docs/examples/1.6.x/server-graphql/examples/account/update-name.md
+++ b/docs/examples/1.6.x/server-graphql/examples/account/update-name.md
@@ -30,6 +30,7 @@ mutation {
             providerId
             providerType
             identifier
+            expired
         }
         accessedAt
     }
diff --git a/docs/examples/1.6.x/server-graphql/examples/account/update-password.md b/docs/examples/1.6.x/server-graphql/examples/account/update-password.md
index 5904da08420..f3619a10d28 100644
--- a/docs/examples/1.6.x/server-graphql/examples/account/update-password.md
+++ b/docs/examples/1.6.x/server-graphql/examples/account/update-password.md
@@ -31,6 +31,7 @@ mutation {
             providerId
             providerType
             identifier
+            expired
         }
         accessedAt
     }
diff --git a/docs/examples/1.6.x/server-graphql/examples/account/update-phone.md b/docs/examples/1.6.x/server-graphql/examples/account/update-phone.md
index 408a2033002..adecb711684 100644
--- a/docs/examples/1.6.x/server-graphql/examples/account/update-phone.md
+++ b/docs/examples/1.6.x/server-graphql/examples/account/update-phone.md
@@ -31,6 +31,7 @@ mutation {
             providerId
             providerType
             identifier
+            expired
         }
         accessedAt
     }
diff --git a/docs/examples/1.6.x/server-graphql/examples/account/update-prefs.md b/docs/examples/1.6.x/server-graphql/examples/account/update-prefs.md
index 40db7b43dbd..57280247e40 100644
--- a/docs/examples/1.6.x/server-graphql/examples/account/update-prefs.md
+++ b/docs/examples/1.6.x/server-graphql/examples/account/update-prefs.md
@@ -30,6 +30,7 @@ mutation {
             providerId
             providerType
             identifier
+            expired
         }
         accessedAt
     }
diff --git a/docs/examples/1.6.x/server-graphql/examples/account/update-status.md b/docs/examples/1.6.x/server-graphql/examples/account/update-status.md
index aca8c098e71..c17f5568426 100644
--- a/docs/examples/1.6.x/server-graphql/examples/account/update-status.md
+++ b/docs/examples/1.6.x/server-graphql/examples/account/update-status.md
@@ -28,6 +28,7 @@ mutation {
             providerId
             providerType
             identifier
+            expired
         }
         accessedAt
     }
diff --git a/docs/examples/1.6.x/server-graphql/examples/databases/create-boolean-attribute.md b/docs/examples/1.6.x/server-graphql/examples/databases/create-boolean-attribute.md
index 6e969a587ec..aa0bfa832e4 100644
--- a/docs/examples/1.6.x/server-graphql/examples/databases/create-boolean-attribute.md
+++ b/docs/examples/1.6.x/server-graphql/examples/databases/create-boolean-attribute.md
@@ -13,6 +13,8 @@ mutation {
         error
         required
         array
+        _createdAt
+        _updatedAt
         default
     }
 }
diff --git a/docs/examples/1.6.x/server-graphql/examples/databases/create-collection.md b/docs/examples/1.6.x/server-graphql/examples/databases/create-collection.md
index 05175cc1e78..51eb51f4101 100644
--- a/docs/examples/1.6.x/server-graphql/examples/databases/create-collection.md
+++ b/docs/examples/1.6.x/server-graphql/examples/databases/create-collection.md
@@ -23,6 +23,8 @@ mutation {
             error
             attributes
             orders
+            _createdAt
+            _updatedAt
         }
     }
 }
diff --git a/docs/examples/1.6.x/server-graphql/examples/databases/create-datetime-attribute.md b/docs/examples/1.6.x/server-graphql/examples/databases/create-datetime-attribute.md
index fcd5cb37a20..47601df0d8e 100644
--- a/docs/examples/1.6.x/server-graphql/examples/databases/create-datetime-attribute.md
+++ b/docs/examples/1.6.x/server-graphql/examples/databases/create-datetime-attribute.md
@@ -13,6 +13,8 @@ mutation {
         error
         required
         array
+        _createdAt
+        _updatedAt
         format
         default
     }
diff --git a/docs/examples/1.6.x/server-graphql/examples/databases/create-email-attribute.md b/docs/examples/1.6.x/server-graphql/examples/databases/create-email-attribute.md
index 1f23a23ba7b..e5845ccd47c 100644
--- a/docs/examples/1.6.x/server-graphql/examples/databases/create-email-attribute.md
+++ b/docs/examples/1.6.x/server-graphql/examples/databases/create-email-attribute.md
@@ -13,6 +13,8 @@ mutation {
         error
         required
         array
+        _createdAt
+        _updatedAt
         format
         default
     }
diff --git a/docs/examples/1.6.x/server-graphql/examples/databases/create-enum-attribute.md b/docs/examples/1.6.x/server-graphql/examples/databases/create-enum-attribute.md
index 410a7983b45..d13c080e4ac 100644
--- a/docs/examples/1.6.x/server-graphql/examples/databases/create-enum-attribute.md
+++ b/docs/examples/1.6.x/server-graphql/examples/databases/create-enum-attribute.md
@@ -14,6 +14,8 @@ mutation {
         error
         required
         array
+        _createdAt
+        _updatedAt
         elements
         format
         default
diff --git a/docs/examples/1.6.x/server-graphql/examples/databases/create-float-attribute.md b/docs/examples/1.6.x/server-graphql/examples/databases/create-float-attribute.md
index ae6f9f72d61..2a270c3aff8 100644
--- a/docs/examples/1.6.x/server-graphql/examples/databases/create-float-attribute.md
+++ b/docs/examples/1.6.x/server-graphql/examples/databases/create-float-attribute.md
@@ -15,6 +15,8 @@ mutation {
         error
         required
         array
+        _createdAt
+        _updatedAt
         min
         max
         default
diff --git a/docs/examples/1.6.x/server-graphql/examples/databases/create-index.md b/docs/examples/1.6.x/server-graphql/examples/databases/create-index.md
index efc92a798c2..2875a9b4b7d 100644
--- a/docs/examples/1.6.x/server-graphql/examples/databases/create-index.md
+++ b/docs/examples/1.6.x/server-graphql/examples/databases/create-index.md
@@ -13,5 +13,7 @@ mutation {
         error
         attributes
         orders
+        _createdAt
+        _updatedAt
     }
 }
diff --git a/docs/examples/1.6.x/server-graphql/examples/databases/create-integer-attribute.md b/docs/examples/1.6.x/server-graphql/examples/databases/create-integer-attribute.md
index 1dc43f6b0d0..8c79706817a 100644
--- a/docs/examples/1.6.x/server-graphql/examples/databases/create-integer-attribute.md
+++ b/docs/examples/1.6.x/server-graphql/examples/databases/create-integer-attribute.md
@@ -15,6 +15,8 @@ mutation {
         error
         required
         array
+        _createdAt
+        _updatedAt
         min
         max
         default
diff --git a/docs/examples/1.6.x/server-graphql/examples/databases/create-ip-attribute.md b/docs/examples/1.6.x/server-graphql/examples/databases/create-ip-attribute.md
index b2fd7215a0a..0f4ad9e1396 100644
--- a/docs/examples/1.6.x/server-graphql/examples/databases/create-ip-attribute.md
+++ b/docs/examples/1.6.x/server-graphql/examples/databases/create-ip-attribute.md
@@ -13,6 +13,8 @@ mutation {
         error
         required
         array
+        _createdAt
+        _updatedAt
         format
         default
     }
diff --git a/docs/examples/1.6.x/server-graphql/examples/databases/create-relationship-attribute.md b/docs/examples/1.6.x/server-graphql/examples/databases/create-relationship-attribute.md
index ddca20b83aa..f66b87d6afc 100644
--- a/docs/examples/1.6.x/server-graphql/examples/databases/create-relationship-attribute.md
+++ b/docs/examples/1.6.x/server-graphql/examples/databases/create-relationship-attribute.md
@@ -15,6 +15,8 @@ mutation {
         error
         required
         array
+        _createdAt
+        _updatedAt
         relatedCollection
         relationType
         twoWay
diff --git a/docs/examples/1.6.x/server-graphql/examples/databases/create-string-attribute.md b/docs/examples/1.6.x/server-graphql/examples/databases/create-string-attribute.md
index 3c290712e9b..62d97d69623 100644
--- a/docs/examples/1.6.x/server-graphql/examples/databases/create-string-attribute.md
+++ b/docs/examples/1.6.x/server-graphql/examples/databases/create-string-attribute.md
@@ -15,6 +15,8 @@ mutation {
         error
         required
         array
+        _createdAt
+        _updatedAt
         size
         default
     }
diff --git a/docs/examples/1.6.x/server-graphql/examples/databases/create-url-attribute.md b/docs/examples/1.6.x/server-graphql/examples/databases/create-url-attribute.md
index d2a39756c94..89ad873e52b 100644
--- a/docs/examples/1.6.x/server-graphql/examples/databases/create-url-attribute.md
+++ b/docs/examples/1.6.x/server-graphql/examples/databases/create-url-attribute.md
@@ -13,6 +13,8 @@ mutation {
         error
         required
         array
+        _createdAt
+        _updatedAt
         format
         default
     }
diff --git a/docs/examples/1.6.x/server-graphql/examples/databases/get-collection.md b/docs/examples/1.6.x/server-graphql/examples/databases/get-collection.md
index f76b71b6bab..ed27286b0d6 100644
--- a/docs/examples/1.6.x/server-graphql/examples/databases/get-collection.md
+++ b/docs/examples/1.6.x/server-graphql/examples/databases/get-collection.md
@@ -19,6 +19,8 @@ query {
             error
             attributes
             orders
+            _createdAt
+            _updatedAt
         }
     }
 }
diff --git a/docs/examples/1.6.x/server-graphql/examples/databases/get-index.md b/docs/examples/1.6.x/server-graphql/examples/databases/get-index.md
index de3c44ebe08..29de7a76f82 100644
--- a/docs/examples/1.6.x/server-graphql/examples/databases/get-index.md
+++ b/docs/examples/1.6.x/server-graphql/examples/databases/get-index.md
@@ -10,5 +10,7 @@ query {
         error
         attributes
         orders
+        _createdAt
+        _updatedAt
     }
 }
diff --git a/docs/examples/1.6.x/server-graphql/examples/databases/list-collections.md b/docs/examples/1.6.x/server-graphql/examples/databases/list-collections.md
index b821b6c4cf2..8dafbf7042f 100644
--- a/docs/examples/1.6.x/server-graphql/examples/databases/list-collections.md
+++ b/docs/examples/1.6.x/server-graphql/examples/databases/list-collections.md
@@ -22,6 +22,8 @@ query {
                 error
                 attributes
                 orders
+                _createdAt
+                _updatedAt
             }
         }
     }
diff --git a/docs/examples/1.6.x/server-graphql/examples/databases/list-indexes.md b/docs/examples/1.6.x/server-graphql/examples/databases/list-indexes.md
index e1c11b6c038..3cb67c64511 100644
--- a/docs/examples/1.6.x/server-graphql/examples/databases/list-indexes.md
+++ b/docs/examples/1.6.x/server-graphql/examples/databases/list-indexes.md
@@ -12,6 +12,8 @@ query {
             error
             attributes
             orders
+            _createdAt
+            _updatedAt
         }
     }
 }
diff --git a/docs/examples/1.6.x/server-graphql/examples/databases/update-boolean-attribute.md b/docs/examples/1.6.x/server-graphql/examples/databases/update-boolean-attribute.md
index e92b41a14ea..d508e62139d 100644
--- a/docs/examples/1.6.x/server-graphql/examples/databases/update-boolean-attribute.md
+++ b/docs/examples/1.6.x/server-graphql/examples/databases/update-boolean-attribute.md
@@ -13,6 +13,8 @@ mutation {
         error
         required
         array
+        _createdAt
+        _updatedAt
         default
     }
 }
diff --git a/docs/examples/1.6.x/server-graphql/examples/databases/update-collection.md b/docs/examples/1.6.x/server-graphql/examples/databases/update-collection.md
index fc78bb8efc1..e918c058b88 100644
--- a/docs/examples/1.6.x/server-graphql/examples/databases/update-collection.md
+++ b/docs/examples/1.6.x/server-graphql/examples/databases/update-collection.md
@@ -23,6 +23,8 @@ mutation {
             error
             attributes
             orders
+            _createdAt
+            _updatedAt
         }
     }
 }
diff --git a/docs/examples/1.6.x/server-graphql/examples/databases/update-datetime-attribute.md b/docs/examples/1.6.x/server-graphql/examples/databases/update-datetime-attribute.md
index 46d9bbb728c..a21b910edc9 100644
--- a/docs/examples/1.6.x/server-graphql/examples/databases/update-datetime-attribute.md
+++ b/docs/examples/1.6.x/server-graphql/examples/databases/update-datetime-attribute.md
@@ -13,6 +13,8 @@ mutation {
         error
         required
         array
+        _createdAt
+        _updatedAt
         format
         default
     }
diff --git a/docs/examples/1.6.x/server-graphql/examples/databases/update-email-attribute.md b/docs/examples/1.6.x/server-graphql/examples/databases/update-email-attribute.md
index e05d3651625..6c83d80e162 100644
--- a/docs/examples/1.6.x/server-graphql/examples/databases/update-email-attribute.md
+++ b/docs/examples/1.6.x/server-graphql/examples/databases/update-email-attribute.md
@@ -13,6 +13,8 @@ mutation {
         error
         required
         array
+        _createdAt
+        _updatedAt
         format
         default
     }
diff --git a/docs/examples/1.6.x/server-graphql/examples/databases/update-enum-attribute.md b/docs/examples/1.6.x/server-graphql/examples/databases/update-enum-attribute.md
index 619cbf817ca..378e32f9b87 100644
--- a/docs/examples/1.6.x/server-graphql/examples/databases/update-enum-attribute.md
+++ b/docs/examples/1.6.x/server-graphql/examples/databases/update-enum-attribute.md
@@ -14,6 +14,8 @@ mutation {
         error
         required
         array
+        _createdAt
+        _updatedAt
         elements
         format
         default
diff --git a/docs/examples/1.6.x/server-graphql/examples/databases/update-float-attribute.md b/docs/examples/1.6.x/server-graphql/examples/databases/update-float-attribute.md
index 7641745a35c..c5c7afca44d 100644
--- a/docs/examples/1.6.x/server-graphql/examples/databases/update-float-attribute.md
+++ b/docs/examples/1.6.x/server-graphql/examples/databases/update-float-attribute.md
@@ -15,6 +15,8 @@ mutation {
         error
         required
         array
+        _createdAt
+        _updatedAt
         min
         max
         default
diff --git a/docs/examples/1.6.x/server-graphql/examples/databases/update-integer-attribute.md b/docs/examples/1.6.x/server-graphql/examples/databases/update-integer-attribute.md
index 11b7a660145..e38ccaa88c7 100644
--- a/docs/examples/1.6.x/server-graphql/examples/databases/update-integer-attribute.md
+++ b/docs/examples/1.6.x/server-graphql/examples/databases/update-integer-attribute.md
@@ -15,6 +15,8 @@ mutation {
         error
         required
         array
+        _createdAt
+        _updatedAt
         min
         max
         default
diff --git a/docs/examples/1.6.x/server-graphql/examples/databases/update-ip-attribute.md b/docs/examples/1.6.x/server-graphql/examples/databases/update-ip-attribute.md
index 649fa881b5c..7a262242005 100644
--- a/docs/examples/1.6.x/server-graphql/examples/databases/update-ip-attribute.md
+++ b/docs/examples/1.6.x/server-graphql/examples/databases/update-ip-attribute.md
@@ -13,6 +13,8 @@ mutation {
         error
         required
         array
+        _createdAt
+        _updatedAt
         format
         default
     }
diff --git a/docs/examples/1.6.x/server-graphql/examples/databases/update-relationship-attribute.md b/docs/examples/1.6.x/server-graphql/examples/databases/update-relationship-attribute.md
index 88ba2f9636e..6694540d93f 100644
--- a/docs/examples/1.6.x/server-graphql/examples/databases/update-relationship-attribute.md
+++ b/docs/examples/1.6.x/server-graphql/examples/databases/update-relationship-attribute.md
@@ -12,6 +12,8 @@ mutation {
         error
         required
         array
+        _createdAt
+        _updatedAt
         relatedCollection
         relationType
         twoWay
diff --git a/docs/examples/1.6.x/server-graphql/examples/databases/update-string-attribute.md b/docs/examples/1.6.x/server-graphql/examples/databases/update-string-attribute.md
index 4d88462efb3..afafb307f5b 100644
--- a/docs/examples/1.6.x/server-graphql/examples/databases/update-string-attribute.md
+++ b/docs/examples/1.6.x/server-graphql/examples/databases/update-string-attribute.md
@@ -5,7 +5,7 @@ mutation {
         key: "",
         required: false,
         default: "<DEFAULT>",
-        size: 0,
+        size: 1,
         newKey: ""
     ) {
         key
@@ -14,6 +14,8 @@ mutation {
         error
         required
         array
+        _createdAt
+        _updatedAt
         size
         default
     }
diff --git a/docs/examples/1.6.x/server-graphql/examples/databases/update-url-attribute.md b/docs/examples/1.6.x/server-graphql/examples/databases/update-url-attribute.md
index 06838a9ed49..f9f14a04f61 100644
--- a/docs/examples/1.6.x/server-graphql/examples/databases/update-url-attribute.md
+++ b/docs/examples/1.6.x/server-graphql/examples/databases/update-url-attribute.md
@@ -13,6 +13,8 @@ mutation {
         error
         required
         array
+        _createdAt
+        _updatedAt
         format
         default
     }
diff --git a/docs/examples/1.6.x/server-graphql/examples/messaging/create-push.md b/docs/examples/1.6.x/server-graphql/examples/messaging/create-push.md
index 3084c97635f..92264d1b675 100644
--- a/docs/examples/1.6.x/server-graphql/examples/messaging/create-push.md
+++ b/docs/examples/1.6.x/server-graphql/examples/messaging/create-push.md
@@ -13,9 +13,12 @@ mutation {
         sound: "<SOUND>",
         color: "<COLOR>",
         tag: "<TAG>",
-        badge: "<BADGE>",
+        badge: 0,
         draft: false,
-        scheduledAt: ""
+        scheduledAt: "",
+        contentAvailable: false,
+        critical: false,
+        priority: "normal"
     ) {
         _id
         _createdAt
diff --git a/docs/examples/1.6.x/server-graphql/examples/messaging/create-subscriber.md b/docs/examples/1.6.x/server-graphql/examples/messaging/create-subscriber.md
index b2712ebb487..bab53612b79 100644
--- a/docs/examples/1.6.x/server-graphql/examples/messaging/create-subscriber.md
+++ b/docs/examples/1.6.x/server-graphql/examples/messaging/create-subscriber.md
@@ -17,6 +17,7 @@ mutation {
             providerId
             providerType
             identifier
+            expired
         }
         userId
         userName
diff --git a/docs/examples/1.6.x/server-graphql/examples/messaging/get-subscriber.md b/docs/examples/1.6.x/server-graphql/examples/messaging/get-subscriber.md
index 54096dd70a4..2e1672d0106 100644
--- a/docs/examples/1.6.x/server-graphql/examples/messaging/get-subscriber.md
+++ b/docs/examples/1.6.x/server-graphql/examples/messaging/get-subscriber.md
@@ -16,6 +16,7 @@ query {
             providerId
             providerType
             identifier
+            expired
         }
         userId
         userName
diff --git a/docs/examples/1.6.x/server-graphql/examples/messaging/list-subscribers.md b/docs/examples/1.6.x/server-graphql/examples/messaging/list-subscribers.md
index 5c48ae34bb8..a5a4f91e567 100644
--- a/docs/examples/1.6.x/server-graphql/examples/messaging/list-subscribers.md
+++ b/docs/examples/1.6.x/server-graphql/examples/messaging/list-subscribers.md
@@ -19,6 +19,7 @@ query {
                 providerId
                 providerType
                 identifier
+                expired
             }
             userId
             userName
diff --git a/docs/examples/1.6.x/server-graphql/examples/messaging/list-targets.md b/docs/examples/1.6.x/server-graphql/examples/messaging/list-targets.md
index 8e356dce5fe..aa82276de24 100644
--- a/docs/examples/1.6.x/server-graphql/examples/messaging/list-targets.md
+++ b/docs/examples/1.6.x/server-graphql/examples/messaging/list-targets.md
@@ -13,6 +13,7 @@ query {
             providerId
             providerType
             identifier
+            expired
         }
     }
 }
diff --git a/docs/examples/1.6.x/server-graphql/examples/messaging/update-push.md b/docs/examples/1.6.x/server-graphql/examples/messaging/update-push.md
index 9039792573a..8ee2f576107 100644
--- a/docs/examples/1.6.x/server-graphql/examples/messaging/update-push.md
+++ b/docs/examples/1.6.x/server-graphql/examples/messaging/update-push.md
@@ -15,7 +15,10 @@ mutation {
         tag: "<TAG>",
         badge: 0,
         draft: false,
-        scheduledAt: ""
+        scheduledAt: "",
+        contentAvailable: false,
+        critical: false,
+        priority: "normal"
     ) {
         _id
         _createdAt
diff --git a/docs/examples/1.6.x/server-graphql/examples/users/create-argon2user.md b/docs/examples/1.6.x/server-graphql/examples/users/create-argon2user.md
index 464dc754c9a..7f99622e524 100644
--- a/docs/examples/1.6.x/server-graphql/examples/users/create-argon2user.md
+++ b/docs/examples/1.6.x/server-graphql/examples/users/create-argon2user.md
@@ -33,6 +33,7 @@ mutation {
             providerId
             providerType
             identifier
+            expired
         }
         accessedAt
     }
diff --git a/docs/examples/1.6.x/server-graphql/examples/users/create-bcrypt-user.md b/docs/examples/1.6.x/server-graphql/examples/users/create-bcrypt-user.md
index 4d4bb091945..26659176ebf 100644
--- a/docs/examples/1.6.x/server-graphql/examples/users/create-bcrypt-user.md
+++ b/docs/examples/1.6.x/server-graphql/examples/users/create-bcrypt-user.md
@@ -33,6 +33,7 @@ mutation {
             providerId
             providerType
             identifier
+            expired
         }
         accessedAt
     }
diff --git a/docs/examples/1.6.x/server-graphql/examples/users/create-m-d5user.md b/docs/examples/1.6.x/server-graphql/examples/users/create-m-d5user.md
index e8e833e6de4..7e642b8233e 100644
--- a/docs/examples/1.6.x/server-graphql/examples/users/create-m-d5user.md
+++ b/docs/examples/1.6.x/server-graphql/examples/users/create-m-d5user.md
@@ -33,6 +33,7 @@ mutation {
             providerId
             providerType
             identifier
+            expired
         }
         accessedAt
     }
diff --git a/docs/examples/1.6.x/server-graphql/examples/users/create-p-h-pass-user.md b/docs/examples/1.6.x/server-graphql/examples/users/create-p-h-pass-user.md
index 53960e7890a..4c06b007a24 100644
--- a/docs/examples/1.6.x/server-graphql/examples/users/create-p-h-pass-user.md
+++ b/docs/examples/1.6.x/server-graphql/examples/users/create-p-h-pass-user.md
@@ -33,6 +33,7 @@ mutation {
             providerId
             providerType
             identifier
+            expired
         }
         accessedAt
     }
diff --git a/docs/examples/1.6.x/server-graphql/examples/users/create-s-h-a-user.md b/docs/examples/1.6.x/server-graphql/examples/users/create-s-h-a-user.md
index 17e287f8b32..f99da2752da 100644
--- a/docs/examples/1.6.x/server-graphql/examples/users/create-s-h-a-user.md
+++ b/docs/examples/1.6.x/server-graphql/examples/users/create-s-h-a-user.md
@@ -34,6 +34,7 @@ mutation {
             providerId
             providerType
             identifier
+            expired
         }
         accessedAt
     }
diff --git a/docs/examples/1.6.x/server-graphql/examples/users/create-scrypt-modified-user.md b/docs/examples/1.6.x/server-graphql/examples/users/create-scrypt-modified-user.md
index 6d51fb29ba6..624ffcdd386 100644
--- a/docs/examples/1.6.x/server-graphql/examples/users/create-scrypt-modified-user.md
+++ b/docs/examples/1.6.x/server-graphql/examples/users/create-scrypt-modified-user.md
@@ -36,6 +36,7 @@ mutation {
             providerId
             providerType
             identifier
+            expired
         }
         accessedAt
     }
diff --git a/docs/examples/1.6.x/server-graphql/examples/users/create-scrypt-user.md b/docs/examples/1.6.x/server-graphql/examples/users/create-scrypt-user.md
index 0d4bac1db8b..68a5f4c75f7 100644
--- a/docs/examples/1.6.x/server-graphql/examples/users/create-scrypt-user.md
+++ b/docs/examples/1.6.x/server-graphql/examples/users/create-scrypt-user.md
@@ -38,6 +38,7 @@ mutation {
             providerId
             providerType
             identifier
+            expired
         }
         accessedAt
     }
diff --git a/docs/examples/1.6.x/server-graphql/examples/users/create-target.md b/docs/examples/1.6.x/server-graphql/examples/users/create-target.md
index a3a0696deca..7068c21aba1 100644
--- a/docs/examples/1.6.x/server-graphql/examples/users/create-target.md
+++ b/docs/examples/1.6.x/server-graphql/examples/users/create-target.md
@@ -15,5 +15,6 @@ mutation {
         providerId
         providerType
         identifier
+        expired
     }
 }
diff --git a/docs/examples/1.6.x/server-graphql/examples/users/create.md b/docs/examples/1.6.x/server-graphql/examples/users/create.md
index 826a5168efd..465da804322 100644
--- a/docs/examples/1.6.x/server-graphql/examples/users/create.md
+++ b/docs/examples/1.6.x/server-graphql/examples/users/create.md
@@ -34,6 +34,7 @@ mutation {
             providerId
             providerType
             identifier
+            expired
         }
         accessedAt
     }
diff --git a/docs/examples/1.6.x/server-graphql/examples/users/delete-mfa-authenticator.md b/docs/examples/1.6.x/server-graphql/examples/users/delete-mfa-authenticator.md
index 227c340c68d..26c9594a53d 100644
--- a/docs/examples/1.6.x/server-graphql/examples/users/delete-mfa-authenticator.md
+++ b/docs/examples/1.6.x/server-graphql/examples/users/delete-mfa-authenticator.md
@@ -31,6 +31,7 @@ mutation {
             providerId
             providerType
             identifier
+            expired
         }
         accessedAt
     }
diff --git a/docs/examples/1.6.x/server-graphql/examples/users/get-target.md b/docs/examples/1.6.x/server-graphql/examples/users/get-target.md
index e4ba1a04a1d..c84f947898e 100644
--- a/docs/examples/1.6.x/server-graphql/examples/users/get-target.md
+++ b/docs/examples/1.6.x/server-graphql/examples/users/get-target.md
@@ -11,5 +11,6 @@ query {
         providerId
         providerType
         identifier
+        expired
     }
 }
diff --git a/docs/examples/1.6.x/server-graphql/examples/users/get.md b/docs/examples/1.6.x/server-graphql/examples/users/get.md
index f94a5818eda..9d0be685d95 100644
--- a/docs/examples/1.6.x/server-graphql/examples/users/get.md
+++ b/docs/examples/1.6.x/server-graphql/examples/users/get.md
@@ -30,6 +30,7 @@ query {
             providerId
             providerType
             identifier
+            expired
         }
         accessedAt
     }
diff --git a/docs/examples/1.6.x/server-graphql/examples/users/list-targets.md b/docs/examples/1.6.x/server-graphql/examples/users/list-targets.md
index 05e796f1673..408fd96f804 100644
--- a/docs/examples/1.6.x/server-graphql/examples/users/list-targets.md
+++ b/docs/examples/1.6.x/server-graphql/examples/users/list-targets.md
@@ -13,6 +13,7 @@ query {
             providerId
             providerType
             identifier
+            expired
         }
     }
 }
diff --git a/docs/examples/1.6.x/server-graphql/examples/users/list.md b/docs/examples/1.6.x/server-graphql/examples/users/list.md
index e2326dd1a2f..a90121adf2f 100644
--- a/docs/examples/1.6.x/server-graphql/examples/users/list.md
+++ b/docs/examples/1.6.x/server-graphql/examples/users/list.md
@@ -33,6 +33,7 @@ query {
                 providerId
                 providerType
                 identifier
+                expired
             }
             accessedAt
         }
diff --git a/docs/examples/1.6.x/server-graphql/examples/users/update-email-verification.md b/docs/examples/1.6.x/server-graphql/examples/users/update-email-verification.md
index 6bb27818545..cda7278ac0b 100644
--- a/docs/examples/1.6.x/server-graphql/examples/users/update-email-verification.md
+++ b/docs/examples/1.6.x/server-graphql/examples/users/update-email-verification.md
@@ -31,6 +31,7 @@ mutation {
             providerId
             providerType
             identifier
+            expired
         }
         accessedAt
     }
diff --git a/docs/examples/1.6.x/server-graphql/examples/users/update-email.md b/docs/examples/1.6.x/server-graphql/examples/users/update-email.md
index 046937ac048..408a74972b4 100644
--- a/docs/examples/1.6.x/server-graphql/examples/users/update-email.md
+++ b/docs/examples/1.6.x/server-graphql/examples/users/update-email.md
@@ -31,6 +31,7 @@ mutation {
             providerId
             providerType
             identifier
+            expired
         }
         accessedAt
     }
diff --git a/docs/examples/1.6.x/server-graphql/examples/users/update-labels.md b/docs/examples/1.6.x/server-graphql/examples/users/update-labels.md
index 93da33d805a..cb3c5b64830 100644
--- a/docs/examples/1.6.x/server-graphql/examples/users/update-labels.md
+++ b/docs/examples/1.6.x/server-graphql/examples/users/update-labels.md
@@ -31,6 +31,7 @@ mutation {
             providerId
             providerType
             identifier
+            expired
         }
         accessedAt
     }
diff --git a/docs/examples/1.6.x/server-graphql/examples/users/update-mfa.md b/docs/examples/1.6.x/server-graphql/examples/users/update-mfa.md
index 9219aa1aea7..ac09ea19a4f 100644
--- a/docs/examples/1.6.x/server-graphql/examples/users/update-mfa.md
+++ b/docs/examples/1.6.x/server-graphql/examples/users/update-mfa.md
@@ -31,6 +31,7 @@ mutation {
             providerId
             providerType
             identifier
+            expired
         }
         accessedAt
     }
diff --git a/docs/examples/1.6.x/server-graphql/examples/users/update-name.md b/docs/examples/1.6.x/server-graphql/examples/users/update-name.md
index 01a53ce479c..ec7e3dc27cc 100644
--- a/docs/examples/1.6.x/server-graphql/examples/users/update-name.md
+++ b/docs/examples/1.6.x/server-graphql/examples/users/update-name.md
@@ -31,6 +31,7 @@ mutation {
             providerId
             providerType
             identifier
+            expired
         }
         accessedAt
     }
diff --git a/docs/examples/1.6.x/server-graphql/examples/users/update-password.md b/docs/examples/1.6.x/server-graphql/examples/users/update-password.md
index c95637c4ceb..95ef74c83dd 100644
--- a/docs/examples/1.6.x/server-graphql/examples/users/update-password.md
+++ b/docs/examples/1.6.x/server-graphql/examples/users/update-password.md
@@ -31,6 +31,7 @@ mutation {
             providerId
             providerType
             identifier
+            expired
         }
         accessedAt
     }
diff --git a/docs/examples/1.6.x/server-graphql/examples/users/update-phone-verification.md b/docs/examples/1.6.x/server-graphql/examples/users/update-phone-verification.md
index 58343ae365f..c6afa54ba4a 100644
--- a/docs/examples/1.6.x/server-graphql/examples/users/update-phone-verification.md
+++ b/docs/examples/1.6.x/server-graphql/examples/users/update-phone-verification.md
@@ -31,6 +31,7 @@ mutation {
             providerId
             providerType
             identifier
+            expired
         }
         accessedAt
     }
diff --git a/docs/examples/1.6.x/server-graphql/examples/users/update-phone.md b/docs/examples/1.6.x/server-graphql/examples/users/update-phone.md
index dbcb076c659..d3fc7d5f378 100644
--- a/docs/examples/1.6.x/server-graphql/examples/users/update-phone.md
+++ b/docs/examples/1.6.x/server-graphql/examples/users/update-phone.md
@@ -31,6 +31,7 @@ mutation {
             providerId
             providerType
             identifier
+            expired
         }
         accessedAt
     }
diff --git a/docs/examples/1.6.x/server-graphql/examples/users/update-status.md b/docs/examples/1.6.x/server-graphql/examples/users/update-status.md
index ad05bc75fff..2499c1c2588 100644
--- a/docs/examples/1.6.x/server-graphql/examples/users/update-status.md
+++ b/docs/examples/1.6.x/server-graphql/examples/users/update-status.md
@@ -31,6 +31,7 @@ mutation {
             providerId
             providerType
             identifier
+            expired
         }
         accessedAt
     }
diff --git a/docs/examples/1.6.x/server-graphql/examples/users/update-target.md b/docs/examples/1.6.x/server-graphql/examples/users/update-target.md
index fe3444ede7d..1f7cc1147a5 100644
--- a/docs/examples/1.6.x/server-graphql/examples/users/update-target.md
+++ b/docs/examples/1.6.x/server-graphql/examples/users/update-target.md
@@ -14,5 +14,6 @@ mutation {
         providerId
         providerType
         identifier
+        expired
     }
 }
diff --git a/docs/examples/1.6.x/server-kotlin/java/databases/update-string-attribute.md b/docs/examples/1.6.x/server-kotlin/java/databases/update-string-attribute.md
index 75be9e01f82..2d690061814 100644
--- a/docs/examples/1.6.x/server-kotlin/java/databases/update-string-attribute.md
+++ b/docs/examples/1.6.x/server-kotlin/java/databases/update-string-attribute.md
@@ -15,7 +15,7 @@ databases.updateStringAttribute(
     "", // key
     false, // required
     "<DEFAULT>", // default
-    0, // size (optional)
+    1, // size (optional)
     "", // newKey (optional)
     new CoroutineCallback<>((result, error) -> {
         if (error != null) {
diff --git a/docs/examples/1.6.x/server-kotlin/java/messaging/create-push.md b/docs/examples/1.6.x/server-kotlin/java/messaging/create-push.md
index 934f1faaa80..56c7a607951 100644
--- a/docs/examples/1.6.x/server-kotlin/java/messaging/create-push.md
+++ b/docs/examples/1.6.x/server-kotlin/java/messaging/create-push.md
@@ -11,8 +11,8 @@ Messaging messaging = new Messaging(client);
 
 messaging.createPush(
     "<MESSAGE_ID>", // messageId
-    "<TITLE>", // title
-    "<BODY>", // body
+    "<TITLE>", // title (optional)
+    "<BODY>", // body (optional)
     listOf(), // topics (optional)
     listOf(), // users (optional)
     listOf(), // targets (optional)
@@ -23,9 +23,12 @@ messaging.createPush(
     "<SOUND>", // sound (optional)
     "<COLOR>", // color (optional)
     "<TAG>", // tag (optional)
-    "<BADGE>", // badge (optional)
+    0, // badge (optional)
     false, // draft (optional)
     "", // scheduledAt (optional)
+    false, // contentAvailable (optional)
+    false, // critical (optional)
+    MessagePriority.NORMAL, // priority (optional)
     new CoroutineCallback<>((result, error) -> {
         if (error != null) {
             error.printStackTrace();
diff --git a/docs/examples/1.6.x/server-kotlin/java/messaging/update-push.md b/docs/examples/1.6.x/server-kotlin/java/messaging/update-push.md
index ef04203c37b..bb8c3c8c2ee 100644
--- a/docs/examples/1.6.x/server-kotlin/java/messaging/update-push.md
+++ b/docs/examples/1.6.x/server-kotlin/java/messaging/update-push.md
@@ -26,6 +26,9 @@ messaging.updatePush(
     0, // badge (optional)
     false, // draft (optional)
     "", // scheduledAt (optional)
+    false, // contentAvailable (optional)
+    false, // critical (optional)
+    MessagePriority.NORMAL, // priority (optional)
     new CoroutineCallback<>((result, error) -> {
         if (error != null) {
             error.printStackTrace();
diff --git a/docs/examples/1.6.x/server-kotlin/kotlin/databases/update-string-attribute.md b/docs/examples/1.6.x/server-kotlin/kotlin/databases/update-string-attribute.md
index a37d4566ee0..32e17beb9c1 100644
--- a/docs/examples/1.6.x/server-kotlin/kotlin/databases/update-string-attribute.md
+++ b/docs/examples/1.6.x/server-kotlin/kotlin/databases/update-string-attribute.md
@@ -15,6 +15,6 @@ val response = databases.updateStringAttribute(
     key = "",
     required = false,
     default = "<DEFAULT>",
-    size = 0, // optional
+    size = 1, // optional
     newKey = "" // optional
 )
diff --git a/docs/examples/1.6.x/server-kotlin/kotlin/messaging/create-push.md b/docs/examples/1.6.x/server-kotlin/kotlin/messaging/create-push.md
index 6a95f63992d..f92a49d627a 100644
--- a/docs/examples/1.6.x/server-kotlin/kotlin/messaging/create-push.md
+++ b/docs/examples/1.6.x/server-kotlin/kotlin/messaging/create-push.md
@@ -11,8 +11,8 @@ val messaging = Messaging(client)
 
 val response = messaging.createPush(
     messageId = "<MESSAGE_ID>",
-    title = "<TITLE>",
-    body = "<BODY>",
+    title = "<TITLE>", // optional
+    body = "<BODY>", // optional
     topics = listOf(), // optional
     users = listOf(), // optional
     targets = listOf(), // optional
@@ -23,7 +23,10 @@ val response = messaging.createPush(
     sound = "<SOUND>", // optional
     color = "<COLOR>", // optional
     tag = "<TAG>", // optional
-    badge = "<BADGE>", // optional
+    badge = 0, // optional
     draft = false, // optional
-    scheduledAt = "" // optional
+    scheduledAt = "", // optional
+    contentAvailable = false, // optional
+    critical = false, // optional
+    priority = "normal" // optional
 )
diff --git a/docs/examples/1.6.x/server-kotlin/kotlin/messaging/update-push.md b/docs/examples/1.6.x/server-kotlin/kotlin/messaging/update-push.md
index d91694e1bcd..0ba72c461ce 100644
--- a/docs/examples/1.6.x/server-kotlin/kotlin/messaging/update-push.md
+++ b/docs/examples/1.6.x/server-kotlin/kotlin/messaging/update-push.md
@@ -25,5 +25,8 @@ val response = messaging.updatePush(
     tag = "<TAG>", // optional
     badge = 0, // optional
     draft = false, // optional
-    scheduledAt = "" // optional
+    scheduledAt = "", // optional
+    contentAvailable = false, // optional
+    critical = false, // optional
+    priority = "normal" // optional
 )
diff --git a/docs/examples/1.6.x/server-nodejs/examples/databases/update-string-attribute.md b/docs/examples/1.6.x/server-nodejs/examples/databases/update-string-attribute.md
index f379fdc0cf9..6aecbb591e3 100644
--- a/docs/examples/1.6.x/server-nodejs/examples/databases/update-string-attribute.md
+++ b/docs/examples/1.6.x/server-nodejs/examples/databases/update-string-attribute.md
@@ -13,6 +13,6 @@ const result = await databases.updateStringAttribute(
     '', // key
     false, // required
     '<DEFAULT>', // default
-    null, // size (optional)
+    1, // size (optional)
     '' // newKey (optional)
 );
diff --git a/docs/examples/1.6.x/server-nodejs/examples/messaging/create-push.md b/docs/examples/1.6.x/server-nodejs/examples/messaging/create-push.md
index 54103e11f79..bb985387484 100644
--- a/docs/examples/1.6.x/server-nodejs/examples/messaging/create-push.md
+++ b/docs/examples/1.6.x/server-nodejs/examples/messaging/create-push.md
@@ -9,8 +9,8 @@ const messaging = new sdk.Messaging(client);
 
 const result = await messaging.createPush(
     '<MESSAGE_ID>', // messageId
-    '<TITLE>', // title
-    '<BODY>', // body
+    '<TITLE>', // title (optional)
+    '<BODY>', // body (optional)
     [], // topics (optional)
     [], // users (optional)
     [], // targets (optional)
@@ -21,7 +21,10 @@ const result = await messaging.createPush(
     '<SOUND>', // sound (optional)
     '<COLOR>', // color (optional)
     '<TAG>', // tag (optional)
-    '<BADGE>', // badge (optional)
+    null, // badge (optional)
     false, // draft (optional)
-    '' // scheduledAt (optional)
+    '', // scheduledAt (optional)
+    false, // contentAvailable (optional)
+    false, // critical (optional)
+    sdk.MessagePriority.Normal // priority (optional)
 );
diff --git a/docs/examples/1.6.x/server-nodejs/examples/messaging/update-push.md b/docs/examples/1.6.x/server-nodejs/examples/messaging/update-push.md
index ec87ecf7cfc..700c3a99de5 100644
--- a/docs/examples/1.6.x/server-nodejs/examples/messaging/update-push.md
+++ b/docs/examples/1.6.x/server-nodejs/examples/messaging/update-push.md
@@ -23,5 +23,8 @@ const result = await messaging.updatePush(
     '<TAG>', // tag (optional)
     null, // badge (optional)
     false, // draft (optional)
-    '' // scheduledAt (optional)
+    '', // scheduledAt (optional)
+    false, // contentAvailable (optional)
+    false, // critical (optional)
+    sdk.MessagePriority.Normal // priority (optional)
 );
diff --git a/docs/examples/1.6.x/server-php/examples/databases/update-string-attribute.md b/docs/examples/1.6.x/server-php/examples/databases/update-string-attribute.md
index 9e821e4436c..721ba324de2 100644
--- a/docs/examples/1.6.x/server-php/examples/databases/update-string-attribute.md
+++ b/docs/examples/1.6.x/server-php/examples/databases/update-string-attribute.md
@@ -16,6 +16,6 @@ $result = $databases->updateStringAttribute(
     key: '',
     required: false,
     default: '<DEFAULT>',
-    size: null, // optional
+    size: 1, // optional
     newKey: '' // optional
 );
\ No newline at end of file
diff --git a/docs/examples/1.6.x/server-php/examples/messaging/create-push.md b/docs/examples/1.6.x/server-php/examples/messaging/create-push.md
index 7838576df01..9aaf6ad4adf 100644
--- a/docs/examples/1.6.x/server-php/examples/messaging/create-push.md
+++ b/docs/examples/1.6.x/server-php/examples/messaging/create-push.md
@@ -12,8 +12,8 @@ $messaging = new Messaging($client);
 
 $result = $messaging->createPush(
     messageId: '<MESSAGE_ID>',
-    title: '<TITLE>',
-    body: '<BODY>',
+    title: '<TITLE>', // optional
+    body: '<BODY>', // optional
     topics: [], // optional
     users: [], // optional
     targets: [], // optional
@@ -24,7 +24,10 @@ $result = $messaging->createPush(
     sound: '<SOUND>', // optional
     color: '<COLOR>', // optional
     tag: '<TAG>', // optional
-    badge: '<BADGE>', // optional
+    badge: null, // optional
     draft: false, // optional
-    scheduledAt: '' // optional
+    scheduledAt: '', // optional
+    contentAvailable: false, // optional
+    critical: false, // optional
+    priority: MessagePriority::NORMAL() // optional
 );
\ No newline at end of file
diff --git a/docs/examples/1.6.x/server-php/examples/messaging/update-push.md b/docs/examples/1.6.x/server-php/examples/messaging/update-push.md
index 09a4d960421..7546fc8668a 100644
--- a/docs/examples/1.6.x/server-php/examples/messaging/update-push.md
+++ b/docs/examples/1.6.x/server-php/examples/messaging/update-push.md
@@ -26,5 +26,8 @@ $result = $messaging->updatePush(
     tag: '<TAG>', // optional
     badge: null, // optional
     draft: false, // optional
-    scheduledAt: '' // optional
+    scheduledAt: '', // optional
+    contentAvailable: false, // optional
+    critical: false, // optional
+    priority: MessagePriority::NORMAL() // optional
 );
\ No newline at end of file
diff --git a/docs/examples/1.6.x/server-python/examples/databases/update-string-attribute.md b/docs/examples/1.6.x/server-python/examples/databases/update-string-attribute.md
index bbe7ddb19fb..ab910d9800d 100644
--- a/docs/examples/1.6.x/server-python/examples/databases/update-string-attribute.md
+++ b/docs/examples/1.6.x/server-python/examples/databases/update-string-attribute.md
@@ -13,6 +13,6 @@ result = databases.update_string_attribute(
     key = '',
     required = False,
     default = '<DEFAULT>',
-    size = None, # optional
+    size = 1, # optional
     new_key = '' # optional
 )
diff --git a/docs/examples/1.6.x/server-python/examples/messaging/create-push.md b/docs/examples/1.6.x/server-python/examples/messaging/create-push.md
index ffed825a3d0..616b945d333 100644
--- a/docs/examples/1.6.x/server-python/examples/messaging/create-push.md
+++ b/docs/examples/1.6.x/server-python/examples/messaging/create-push.md
@@ -9,8 +9,8 @@ messaging = Messaging(client)
 
 result = messaging.create_push(
     message_id = '<MESSAGE_ID>',
-    title = '<TITLE>',
-    body = '<BODY>',
+    title = '<TITLE>', # optional
+    body = '<BODY>', # optional
     topics = [], # optional
     users = [], # optional
     targets = [], # optional
@@ -21,7 +21,10 @@ result = messaging.create_push(
     sound = '<SOUND>', # optional
     color = '<COLOR>', # optional
     tag = '<TAG>', # optional
-    badge = '<BADGE>', # optional
+    badge = None, # optional
     draft = False, # optional
-    scheduled_at = '' # optional
+    scheduled_at = '', # optional
+    content_available = False, # optional
+    critical = False, # optional
+    priority = MessagePriority.NORMAL # optional
 )
diff --git a/docs/examples/1.6.x/server-python/examples/messaging/update-push.md b/docs/examples/1.6.x/server-python/examples/messaging/update-push.md
index 3c3965c3bd6..f5bdf155e68 100644
--- a/docs/examples/1.6.x/server-python/examples/messaging/update-push.md
+++ b/docs/examples/1.6.x/server-python/examples/messaging/update-push.md
@@ -23,5 +23,8 @@ result = messaging.update_push(
     tag = '<TAG>', # optional
     badge = None, # optional
     draft = False, # optional
-    scheduled_at = '' # optional
+    scheduled_at = '', # optional
+    content_available = False, # optional
+    critical = False, # optional
+    priority = MessagePriority.NORMAL # optional
 )
diff --git a/docs/examples/1.6.x/server-rest/examples/databases/update-string-attribute.md b/docs/examples/1.6.x/server-rest/examples/databases/update-string-attribute.md
index 197ea2767d3..71a5302e1a7 100644
--- a/docs/examples/1.6.x/server-rest/examples/databases/update-string-attribute.md
+++ b/docs/examples/1.6.x/server-rest/examples/databases/update-string-attribute.md
@@ -8,6 +8,6 @@ X-Appwrite-Key: <YOUR_API_KEY>
 {
   "required": false,
   "default": "<DEFAULT>",
-  "size": 0,
+  "size": 1,
   "newKey": 
 }
diff --git a/docs/examples/1.6.x/server-rest/examples/messaging/create-push.md b/docs/examples/1.6.x/server-rest/examples/messaging/create-push.md
index 1c7550950b1..cf5256d9215 100644
--- a/docs/examples/1.6.x/server-rest/examples/messaging/create-push.md
+++ b/docs/examples/1.6.x/server-rest/examples/messaging/create-push.md
@@ -19,7 +19,10 @@ X-Appwrite-Key: <YOUR_API_KEY>
   "sound": "<SOUND>",
   "color": "<COLOR>",
   "tag": "<TAG>",
-  "badge": "<BADGE>",
+  "badge": 0,
   "draft": false,
-  "scheduledAt": 
+  "scheduledAt": ,
+  "contentAvailable": false,
+  "critical": false,
+  "priority": "normal"
 }
diff --git a/docs/examples/1.6.x/server-rest/examples/messaging/update-push.md b/docs/examples/1.6.x/server-rest/examples/messaging/update-push.md
index 7a0338c74b4..2159bc8aa29 100644
--- a/docs/examples/1.6.x/server-rest/examples/messaging/update-push.md
+++ b/docs/examples/1.6.x/server-rest/examples/messaging/update-push.md
@@ -20,5 +20,8 @@ X-Appwrite-Key: <YOUR_API_KEY>
   "tag": "<TAG>",
   "badge": 0,
   "draft": false,
-  "scheduledAt": 
+  "scheduledAt": ,
+  "contentAvailable": false,
+  "critical": false,
+  "priority": "normal"
 }
diff --git a/docs/examples/1.6.x/server-ruby/examples/databases/update-string-attribute.md b/docs/examples/1.6.x/server-ruby/examples/databases/update-string-attribute.md
index 3b3c5eb6441..5e4ac573dcc 100644
--- a/docs/examples/1.6.x/server-ruby/examples/databases/update-string-attribute.md
+++ b/docs/examples/1.6.x/server-ruby/examples/databases/update-string-attribute.md
@@ -15,6 +15,6 @@ result = databases.update_string_attribute(
     key: '',
     required: false,
     default: '<DEFAULT>',
-    size: null, # optional
+    size: 1, # optional
     new_key: '' # optional
 )
diff --git a/docs/examples/1.6.x/server-ruby/examples/messaging/create-push.md b/docs/examples/1.6.x/server-ruby/examples/messaging/create-push.md
index 1c6700db436..61663f4dc0f 100644
--- a/docs/examples/1.6.x/server-ruby/examples/messaging/create-push.md
+++ b/docs/examples/1.6.x/server-ruby/examples/messaging/create-push.md
@@ -11,8 +11,8 @@ messaging = Messaging.new(client)
 
 result = messaging.create_push(
     message_id: '<MESSAGE_ID>',
-    title: '<TITLE>',
-    body: '<BODY>',
+    title: '<TITLE>', # optional
+    body: '<BODY>', # optional
     topics: [], # optional
     users: [], # optional
     targets: [], # optional
@@ -23,7 +23,10 @@ result = messaging.create_push(
     sound: '<SOUND>', # optional
     color: '<COLOR>', # optional
     tag: '<TAG>', # optional
-    badge: '<BADGE>', # optional
+    badge: null, # optional
     draft: false, # optional
-    scheduled_at: '' # optional
+    scheduled_at: '', # optional
+    content_available: false, # optional
+    critical: false, # optional
+    priority: MessagePriority::NORMAL # optional
 )
diff --git a/docs/examples/1.6.x/server-ruby/examples/messaging/update-push.md b/docs/examples/1.6.x/server-ruby/examples/messaging/update-push.md
index 54f6368eeec..6bf9fcaa79f 100644
--- a/docs/examples/1.6.x/server-ruby/examples/messaging/update-push.md
+++ b/docs/examples/1.6.x/server-ruby/examples/messaging/update-push.md
@@ -25,5 +25,8 @@ result = messaging.update_push(
     tag: '<TAG>', # optional
     badge: null, # optional
     draft: false, # optional
-    scheduled_at: '' # optional
+    scheduled_at: '', # optional
+    content_available: false, # optional
+    critical: false, # optional
+    priority: MessagePriority::NORMAL # optional
 )
diff --git a/docs/examples/1.6.x/server-swift/examples/databases/update-string-attribute.md b/docs/examples/1.6.x/server-swift/examples/databases/update-string-attribute.md
index 5fafd5e72e0..d3129dcce2a 100644
--- a/docs/examples/1.6.x/server-swift/examples/databases/update-string-attribute.md
+++ b/docs/examples/1.6.x/server-swift/examples/databases/update-string-attribute.md
@@ -13,7 +13,7 @@ let attributeString = try await databases.updateStringAttribute(
     key: "",
     required: false,
     default: "<DEFAULT>",
-    size: 0, // optional
+    size: 1, // optional
     newKey: "" // optional
 )
 
diff --git a/docs/examples/1.6.x/server-swift/examples/messaging/create-push.md b/docs/examples/1.6.x/server-swift/examples/messaging/create-push.md
index dbc7bf0ca6a..42f48ddd2e9 100644
--- a/docs/examples/1.6.x/server-swift/examples/messaging/create-push.md
+++ b/docs/examples/1.6.x/server-swift/examples/messaging/create-push.md
@@ -1,4 +1,5 @@
 import Appwrite
+import AppwriteEnums
 
 let client = Client()
     .setEndpoint("https://cloud.appwrite.io/v1") // Your API Endpoint
@@ -9,8 +10,8 @@ let messaging = Messaging(client)
 
 let message = try await messaging.createPush(
     messageId: "<MESSAGE_ID>",
-    title: "<TITLE>",
-    body: "<BODY>",
+    title: "<TITLE>", // optional
+    body: "<BODY>", // optional
     topics: [], // optional
     users: [], // optional
     targets: [], // optional
@@ -21,8 +22,11 @@ let message = try await messaging.createPush(
     sound: "<SOUND>", // optional
     color: "<COLOR>", // optional
     tag: "<TAG>", // optional
-    badge: "<BADGE>", // optional
+    badge: 0, // optional
     draft: false, // optional
-    scheduledAt: "" // optional
+    scheduledAt: "", // optional
+    contentAvailable: false, // optional
+    critical: false, // optional
+    priority: .normal // optional
 )
 
diff --git a/docs/examples/1.6.x/server-swift/examples/messaging/update-push.md b/docs/examples/1.6.x/server-swift/examples/messaging/update-push.md
index 40ce34bf666..02893a180ae 100644
--- a/docs/examples/1.6.x/server-swift/examples/messaging/update-push.md
+++ b/docs/examples/1.6.x/server-swift/examples/messaging/update-push.md
@@ -1,4 +1,5 @@
 import Appwrite
+import AppwriteEnums
 
 let client = Client()
     .setEndpoint("https://cloud.appwrite.io/v1") // Your API Endpoint
@@ -23,6 +24,9 @@ let message = try await messaging.updatePush(
     tag: "<TAG>", // optional
     badge: 0, // optional
     draft: false, // optional
-    scheduledAt: "" // optional
+    scheduledAt: "", // optional
+    contentAvailable: false, // optional
+    critical: false, // optional
+    priority: .normal // optional
 )
 

From 4ce919c8c6ffcf55af196637399c4e1b90cc239e Mon Sep 17 00:00:00 2001
From: Steven Nguyen <1477010+stnguyen90@users.noreply.github.com>
Date: Tue, 31 Dec 2024 23:11:00 +0000
Subject: [PATCH 22/24] chore: update composer.lock after merge

---
 composer.lock | 46 +++++++++++++++++++++++-----------------------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/composer.lock b/composer.lock
index 361dfe4c840..aad4e039fa4 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "6b136b5490c0d5d331eac0d70bb3e198",
+    "content-hash": "4ce4526b10d26830d8f9eaf55e40135c",
     "packages": [
         {
             "name": "adhocore/jwt",
@@ -2453,16 +2453,16 @@
         },
         {
             "name": "symfony/http-client",
-            "version": "v7.2.1",
+            "version": "v7.2.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/http-client.git",
-                "reference": "ff4df2b68d1c67abb9fef146e6540ea16b58d99e"
+                "reference": "339ba21476eb184290361542f732ad12c97591ec"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-client/zipball/ff4df2b68d1c67abb9fef146e6540ea16b58d99e",
-                "reference": "ff4df2b68d1c67abb9fef146e6540ea16b58d99e",
+                "url": "https://api.github.com/repos/symfony/http-client/zipball/339ba21476eb184290361542f732ad12c97591ec",
+                "reference": "339ba21476eb184290361542f732ad12c97591ec",
                 "shasum": ""
             },
             "require": {
@@ -2528,7 +2528,7 @@
                 "http"
             ],
             "support": {
-                "source": "https://github.com/symfony/http-client/tree/v7.2.1"
+                "source": "https://github.com/symfony/http-client/tree/v7.2.2"
             },
             "funding": [
                 {
@@ -2544,7 +2544,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-12-07T08:50:44+00:00"
+            "time": "2024-12-30T18:35:15+00:00"
         },
         {
             "name": "symfony/http-client-contracts",
@@ -5126,16 +5126,16 @@
         },
         {
             "name": "laravel/pint",
-            "version": "v1.18.3",
+            "version": "v1.19.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/pint.git",
-                "reference": "cef51821608239040ab841ad6e1c6ae502ae3026"
+                "reference": "8169513746e1bac70c85d6ea1524d9225d4886f0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/pint/zipball/cef51821608239040ab841ad6e1c6ae502ae3026",
-                "reference": "cef51821608239040ab841ad6e1c6ae502ae3026",
+                "url": "https://api.github.com/repos/laravel/pint/zipball/8169513746e1bac70c85d6ea1524d9225d4886f0",
+                "reference": "8169513746e1bac70c85d6ea1524d9225d4886f0",
                 "shasum": ""
             },
             "require": {
@@ -5146,10 +5146,10 @@
                 "php": "^8.1.0"
             },
             "require-dev": {
-                "friendsofphp/php-cs-fixer": "^3.65.0",
-                "illuminate/view": "^10.48.24",
-                "larastan/larastan": "^2.9.11",
-                "laravel-zero/framework": "^10.4.0",
+                "friendsofphp/php-cs-fixer": "^3.66.0",
+                "illuminate/view": "^10.48.25",
+                "larastan/larastan": "^2.9.12",
+                "laravel-zero/framework": "^10.48.25",
                 "mockery/mockery": "^1.6.12",
                 "nunomaduro/termwind": "^1.17.0",
                 "pestphp/pest": "^2.36.0"
@@ -5188,7 +5188,7 @@
                 "issues": "https://github.com/laravel/pint/issues",
                 "source": "https://github.com/laravel/pint"
             },
-            "time": "2024-11-26T15:34:00+00:00"
+            "time": "2024-12-30T16:20:10+00:00"
         },
         {
             "name": "matthiasmullie/minify",
@@ -7735,16 +7735,16 @@
         },
         {
             "name": "symfony/finder",
-            "version": "v7.2.0",
+            "version": "v7.2.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/finder.git",
-                "reference": "6de263e5868b9a137602dd1e33e4d48bfae99c49"
+                "reference": "87a71856f2f56e4100373e92529eed3171695cfb"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/finder/zipball/6de263e5868b9a137602dd1e33e4d48bfae99c49",
-                "reference": "6de263e5868b9a137602dd1e33e4d48bfae99c49",
+                "url": "https://api.github.com/repos/symfony/finder/zipball/87a71856f2f56e4100373e92529eed3171695cfb",
+                "reference": "87a71856f2f56e4100373e92529eed3171695cfb",
                 "shasum": ""
             },
             "require": {
@@ -7779,7 +7779,7 @@
             "description": "Finds files and directories via an intuitive fluent interface",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/finder/tree/v7.2.0"
+                "source": "https://github.com/symfony/finder/tree/v7.2.2"
             },
             "funding": [
                 {
@@ -7795,7 +7795,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-10-23T06:56:12+00:00"
+            "time": "2024-12-30T19:00:17+00:00"
         },
         {
             "name": "symfony/options-resolver",
@@ -8556,7 +8556,7 @@
     ],
     "aliases": [],
     "minimum-stability": "stable",
-    "stability-flags": {},
+    "stability-flags": [],
     "prefer-stable": false,
     "prefer-lowest": false,
     "platform": {

From a7f40708a396a6e76b2331b82790f3928b837b46 Mon Sep 17 00:00:00 2001
From: Jake Barnby <jakeb994@gmail.com>
Date: Wed, 15 Jan 2025 15:20:15 +1300
Subject: [PATCH 23/24] Update lock

---
 composer.lock | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/composer.lock b/composer.lock
index a4bffa34164..4db1b5b4e76 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "4ce4526b10d26830d8f9eaf55e40135c",
+    "content-hash": "f80fb401ae4c587e1f79daa5f6215329",
     "packages": [
         {
             "name": "adhocore/jwt",
@@ -4095,16 +4095,16 @@
         },
         {
             "name": "utopia-php/platform",
-            "version": "0.7.1",
+            "version": "0.7.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/utopia-php/platform.git",
-                "reference": "3433a0f1a54988f2a59c735f507745cb2c24638a"
+                "reference": "a67772f8be70f75fa60bab49c38c95048f4dc8cf"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/utopia-php/platform/zipball/3433a0f1a54988f2a59c735f507745cb2c24638a",
-                "reference": "3433a0f1a54988f2a59c735f507745cb2c24638a",
+                "url": "https://api.github.com/repos/utopia-php/platform/zipball/a67772f8be70f75fa60bab49c38c95048f4dc8cf",
+                "reference": "a67772f8be70f75fa60bab49c38c95048f4dc8cf",
                 "shasum": ""
             },
             "require": {
@@ -4139,9 +4139,9 @@
             ],
             "support": {
                 "issues": "https://github.com/utopia-php/platform/issues",
-                "source": "https://github.com/utopia-php/platform/tree/0.7.1"
+                "source": "https://github.com/utopia-php/platform/tree/0.7.2"
             },
-            "time": "2024-10-22T10:27:49+00:00"
+            "time": "2025-01-14T08:23:27+00:00"
         },
         {
             "name": "utopia-php/pools",
@@ -5126,16 +5126,16 @@
         },
         {
             "name": "laravel/pint",
-            "version": "v1.19.0",
+            "version": "v1.20.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/pint.git",
-                "reference": "8169513746e1bac70c85d6ea1524d9225d4886f0"
+                "reference": "53072e8ea22213a7ed168a8a15b96fbb8b82d44b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/pint/zipball/8169513746e1bac70c85d6ea1524d9225d4886f0",
-                "reference": "8169513746e1bac70c85d6ea1524d9225d4886f0",
+                "url": "https://api.github.com/repos/laravel/pint/zipball/53072e8ea22213a7ed168a8a15b96fbb8b82d44b",
+                "reference": "53072e8ea22213a7ed168a8a15b96fbb8b82d44b",
                 "shasum": ""
             },
             "require": {
@@ -5188,7 +5188,7 @@
                 "issues": "https://github.com/laravel/pint/issues",
                 "source": "https://github.com/laravel/pint"
             },
-            "time": "2024-12-30T16:20:10+00:00"
+            "time": "2025-01-14T16:20:53+00:00"
         },
         {
             "name": "matthiasmullie/minify",
@@ -8556,7 +8556,7 @@
     ],
     "aliases": [],
     "minimum-stability": "stable",
-    "stability-flags": [],
+    "stability-flags": {},
     "prefer-stable": false,
     "prefer-lowest": false,
     "platform": {

From c0a0f1016ec1c22ba8a76b9c45f8ab57d2197d7d Mon Sep 17 00:00:00 2001
From: Jake Barnby <jakeb994@gmail.com>
Date: Wed, 15 Jan 2025 18:36:30 +1300
Subject: [PATCH 24/24] Revert platform update

---
 composer.json |  2 +-
 composer.lock | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/composer.json b/composer.json
index 5f354dff394..4e1b5a98a2d 100644
--- a/composer.json
+++ b/composer.json
@@ -62,7 +62,7 @@
         "utopia-php/messaging": "0.13.*",
         "utopia-php/migration": "0.6.*",
         "utopia-php/orchestration": "0.9.*",
-        "utopia-php/platform": "0.7.*",
+        "utopia-php/platform": "0.7.1",
         "utopia-php/pools": "0.5.*",
         "utopia-php/preloader": "0.2.*",
         "utopia-php/queue": "0.7.*",
diff --git a/composer.lock b/composer.lock
index 4db1b5b4e76..68dbc191bf4 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "f80fb401ae4c587e1f79daa5f6215329",
+    "content-hash": "3853435a659889e86c16764046950bed",
     "packages": [
         {
             "name": "adhocore/jwt",
@@ -4095,16 +4095,16 @@
         },
         {
             "name": "utopia-php/platform",
-            "version": "0.7.2",
+            "version": "0.7.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/utopia-php/platform.git",
-                "reference": "a67772f8be70f75fa60bab49c38c95048f4dc8cf"
+                "reference": "3433a0f1a54988f2a59c735f507745cb2c24638a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/utopia-php/platform/zipball/a67772f8be70f75fa60bab49c38c95048f4dc8cf",
-                "reference": "a67772f8be70f75fa60bab49c38c95048f4dc8cf",
+                "url": "https://api.github.com/repos/utopia-php/platform/zipball/3433a0f1a54988f2a59c735f507745cb2c24638a",
+                "reference": "3433a0f1a54988f2a59c735f507745cb2c24638a",
                 "shasum": ""
             },
             "require": {
@@ -4139,9 +4139,9 @@
             ],
             "support": {
                 "issues": "https://github.com/utopia-php/platform/issues",
-                "source": "https://github.com/utopia-php/platform/tree/0.7.2"
+                "source": "https://github.com/utopia-php/platform/tree/0.7.1"
             },
-            "time": "2025-01-14T08:23:27+00:00"
+            "time": "2024-10-22T10:27:49+00:00"
         },
         {
             "name": "utopia-php/pools",