From 593ced742f3ed76ef49e174a435eea456c3a8699 Mon Sep 17 00:00:00 2001 From: Guilherme Branco Stracini Date: Sun, 18 Feb 2024 06:21:49 +0000 Subject: [PATCH] Fix url --- Src/lib/queue.php | 10 ---------- Src/pullRequests.php | 5 ++--- 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/Src/lib/queue.php b/Src/lib/queue.php index 25258fd..94b99d8 100644 --- a/Src/lib/queue.php +++ b/Src/lib/queue.php @@ -5,13 +5,8 @@ function sendQueue($queueName, $headers, $data) { - global $config; global $rabbitMqHost, $rabbitMqPort, $rabbitMqUser, $rabbitMqPassword, $rabbitMqVhost; - if (!$config->queue->enabled) { - return false; - } - $payload = array(time(), $headers, $data); $payload = json_encode($payload); @@ -44,13 +39,8 @@ function sendByLib($queueName, $payload) function receiveQueue($queueName, $callback) { - global $config; global $rabbitMqHost, $rabbitMqPort, $rabbitMqUser, $rabbitMqPassword, $rabbitMqVhost; - if (!$config->queue->enabled) { - return false; - } - receiveByLib($queueName, $callback); } diff --git a/Src/pullRequests.php b/Src/pullRequests.php index ebaf335..158141f 100644 --- a/Src/pullRequests.php +++ b/Src/pullRequests.php @@ -19,8 +19,7 @@ function handlePullRequest($pullRequest) "assigneesUrl" => "repos/" . $pullRequest->RepositoryOwner . "/" . $pullRequest->RepositoryName . "/issues/" . $pullRequest->Number . "/assignees", "collaboratorsUrl" => "repos/" . $pullRequest->RepositoryOwner . "/" . $pullRequest->RepositoryName . "/collaborators", "requestReviewUrl" => "repos/" . $pullRequest->RepositoryOwner . "/" . $pullRequest->RepositoryName . "/issues/" . $pullRequest->Number . "/requested_reviewers", - "issuesUrl" => "repos/" . $pullRequest->RepositoryOwner . "/" . $pullRequest->RepositoryName . "/issues", - "prLabelsUrl" => "repos/" . $pullRequest->RepositoryOwner . "/" . $pullRequest->RepositoryName . "/issues/" . $pullRequest->Number . "/labels" + "issuesUrl" => "repos/" . $pullRequest->RepositoryOwner . "/" . $pullRequest->RepositoryName . "/issues" ); $pullRequestResponse = requestGitHub($metadata["token"], $metadata["pullRequestUrl"]); @@ -94,7 +93,7 @@ function handlePullRequest($pullRequest) $body = array("labels" => array("WIP")); requestGitHub($metadata["token"], $metadata["issuesUrl"] . "/" . $issueNumber . "/labels", $body); $body = array("labels" => $labels); - requestGitHub($metadata["token"], $metadata["prLabelsUrl"] . "/labels", $body); + requestGitHub($metadata["token"], $metadata["issuesUrl"] . "/" . $pullRequest->Number . "/labels", $body); } if (!$botReviewed) {