1
0
Fork 0
mirror of synced 2024-10-03 19:53:33 +13:00

Merge branch 'feat-add-messaging-response-models' of https://github.com/appwrite/appwrite into feat-messages-event-config

This commit is contained in:
Prateek Banga 2023-09-12 21:24:11 +05:30
commit 878e56ae7e
3 changed files with 20 additions and 8 deletions

View file

@ -1862,7 +1862,7 @@ $commonCollections = [
'filters' => [],
],
[
'$id' => ID::custom('providerType'),
'$id' => ID::custom('provider'),
'type' => Database::VAR_STRING,
'format' => '',
'size' => Database::LENGTH_KEY,
@ -1870,13 +1870,13 @@ $commonCollections = [
'required' => false,
'default' => null,
'array' => false,
'filters' => ['subQueryProviderType'],
'filters' => ['subQueryProvider'],
],
[
'$id' => ID::custom('identifier'),
'type' => Database::VAR_STRING,
'format' => '',
'size' => 2048,
'size' => Database::LENGTH_KEY,
'signed' => true,
'required' => true,
'default' => null,

View file

@ -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 [

View file

@ -546,7 +546,7 @@ Database::addFilter(
);
Database::addFilter(
'subQueryProviderType',
'subQueryProvider',
function (mixed $value) {
return null;
},
@ -555,16 +555,14 @@ Database::addFilter(
->getDocument(
'providers',
$document->getAttribute('providerId'),
[Query::select(['type'])]
));
if ($provider) {
return $provider->getAttribute('type');
if (!$provider->isEmpty()) {
return $provider;
}
return null;
}
);
Database::addFilter(
'subQueryTopicTargets',
function (mixed $value) {