Add git commit author avatar to deployments

app/config/collections.php

@@ -3748,6 +3748,16 @@ $projectCollections = array_merge([
                 'required' => false,
                 'array' => false,
             ],
+            [
+                '$id' => ID::custom('providerCommitAuthorAvatar'),
+                'type' => Database::VAR_STRING,
+                'signed' => true,
+                'size' => Database::LENGTH_KEY,
+                'format' => '',
+                'filters' => [],
+                'required' => false,
+                'array' => false,
+            ],
             [
                 '$id' => ID::custom('providerCommitAuthor'),
                 'type' => Database::VAR_STRING,

app/controllers/api/functions.php

@@ -2013,6 +2013,7 @@ App::post('/v1/functions/:functionId/executions')
             'APPWRITE_VCS_COMMIT_MESSAGE' => $deployment->getAttribute('providerCommitMessage', ''),
             'APPWRITE_VCS_COMMIT_URL' => $deployment->getAttribute('providerCommitUrl', ''),
             'APPWRITE_VCS_COMMIT_AUTHOR_NAME' => $deployment->getAttribute('providerCommitAuthor', ''),
+            'APPWRITE_VCS_COMMIT_AUTHOR_AVATAR' => $deployment->getAttribute('providerCommitAuthorAvatar', ''),
             'APPWRITE_VCS_COMMIT_AUTHOR_URL' => $deployment->getAttribute('providerCommitAuthorUrl', ''),
             'APPWRITE_VCS_ROOT_DIRECTORY' => $deployment->getAttribute('providerRootDirectory', ''),
         ]);

app/controllers/api/vcs.php

@@ -42,7 +42,7 @@ use Utopia\VCS\Exception\RepositoryNotFound;
 
 use function Swoole\Coroutine\batch;
 
