mail archive - catch comment errors

Email comments on specific commits (not 0 in series) fail if the
first line is not part of the change.  This is part of a couple of patches
to get past this problem.  Failed commit commenting will be a PR
comment.   First step to make sure comments are not missed.

Signed-off-by: Chris. Webster <chris@webstech.net>

Author: webstech

lib/mail-archive-helper.ts

@@ -202,25 +202,31 @@ export class MailArchiveGitHelper {
                     (parsedMbox.from ?
                      parsedMbox.from.replace(/ *<.*>/, "") : "Somebody") +
                      ` wrote ([reply to this](${replyToThisURL})):\n\n`;
-                const comment = header +
-                    MailArchiveGitHelper.mbox2markdown(parsedMbox);
+                const comment = MailArchiveGitHelper.mbox2markdown(parsedMbox);
+                const fullComment = header + comment;
 
                 if (issueCommentId) {
                     await this.githubGlue.addPRCommentReply(pullRequestURL,
                                                             issueCommentId,
-                                                            comment);
+                                                            fullComment);
                 } else if (originalCommit) {
-                    const result = await this.githubGlue
-                        .addPRCommitComment(pullRequestURL, originalCommit,
-                                            this.gggNotes.workDir, comment);
-                    issueCommentId = result.id;
+                    try {
+                        const result = await this.githubGlue
+                            .addPRCommitComment(pullRequestURL, originalCommit,
+                                                this.gggNotes.workDir, fullComment);
+                        issueCommentId = result.id;
+                    } catch (error) {
+                        const regarding = `${header.slice(0,-3)}, regarding ${originalCommit}:\n\n`;
+                        await this.githubGlue.addPRComment(pullRequestURL, regarding + comment);
+                        originalCommit = undefined;
+                    }
                 } else {
                     /*
                      * We will not use the ID of this comment, as it is an
                      * issue comment, really, not a Pull Request comment.
                      */
                     await this.githubGlue
-                        .addPRComment(pullRequestURL, comment);
+                        .addPRComment(pullRequestURL, fullComment);
                 }
 
                 await this.githubGlue.addPRCc(pullRequestURL,

package-lock.json

@@ -45,7 +45,7 @@
     "@types/jsonwebtoken": "^8.5.9",
     "@types/mailparser": "^3.4.0",
     "@types/marked": "^4.0.8",
-    "@types/nodemailer": "^6.4.6",
+    "@types/nodemailer": "^6.4.7",
     "@types/rfc2047": "^2.0.1",
     "@typescript-eslint/eslint-plugin": "^5.46.1",
     "@typescript-eslint/parser": "^5.46.1",