fix check membership & skip events

src/bot/events/onIssueCommentCreated.ts

@@ -54,35 +54,35 @@ export const onIssueCommentCreated: WebhookHandler<"issue_comment.created"> = as
   try {
     const commands: (ParsedCommand | SkipEvent)[] = [];
 
-    if (!(await isRequesterAllowed(ctx, octokit, requester))) {
-      return getError("Requester could not be detected as a member of an allowed organization.");
-    }
-
     for (const line of getLines(comment.body)) {
       const parsedCommand = await parsePullRequestBotCommandLine(line, ctx, pr.repo);
 
       if (parsedCommand instanceof Error) {
         return getError(parsedCommand.message);
       }
 
-      commands.push(parsedCommand);
-    }
-
-    if (commands.length === 0) {
-      return new SkipEvent("No commands found within a comment");
-    }
-
-    for (const parsedCommand of commands) {
-      logger.debug({ parsedCommand }, "Processing parsed command");
-
       if (parsedCommand instanceof SkipEvent) {
         const skip = getMetricsPrData("skip", eventName, pr, parsedCommand.reason);
         counters.commandsRun.inc({ ...skip });
         logger.debug(
           { command: comment.body, payload, ...skip },
           `Skip command with reason: "${parsedCommand.reason}"`,
         );
+      } else {
+        commands.push(parsedCommand);
       }
+    }
+
+    if (commands.length === 0) {
+      return new SkipEvent("No commands found within a comment");
+    }
+
+    if (!(await isRequesterAllowed(ctx, octokit, requester))) {
+      return getError("Requester could not be detected as a member of an allowed organization.");
+    }
+
+    for (const parsedCommand of commands) {
+      logger.debug({ parsedCommand }, "Processing parsed command");
 
       if (parsedCommand instanceof HelpCommand) {
         await createComment(ctx, octokit, {

src/bot/setupEvent.ts

@@ -1,7 +1,14 @@
 import { Probot } from "probot";
 
 import { extractPullRequestData } from "src/bot/parse/extractPullRequestData";
-import { FinishedEvent, PullRequestError, WebhookEventPayload, WebhookEvents, WebhookHandler } from "src/bot/types";
+import {
+  FinishedEvent,
+  PullRequestError,
+  SkipEvent,
+  WebhookEventPayload,
+  WebhookEvents,
+  WebhookHandler,
+} from "src/bot/types";
 import { createComment, getOctokit, updateComment } from "src/github";
 import { logger as parentLogger } from "src/logger";
 import { counters, getMetricsPrData, summaries } from "src/metrics";
@@ -55,6 +62,8 @@ export const setupEvent = <E extends WebhookEvents>(
           const ok = getMetricsPrData("ok", eventName, prData, result.comment.body);
           counters.commandsRun.inc({ ...ok, repo: result.pr.repo, pr: result.pr.number });
           eventLogger.info({ result }, "Finished command");
+        } else if (result instanceof SkipEvent) {
+          eventLogger.debug({ result }, "Skipping command");
         } else {
           const message = "Unknown result type";
           const error = getMetricsPrData("error", eventName, prData, message);

src/bot/types.ts

@@ -38,7 +38,7 @@ export type WebhookHandler<E extends WebhookEvents> = (
   ctx: Context,
   octokit: ExtendedOctokit,
   event: WebhookEventPayload<E>,
-) => Promise<PullRequestError | SkipEvent | FinishedEvent>;
+) => Promise<PullRequestError | SkipEvent | FinishedEvent | unknown>;
 
 export class SkipEvent {
   constructor(public reason: string = "") {}