-$createGitDeployments = function (GitHub $github, string $providerInstallationId, array $repositories, string $providerBranch, string $providerBranchUrl, string $providerRepositoryName, string $providerRepositoryUrl, string $providerRepositoryOwner, string $providerCommitHash, string $providerCommitAuthor, string $providerCommitAuthorUrl, string $providerCommitMessage, string $providerCommitUrl, string $providerPullRequestId, bool $external, Database $dbForConsole, Build $queueForBuilds, callable $getProjectDB, Request $request) {
+$createGitDeployments = function (GitHub $github, string $providerInstallationId, array $repositories, string $providerBranch, string $providerBranchUrl, string $providerRepositoryName, string $providerRepositoryUrl, string $providerRepositoryOwner, string $providerCommitHash, string $providerCommitAuthor, string $providerCommitAuthorUrl, string $providerCommitMessage, string $providerCommitUrl, string $providerCommitAuthorAvatar, string $providerPullRequestId, bool $external, Database $dbForConsole, Build $queueForBuilds, callable $getProjectDB, Request $request) {
     $errors = [];
     foreach ($repositories as $repository) {
         try {
@@ -217,6 +217,7 @@ $createGitDeployments = function (GitHub $github, string $providerInstallationId
                 'providerRepositoryUrl' => $providerRepositoryUrl,
                 'providerCommitHash' => $providerCommitHash,
                 'providerCommitAuthorUrl' => $providerCommitAuthorUrl,
+                'providerCommitAuthorAvatar' => $providerCommitAuthorAvatar,
                 'providerCommitAuthor' => $providerCommitAuthor,
                 'providerCommitMessage' => $providerCommitMessage,
                 'providerCommitUrl' => $providerCommitUrl,
@@ -936,6 +937,7 @@ App::post('/v1/vcs/github/events')
                 $providerRepositoryOwner = $parsedPayload["owner"] ?? '';
                 $providerCommitAuthor = $parsedPayload["headCommitAuthor"] ?? '';
                 $providerCommitAuthorUrl = $parsedPayload["authorUrl"] ?? '';
+                $providerCommitAuthorAvatar = $parsedPayload["authorAvatarUrl"] ?? '';
                 $providerCommitMessage = $parsedPayload["headCommitMessage"] ?? '';
                 $providerCommitUrl = $parsedPayload["headCommitUrl"] ?? '';
 
@@ -949,7 +951,7 @@ App::post('/v1/vcs/github/events')
 
                 // create new deployment only on push and not when branch is created
                 if (!$providerBranchCreated) {
-                    $createGitDeployments($github, $providerInstallationId, $repositories, $providerBranch, $providerBranchUrl, $providerRepositoryName, $providerRepositoryUrl, $providerRepositoryOwner, $providerCommitHash, $providerCommitAuthor, $providerCommitAuthorUrl, $providerCommitMessage, $providerCommitUrl, '', false, $dbForConsole, $queueForBuilds, $getProjectDB, $request);
+                    $createGitDeployments($github, $providerInstallationId, $repositories, $providerBranch, $providerBranchUrl, $providerRepositoryName, $providerRepositoryUrl, $providerRepositoryOwner, $providerCommitHash, $providerCommitAuthor, $providerCommitAuthorUrl, $providerCommitMessage, $providerCommitUrl, $providerCommitAuthorAvatar, '', false, $dbForConsole, $queueForBuilds, $getProjectDB, $request);
                 }
             } elseif ($event == $github::EVENT_INSTALLATION) {
                 if ($parsedPayload["action"] == "deleted") {
@@ -988,6 +990,7 @@ App::post('/v1/vcs/github/events')
                     $external = $parsedPayload["external"] ?? true;
                     $providerCommitUrl = $parsedPayload["headCommitUrl"] ?? '';
                     $providerCommitAuthorUrl = $parsedPayload["authorUrl"] ?? '';
+                    $providerCommitAuthorAvatar = $parsedPayload["authorAvatarUrl"] ?? '';
 
                     // Ignore sync for non-external. We handle it in push webhook
                     if (!$external && $parsedPayload["action"] == "synchronize") {
@@ -1005,7 +1008,7 @@ App::post('/v1/vcs/github/events')
                         Query::orderDesc('$createdAt')
                     ]));
 
-                    $createGitDeployments($github, $providerInstallationId, $repositories, $providerBranch, $providerBranchUrl, $providerRepositoryName, $providerRepositoryUrl, $providerRepositoryOwner, $providerCommitHash, $providerCommitAuthor, $providerCommitAuthorUrl, $providerCommitMessage, $providerCommitUrl, $providerPullRequestId, $external, $dbForConsole, $queueForBuilds, $getProjectDB, $request);
+                    $createGitDeployments($github, $providerInstallationId, $repositories, $providerBranch, $providerBranchUrl, $providerRepositoryName, $providerRepositoryUrl, $providerRepositoryOwner, $providerCommitHash, $providerCommitAuthor, $providerCommitAuthorUrl, $providerCommitMessage, $providerCommitUrl, $providerCommitAuthorAvatar, $providerPullRequestId, $external, $dbForConsole, $queueForBuilds, $getProjectDB, $request);
                 } elseif ($parsedPayload["action"] == "closed") {
                     // Allowed external contributions cleanup
 

app/controllers/general.php

@@ -321,6 +321,7 @@ function router(App $utopia, Database $dbForConsole, callable $getProjectDB, Swo
             'APPWRITE_VCS_COMMIT_MESSAGE' => $deployment->getAttribute('providerCommitMessage', ''),
             'APPWRITE_VCS_COMMIT_URL' => $deployment->getAttribute('providerCommitUrl', ''),
             'APPWRITE_VCS_COMMIT_AUTHOR_NAME' => $deployment->getAttribute('providerCommitAuthor', ''),
+            'APPWRITE_VCS_COMMIT_AUTHOR_AVATAR' => $deployment->getAttribute('providerCommitAuthorAvatar', ''),
             'APPWRITE_VCS_COMMIT_AUTHOR_URL' => $deployment->getAttribute('providerCommitAuthorUrl', ''),
             'APPWRITE_VCS_ROOT_DIRECTORY' => $deployment->getAttribute('providerRootDirectory', ''),
         ]);

src/Appwrite/Platform/Modules/Compute/Base.php

@@ -76,6 +76,7 @@ class Base extends Action
             'providerRepositoryUrl' => $repositoryUrl,
             'providerCommitHash' => $commitDetails['commitHash'] ?? '',
             'providerCommitAuthorUrl' => $authorUrl,
+            'providerCommitAuthorAvatar' => $commitDetails['commitAuthorAvatar'] ?? '',
             'providerCommitAuthor' => $commitDetails['commitAuthor'] ?? '',
             'providerCommitMessage' => $commitDetails['commitMessage'] ?? '',
             'providerCommitUrl' => $commitDetails['commitUrl'] ?? '',
@@ -151,6 +152,7 @@ class Base extends Action
             'providerRepositoryUrl' => $repositoryUrl,
             'providerCommitHash' => $commitDetails['commitHash'] ?? '',
             'providerCommitAuthorUrl' => $authorUrl,
+            'providerCommitAuthorAvatar' => $commitDetails['commitAuthorAvatar'] ?? '',
             'providerCommitAuthor' => $commitDetails['commitAuthor'] ?? '',
             'providerCommitMessage' => $commitDetails['commitMessage'] ?? '',
             'providerCommitUrl' => $commitDetails['commitUrl'] ?? '',

src/Appwrite/Platform/Modules/Functions/Workers/Builds.php

@@ -363,7 +363,7 @@ class Builds extends Action
 
                     $deployment->setAttribute('providerCommitHash', $providerCommitHash ?? '');
                     $deployment->setAttribute('providerCommitAuthorUrl', $authorUrl);
-                    $deployment->setAttribute('providerCommitAuthor', 'Appwrite');
+                    $deployment->setAttribute('providerCommitAuthor', 'Appwrite'); // TODO: Add Appwrite's GitHub Avatar
                     $deployment->setAttribute('providerCommitMessage', "Create '" . $resource->getAttribute('name', '') . "' function");
                     $deployment->setAttribute('providerCommitUrl', "https://github.com/$cloneOwner/$cloneRepository/commit/$providerCommitHash");
                     $deployment = $dbForProject->updateDocument('deployments', $deployment->getId(), $deployment);
@@ -512,6 +512,7 @@ class Builds extends Action
                 'APPWRITE_VCS_COMMIT_MESSAGE' => $deployment->getAttribute('providerCommitMessage', ''),
                 'APPWRITE_VCS_COMMIT_URL' => $deployment->getAttribute('providerCommitUrl', ''),
                 'APPWRITE_VCS_COMMIT_AUTHOR_NAME' => $deployment->getAttribute('providerCommitAuthor', ''),
+                'APPWRITE_VCS_COMMIT_AUTHOR_AVATAR' => $deployment->getAttribute('providerCommitAuthorAvatar', ''),
                 'APPWRITE_VCS_COMMIT_AUTHOR_URL' => $deployment->getAttribute('providerCommitAuthorUrl', ''),
                 'APPWRITE_VCS_ROOT_DIRECTORY' => $deployment->getAttribute('providerRootDirectory', ''),
             ]);

src/Appwrite/Platform/Workers/Functions.php

@@ -496,6 +496,7 @@ class Functions extends Action
             'APPWRITE_VCS_COMMIT_MESSAGE' => $deployment->getAttribute('providerCommitMessage', ''),
             'APPWRITE_VCS_COMMIT_URL' => $deployment->getAttribute('providerCommitUrl', ''),
             'APPWRITE_VCS_COMMIT_AUTHOR_NAME' => $deployment->getAttribute('providerCommitAuthor', ''),
+            'APPWRITE_VCS_COMMIT_AUTHOR_AVATAR' => $deployment->getAttribute('providerCommitAuthorAvatar', ''),
             'APPWRITE_VCS_COMMIT_AUTHOR_URL' => $deployment->getAttribute('providerCommitAuthorUrl', ''),
             'APPWRITE_VCS_ROOT_DIRECTORY' => $deployment->getAttribute('providerRootDirectory', ''),
         ]);

src/Appwrite/Utopia/Response/Model/Deployment.php

@@ -154,6 +154,12 @@ class Deployment extends Model
                 'default' => '',
                 'example' => 'https://github.com/vermakhushboo/g4-node-function/commit/60c0416257a9cbcdd96b2d370c38d8f8d150ccfb',
             ])
+            ->addRule('providerCommitAuthorAvatar', [
+                'type' => self::TYPE_STRING,
+                'description' => 'The avatar of vcs commit author',
+                'default' => '',
+                'example' => 'https://avatars.githubusercontent.com/u/1234567',
+            ])
             ->addRule('providerBranch', [
                 'type' => self::TYPE_STRING,
                 'description' => 'The branch of the vcs repository',