Added a second message

Author: Nyholm

.symfony.cloud.yaml

@@ -40,11 +40,11 @@ crons:
 
     stale_issues_symfony:
         spec: '58 12 * * *'
-        cmd: croncape bin/console app:issue:close-stale symfony/symfony
+        cmd: croncape bin/console app:issue:ping-stale symfony/symfony
 
     stale_issues_docs:
         spec: '48 12 * * *'
-        cmd: croncape bin/console app:issue:close-stale symfony/symfony-docs
+        cmd: croncape bin/console app:issue:ping-stale symfony/symfony-docs
 
 relationships:
     database: "mydatabase:postgresql"

src/Command/CloseStaleIssuesCommand.php renamed to src/Command/PingStaleIssuesCommand.php

@@ -18,9 +18,14 @@
  *
  * @author Tobias Nyholm <tobias.nyholm@gmail.com>
  */
-class CloseStaleIssuesCommand extends Command
+class PingStaleIssuesCommand extends Command
 {
-    protected static $defaultName = 'app:issue:close-stale';
+    public const STALE_IF_NOT_UPDATED_SINCE = '-12months';
+    public const MESSAGE_TWO_AFTER = '+2weeks';
+    public const MESSAGE_THREE_AND_CLOSE_AFTER = '+2weeks';
+
+    protected static $defaultName = 'app:issue:ping-stale';
+
     private $repositoryProvider;
     private $issueApi;
     private $scheduler;
@@ -51,15 +56,15 @@ protected function execute(InputInterface $input, OutputInterface $output)
             return 1;
         }
 
-        $notUpdatedAfter = new \DateTimeImmutable('-12months');
+        $notUpdatedAfter = new \DateTimeImmutable(self::STALE_IF_NOT_UPDATED_SINCE);
         $issues = $this->issueApi->findStaleIssues($repository, $notUpdatedAfter);
 
         foreach ($issues as $issue) {
             $comment = $this->commentGenerator->getComment($this->extractType($issue));
             $this->issueApi->commentOnIssue($repository, $issue['number'], $comment);
 
             // add a scheduled task to process this issue again after 2 weeks
-            $this->scheduler->runLater($repository, $issue['number'], Task::ACTION_CLOSE_STALE, new \DateTimeImmutable('+2weeks'));
+            $this->scheduler->runLater($repository, $issue['number'], Task::ACTION_INFORM_CLOSE_STALE, new \DateTimeImmutable(self::MESSAGE_TWO_AFTER));
         }
 
         return 0;

src/Entity/Task.php

@@ -17,6 +17,7 @@ class Task
 {
     const ACTION_CLOSE_STALE = 1;
     const ACTION_CLOSE_DRAFT = 2;
+    const ACTION_INFORM_CLOSE_STALE = 3;
 
     /**
      * @var int

src/Service/StaleIssueCommentGenerator.php

@@ -11,6 +11,23 @@
  */
 class StaleIssueCommentGenerator
 {
+    /**
+     * Get a comment to say: "I will close this soon".
+     */
+    public function getInformAboutClosingComment(): string
+    {
+        $messages = [
+            'Hello? This issue is about to be closed if nobody replies.',
+            'Friendly ping? Should this still be open? I will close if I dont hear anything.',
+            'Could I get a reply or should I close this?',
+            'Just a quick reminder to make a comment on this. If I don\'t hear anything I\'ll close this.',
+            'Friendly reminder that this issue exists. If I don\'t hear anything I\'ll close this.',
+            'Could I get an answer? If I do not hear anything I will assume this issue is resolved or abandoned. Please get back to me <3',
+        ];
+
+        return $messages[array_rand($messages)];
+    }
+
     /**
      * Get a comment to say: "I'm closing this now".
      */
@@ -24,7 +41,7 @@ public function getClosingComment(): string
     }
 
     /**
-     * Get a comment that encurage users to reply or close the issue themselves.
+     * Get a comment that encourage users to reply or close the issue themselves.
      *
      * @param string $type Valid types are IssueType::*
      */

src/Service/TaskHandler/InformAboutClosingStaleIssuesHandler.php

@@ -0,0 +1,58 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Service\TaskHandler;
+
+use App\Api\Issue\IssueApi;
+use App\Api\Label\LabelApi;
+use App\Command\PingStaleIssuesCommand;
+use App\Entity\Task;
+use App\Service\RepositoryProvider;
+use App\Service\StaleIssueCommentGenerator;
+use App\Service\TaskScheduler;
+
+/**
+ * @author Tobias Nyholm <tobias.nyholm@gmail.com>
+ */
+class InformAboutClosingStaleIssuesHandler implements TaskHandlerInterface
+{
+    private $issueApi;
+    private $repositoryProvider;
+    private $labelApi;
+    private $commentGenerator;
+    private $scheduler;
+
+    public function __construct(LabelApi $labelApi, IssueApi $issueApi, RepositoryProvider $repositoryProvider, StaleIssueCommentGenerator $commentGenerator, TaskScheduler $scheduler)
+    {
+        $this->issueApi = $issueApi;
+        $this->repositoryProvider = $repositoryProvider;
+        $this->labelApi = $labelApi;
+        $this->commentGenerator = $commentGenerator;
+        $this->scheduler = $scheduler;
+    }
+
+    /**
+     * Close the issue if the last comment was made by the bot and if "Keep open" label does not exist.
+     */
+    public function handle(Task $task): void
+    {
+        if (null === $repository = $this->repositoryProvider->getRepository($task->getRepositoryFullName())) {
+            return;
+        }
+        $labels = $this->labelApi->getIssueLabels($task->getNumber(), $repository);
+        if (in_array('Keep open', $labels)) {
+            return;
+        }
+
+        if ($this->issueApi->lastCommentWasMadeByBot($repository, $task->getNumber())) {
+            $this->issueApi->commentOnIssue($repository, $task->getNumber(), $this->commentGenerator->getInformAboutClosingComment());
+            $this->scheduler->runLater($repository, $task->getNumber(), Task::ACTION_CLOSE_STALE, new \DateTimeImmutable(PingStaleIssuesCommand::MESSAGE_THREE_AND_CLOSE_AFTER));
+        }
+    }
+
+    public function supports(Task $task): bool
+    {
+        return Task::ACTION_INFORM_CLOSE_STALE === $task->getAction();
+    }
+}