Merge branch 'feat-add-messaging-collections-in-config' of https://github.com/appwrite/appwrite into feat-add-messaging-collections-in-config

Sync master into 1.5.x

app/config/collections.php

@@ -1437,22 +1437,61 @@ $commonCollections = [
                 'default' => null,
                 'array' => false,
                 'filters' => ['json', 'encrypt'],
-            ]
+            ],
+            [
+                '$id' => ID::custom('search'),
+                'type' => Database::VAR_STRING,
+                'format' => '',
+                'size' => 65535,
+                'signed' => true,
+                'required' => false,
+                'default' => null,
+                'array' => false,
+                'filters' => [],
+            ],
         ],
         'indexes' => [
             [
                 '$id' => ID::custom('_key_provider'),
                 'type' => Database::INDEX_KEY,
                 'attributes' => ['provider'],
-                'lengths' => [128],
+                'lengths' => [],
                 'orders' => [Database::ORDER_ASC],
             ],
             [
                 '$id' => ID::custom('_key_name'),
                 'type' => Database::INDEX_FULLTEXT,
                 'attributes' => ['name'],
-                'lengths' => [128],
+                'lengths' => [],
                 'orders' => [Database::ORDER_ASC],
+            ],
+            [
+                '$id' => ID::custom('_key_type'),
+                'type' => Database::INDEX_KEY,
+                'attributes' => ['type'],
+                'lengths' => [],
+                'orders' => [Database::ORDER_ASC],
+            ],
+            [
+                '$id' => ID::custom('_key_default'),
+                'type' => Database::INDEX_KEY,
+                'attributes' => ['default'],
+                'lengths' => [],
+                'orders' => [Database::ORDER_ASC],
+            ],
+            [
+                '$id' => ID::custom('_key_default_type'),
+                'type' => Database::INDEX_KEY,
+                'attributes' => ['default, type'],
+                'lengths' => [],
+                'orders' => [Database::ORDER_ASC],
+            ],
+            [
+                '$id' => ID::custom('_key_search'),
+                'type' => Database::INDEX_FULLTEXT,
+                'attributes' => ['search'],
+                'lengths' => [],
+                'orders' => [],
             ]
         ],
     ],
@@ -1484,24 +1523,13 @@ $commonCollections = [
                 'array' => false,
                 'filters' => [],
             ],
