From 84e1b050a9d720e6dfe33929e617f22c6c8cca98 Mon Sep 17 00:00:00 2001 From: Khushboo Verma <43381712+vermakhushboo@users.noreply.github.com> Date: Tue, 4 Mar 2025 17:28:06 +0530 Subject: [PATCH 1/3] Truncate commit message to 252 characters --- app/controllers/api/vcs.php | 6 +++--- src/Appwrite/Platform/Modules/Compute/Base.php | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/controllers/api/vcs.php b/app/controllers/api/vcs.php index 0f277a4661..92be85ba39 100644 --- a/app/controllers/api/vcs.php +++ b/app/controllers/api/vcs.php @@ -224,7 +224,7 @@ $createGitDeployments = function (GitHub $github, string $providerInstallationId 'providerCommitHash' => $providerCommitHash, 'providerCommitAuthorUrl' => $providerCommitAuthorUrl, 'providerCommitAuthor' => $providerCommitAuthor, - 'providerCommitMessage' => $providerCommitMessage, + 'providerCommitMessage' => mb_strimwidth($providerCommitMessage, 0, 252, '...'), 'providerCommitUrl' => $providerCommitUrl, 'providerCommentId' => \strval($latestCommentId), 'providerBranch' => $providerBranch, @@ -1028,7 +1028,7 @@ App::post('/v1/vcs/github/events') $providerRepositoryOwner = $parsedPayload["owner"] ?? ''; $providerCommitAuthor = $parsedPayload["headCommitAuthor"] ?? ''; $providerCommitAuthorUrl = $parsedPayload["authorUrl"] ?? ''; - $providerCommitMessage = $parsedPayload["headCommitMessage"] ?? ''; + $providerCommitMessage = mb_strimwidth($parsedPayload["headCommitMessage"] ?? '', 0, 252, '...'); $providerCommitUrl = $parsedPayload["headCommitUrl"] ?? ''; $github->initializeVariables($providerInstallationId, $privateKey, $githubAppId); @@ -1090,7 +1090,7 @@ App::post('/v1/vcs/github/events') $commitDetails = $github->getCommit($providerRepositoryOwner, $providerRepositoryName, $providerCommitHash); $providerCommitAuthor = $commitDetails["commitAuthor"] ?? ''; - $providerCommitMessage = $commitDetails["commitMessage"] ?? ''; + $providerCommitMessage = mb_strimwidth($commitDetails["commitMessage"] ?? '', 0, 252, '...'); $repositories = Authorization::skip(fn () => $dbForPlatform->find('repositories', [ Query::equal('providerRepositoryId', [$providerRepositoryId]), diff --git a/src/Appwrite/Platform/Modules/Compute/Base.php b/src/Appwrite/Platform/Modules/Compute/Base.php index 157654c486..a1703b7932 100644 --- a/src/Appwrite/Platform/Modules/Compute/Base.php +++ b/src/Appwrite/Platform/Modules/Compute/Base.php @@ -83,7 +83,7 @@ class Base extends Action 'providerCommitHash' => $commitDetails['commitHash'] ?? '', 'providerCommitAuthorUrl' => $authorUrl, 'providerCommitAuthor' => $commitDetails['commitAuthor'] ?? '', - 'providerCommitMessage' => $commitDetails['commitMessage'] ?? '', + 'providerCommitMessage' => mb_strimwidth($commitDetails['commitMessage'] ?? '', 0, 252, '...'), 'providerCommitUrl' => $commitDetails['commitUrl'] ?? '', 'providerBranch' => $providerBranch, 'providerRootDirectory' => $function->getAttribute('providerRootDirectory', ''), @@ -164,7 +164,7 @@ class Base extends Action 'providerCommitHash' => $commitDetails['commitHash'] ?? '', 'providerCommitAuthorUrl' => $authorUrl, 'providerCommitAuthor' => $commitDetails['commitAuthor'] ?? '', - 'providerCommitMessage' => $commitDetails['commitMessage'] ?? '', + 'providerCommitMessage' => mb_strimwidth($commitDetails['commitMessage'] ?? '', 0, 252, '...'), 'providerCommitUrl' => $commitDetails['commitUrl'] ?? '', 'providerBranch' => $providerBranch, 'providerRootDirectory' => $site->getAttribute('providerRootDirectory', ''), From bbf37e0a0e55b85dfa1a6ddacb9c3411707e671f Mon Sep 17 00:00:00 2001 From: Khushboo Verma <43381712+vermakhushboo@users.noreply.github.com> Date: Wed, 5 Mar 2025 13:40:15 +0530 Subject: [PATCH 2/3] Update length to 255 --- app/controllers/api/vcs.php | 6 +++--- src/Appwrite/Platform/Modules/Compute/Base.php | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/controllers/api/vcs.php b/app/controllers/api/vcs.php index 92be85ba39..ba364e98fd 100644 --- a/app/controllers/api/vcs.php +++ b/app/controllers/api/vcs.php @@ -224,7 +224,7 @@ $createGitDeployments = function (GitHub $github, string $providerInstallationId 'providerCommitHash' => $providerCommitHash, 'providerCommitAuthorUrl' => $providerCommitAuthorUrl, 'providerCommitAuthor' => $providerCommitAuthor, - 'providerCommitMessage' => mb_strimwidth($providerCommitMessage, 0, 252, '...'), + 'providerCommitMessage' => mb_strimwidth($providerCommitMessage, 0, 255, '...'), 'providerCommitUrl' => $providerCommitUrl, 'providerCommentId' => \strval($latestCommentId), 'providerBranch' => $providerBranch, @@ -1028,7 +1028,7 @@ App::post('/v1/vcs/github/events') $providerRepositoryOwner = $parsedPayload["owner"] ?? ''; $providerCommitAuthor = $parsedPayload["headCommitAuthor"] ?? ''; $providerCommitAuthorUrl = $parsedPayload["authorUrl"] ?? ''; - $providerCommitMessage = mb_strimwidth($parsedPayload["headCommitMessage"] ?? '', 0, 252, '...'); + $providerCommitMessage = mb_strimwidth($parsedPayload["headCommitMessage"] ?? '', 0, 255, '...'); $providerCommitUrl = $parsedPayload["headCommitUrl"] ?? ''; $github->initializeVariables($providerInstallationId, $privateKey, $githubAppId); @@ -1090,7 +1090,7 @@ App::post('/v1/vcs/github/events') $commitDetails = $github->getCommit($providerRepositoryOwner, $providerRepositoryName, $providerCommitHash); $providerCommitAuthor = $commitDetails["commitAuthor"] ?? ''; - $providerCommitMessage = mb_strimwidth($commitDetails["commitMessage"] ?? '', 0, 252, '...'); + $providerCommitMessage = mb_strimwidth($commitDetails["commitMessage"] ?? '', 0, 255, '...'); $repositories = Authorization::skip(fn () => $dbForPlatform->find('repositories', [ Query::equal('providerRepositoryId', [$providerRepositoryId]), diff --git a/src/Appwrite/Platform/Modules/Compute/Base.php b/src/Appwrite/Platform/Modules/Compute/Base.php index a1703b7932..43e23214b0 100644 --- a/src/Appwrite/Platform/Modules/Compute/Base.php +++ b/src/Appwrite/Platform/Modules/Compute/Base.php @@ -83,7 +83,7 @@ class Base extends Action 'providerCommitHash' => $commitDetails['commitHash'] ?? '', 'providerCommitAuthorUrl' => $authorUrl, 'providerCommitAuthor' => $commitDetails['commitAuthor'] ?? '', - 'providerCommitMessage' => mb_strimwidth($commitDetails['commitMessage'] ?? '', 0, 252, '...'), + 'providerCommitMessage' => mb_strimwidth($commitDetails['commitMessage'] ?? '', 0, 255, '...'), 'providerCommitUrl' => $commitDetails['commitUrl'] ?? '', 'providerBranch' => $providerBranch, 'providerRootDirectory' => $function->getAttribute('providerRootDirectory', ''), @@ -164,7 +164,7 @@ class Base extends Action 'providerCommitHash' => $commitDetails['commitHash'] ?? '', 'providerCommitAuthorUrl' => $authorUrl, 'providerCommitAuthor' => $commitDetails['commitAuthor'] ?? '', - 'providerCommitMessage' => mb_strimwidth($commitDetails['commitMessage'] ?? '', 0, 252, '...'), + 'providerCommitMessage' => mb_strimwidth($commitDetails['commitMessage'] ?? '', 0, 255, '...'), 'providerCommitUrl' => $commitDetails['commitUrl'] ?? '', 'providerBranch' => $providerBranch, 'providerRootDirectory' => $site->getAttribute('providerRootDirectory', ''), From de5f33f2060b478594502aa1adcc2369ef9de6a1 Mon Sep 17 00:00:00 2001 From: Khushboo Verma <43381712+vermakhushboo@users.noreply.github.com> Date: Wed, 5 Mar 2025 22:45:48 +0530 Subject: [PATCH 3/3] keep truncation only during create document --- app/controllers/api/vcs.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/api/vcs.php b/app/controllers/api/vcs.php index ba364e98fd..480ee54411 100644 --- a/app/controllers/api/vcs.php +++ b/app/controllers/api/vcs.php @@ -1028,7 +1028,7 @@ App::post('/v1/vcs/github/events') $providerRepositoryOwner = $parsedPayload["owner"] ?? ''; $providerCommitAuthor = $parsedPayload["headCommitAuthor"] ?? ''; $providerCommitAuthorUrl = $parsedPayload["authorUrl"] ?? ''; - $providerCommitMessage = mb_strimwidth($parsedPayload["headCommitMessage"] ?? '', 0, 255, '...'); + $providerCommitMessage = $parsedPayload["headCommitMessage"] ?? ''; $providerCommitUrl = $parsedPayload["headCommitUrl"] ?? ''; $github->initializeVariables($providerInstallationId, $privateKey, $githubAppId); @@ -1090,7 +1090,7 @@ App::post('/v1/vcs/github/events') $commitDetails = $github->getCommit($providerRepositoryOwner, $providerRepositoryName, $providerCommitHash); $providerCommitAuthor = $commitDetails["commitAuthor"] ?? ''; - $providerCommitMessage = mb_strimwidth($commitDetails["commitMessage"] ?? '', 0, 255, '...'); + $providerCommitMessage = $commitDetails["commitMessage"] ?? ''; $repositories = Authorization::skip(fn () => $dbForPlatform->find('repositories', [ Query::equal('providerRepositoryId', [$providerRepositoryId]),