-            [
-                '$id' => ID::custom('type'),
-                'type' => Database::VAR_STRING,
-                'format' => '',
-                'size' => 128,
-                'signed' => true,
-                'required' => true,
-                'default' => null,
-                'array' => false,
-                'filters' => [],
-            ],
             [
                 '$id' => ID::custom('data'),
                 'type' => Database::VAR_STRING,
                 'format' => '',
-                'size' => 16384,
+                'size' => 65535,
                 'signed' => true,
-                'required' => false,
+                'required' => true,
                 'default' => null,
                 'array' => false,
                 'filters' => ['json'],
@@ -1510,7 +1538,7 @@ $commonCollections = [
                 '$id' => ID::custom('to'),
                 'type' => Database::VAR_STRING,
                 'format' => '',
-                'size' => 16834,
+                'size' => 65535,
                 'signed' => true,
                 'required' => true,
                 'default' => null,
@@ -1529,14 +1557,14 @@ $commonCollections = [
                 'filters' => ['datetime'],
             ],
             [
-                '$id' => ID::custom('deliveryError'),
+                '$id' => ID::custom('deliveryErrors'),
                 'type' => Database::VAR_STRING,
                 'format' => '',
-                'size' => 2048,
+                'size' => 65535,
                 'signed' => true,
                 'required' => false,
                 'default' => null,
-                'array' => false,
+                'array' => true,
                 'filters' => [],
             ],
             [
@@ -1545,7 +1573,7 @@ $commonCollections = [
                 'format' => '',
                 'size' => 0,
                 'signed' => true,
-                'required' => true,
+                'required' => false,
                 'default' => null,
                 'array' => false,
                 'filters' => [],
@@ -1556,7 +1584,7 @@ $commonCollections = [
                 'format' => '',
                 'size' => 0,
                 'signed' => true,
-                'required' => true,
+                'required' => false,
                 'default' => false,
                 'array' => false,
                 'filters' => [],
@@ -1578,14 +1606,14 @@ $commonCollections = [
                 '$id' => ID::custom('_key_providerId'),
                 'type' => Database::INDEX_KEY,
                 'attributes' => ['providerId'],
-                'lengths' => [128],
+                'lengths' => [],
                 'orders' => [Database::ORDER_ASC],
             ],
             [
                 '$id' => ID::custom('_key_providerInternalId'),
                 'type' => Database::INDEX_KEY,
                 'attributes' => ['providerInternalId'],
-                'lengths' => [128],
+                'lengths' => [],
                 'orders' => [Database::ORDER_ASC],
             ],
             [
@@ -1657,21 +1685,32 @@ $commonCollections = [
                 'default' => null,
                 'array' => false,
                 'filters' => ['subQueryTopicTargets'],
-            ]
+            ],
+            [
+                '$id' => ID::custom('search'),
+                'type' => Database::VAR_STRING,
+                'format' => '',
+                'size' => 16384,
+                'signed' => true,
+                'required' => false,
+                'default' => null,
+                'array' => false,
+                'filters' => [],
+            ],
         ],
         'indexes' => [
             [
                 '$id' => ID::custom('_key_providerId'),
                 'type' => Database::INDEX_KEY,
                 'attributes' => ['providerId'],
-                'lengths' => [128],
+                'lengths' => [],
                 'orders' => [Database::ORDER_ASC],
             ],
             [
                 '$id' => ID::custom('_key_providerInternalId'),
                 'type' => Database::INDEX_KEY,
                 'attributes' => ['providerInternalId'],
-                'lengths' => [128],
+                'lengths' => [],
                 'orders' => [Database::ORDER_ASC],
             ],
             [
@@ -1682,12 +1721,12 @@ $commonCollections = [
                 'orders' => [],
             ],
             [
-                '$id' => ID::custom('_key_description'),
+                '$id' => ID::custom('_key_search'),
                 'type' => Database::INDEX_FULLTEXT,
-                'attributes' => ['description'],
+                'attributes' => ['name'],
                 'lengths' => [],
-                'orders' => [],
-            ],
+                'orders' => [Database::ORDER_ASC],
+            ]
         ],
     ],
 
@@ -1823,7 +1862,7 @@ $commonCollections = [
                 'filters' => [],
             ],
             [
-                '$id' => ID::custom('providerType'),
+                '$id' => ID::custom('provider'),
                 'type' => Database::VAR_STRING,
                 'format' => '',
                 'size' => Database::LENGTH_KEY,
@@ -1831,7 +1870,7 @@ $commonCollections = [
                 'required' => false,
                 'default' => null,
                 'array' => false,
-                'filters' => ['subQueryProviderType'],
+                'filters' => ['subQueryProvider'],
             ],
             [
                 '$id' => ID::custom('identifier'),
@@ -1850,14 +1889,14 @@ $commonCollections = [
                 '$id' => ID::custom('_key_userId'),
                 'type' => Database::INDEX_KEY,
                 'attributes' => ['userId'],
-                'lengths' => [128],
+                'lengths' => [],
                 'orders' => [Database::ORDER_ASC],
             ],
             [
                 '$id' => ID::custom('_key_userInternalId'),
                 'type' => Database::INDEX_KEY,
                 'attributes' => ['userInternalId'],
-                'lengths' => [128],
+                'lengths' => [],
                 'orders' => [Database::ORDER_ASC],
             ],
             [

app/config/roles.php

@@ -21,6 +21,10 @@ $member = [
     'avatars.read',
     'execution.read',
     'execution.write',
+    'targets.read',
+    'targets.write',
+    'subscribers.write',
+    'subscribers.read'
 ];
 
 $admins = [
@@ -60,6 +64,16 @@ $admins = [
     'vcs.read',
     'vcs.write',
     'assistant.read',
+    'targets.read',
+    'targets.write',
+    'providers.write',
+    'providers.read',
+    'messages.write',
+    'messages.read',
+    'topics.write',
+    'topics.read',
+    'subscribers.write',
+    'subscribers.read'
 ];
 
 return [

app/init.php

@@ -543,6 +543,45 @@ Database::addFilter(
             ]));
     }
 );
+
+Database::addFilter(
+    'subQueryProvider',
+    function (mixed $value) {
+        return null;
+    },
+    function (mixed $value, Document $document, Database $database) {
+        $provider = Authorization::skip(fn () => $database
+            ->getDocument(
+                'providers',
+                $document->getAttribute('providerId'),
+            ));
+        if (!$provider->isEmpty()) {
+            return $provider;
+        }
+        return null;
+    }
+);
+
+Database::addFilter(
+    'subQueryTopicTargets',
+    function (mixed $value) {
+        return null;
+    },
+    function (mixed $value, Document $document, Database $database) {
+        $targetIds = Authorization::skip(fn () => \array_map(
+            fn ($document) => $document->getAttribute('targetId'),
+            $database
+            ->find('subscribers', [
+                Query::equal('topicInternalId', [$document->getInternalId()]),
+                Query::limit(APP_LIMIT_SUBQUERY),
+            ])
+        ));
+        if (\count($targetIds) > 0) {
+            return $database->find('targets', [Query::equal('$id', $targetIds)]);
+        }
+        return [];
+    }
+);
 /**
  * DB Formats
  */