v2.1.7

README.md

@@ -39,7 +39,7 @@ Finally, our GitHub app uses "LLMs as Reviewer Zero". Watermelon evaluates the t
 
 ## Installation
 
-You can install Watermelon's GitHub Application [directly from the marketplace](https://github.com/marketplace/watermelon-copilot-for-code-review).
+You can install Watermelon's GitHub Application [directly from the marketplace](https://github.com/marketplace/watermelon-context).
 
 ## Contributing
 

app/api/actions/github/route.ts

@@ -14,7 +14,8 @@ import {
 import validateParams from "../../../../utils/api/validateParams";
 
 import labelPullRequest from "../../../../utils/actions/labelPullRequest";
-import detectConsoleLogs from "../../../../utils/actions/detectConsoleLogs";
+import detectLefoutComments from "../../../../utils/codeSmells/detectLefoutComments";
+import detectConsoleLogs from "../../../../utils/codeSmells/detectConsoleLogs";
 
 import {
   failedPosthogTracking,
@@ -375,6 +376,9 @@ export async function POST(request: Request) {
           textToWrite +=
             "Error getting summary" + businessLogicSummary?.error + "\n";
         }
+        if (AISummary === 2) {
+          textToWrite += `Please create an account on [Watermelon](https://app.watermelontools.com/) to get better results. \n`;
+        }
       } else {
         textToWrite += `AI Summary deactivated by ${userLogin} \n`;
       }
@@ -434,7 +438,7 @@ export async function POST(request: Request) {
         repoName: repo,
       });
       textToWrite += randomText();
-      Promise.all([
+      Promise.allSettled([
         // Detect console.logs and its equivalent in other languages
         CodeComments
           ? detectConsoleLogs({
@@ -448,6 +452,19 @@ export async function POST(request: Request) {
               reqEmail: req.email,
             })
           : null,
+        // Detect console.logs and its equivalent in other languages
+        CodeComments
+        ? detectLefoutComments({
+            prTitle: title,
+            businessLogicSummary,
+            repo,
+            owner,
+            issue_number: number,
+            installationId,
+            reqUrl: request.url,
+            reqEmail: req.email,
+          })
+        : null,
         // Make Watermelon Review the PR's business logic here by comparing the title with the AI-generated summary
         Badges
           ? labelPullRequest({
@@ -551,7 +568,7 @@ export async function POST(request: Request) {
           });
       }
 
-      // If the count is surpassed, we replace the
+      // If the count is surpassed, we replace the text
       if (count.github_app_uses > 500) {
         textToWrite = `Your team has surpassed the free monthly usage. [Please click here](https://buy.stripe.com/28o0289KVaYV5wY004) to upgrade.`;
 
@@ -641,6 +658,18 @@ export async function POST(request: Request) {
           reqEmail: req.email,
         });
 
+        // Detect multi-line leftout comments
+        await detectLefoutComments({
+          prTitle: title,
+          businessLogicSummary,
+          repo,
+          owner,
+          issue_number: number,
+          installationId,
+          reqUrl: request.url,
+          reqEmail: req.email,
+        });
+
         // Make Watermelon Review the PR's business logic here by comparing the title with the AI-generated summary
         await labelPullRequest({
           prTitle: title,

app/api/auth/[...nextauth]/route.ts

@@ -18,7 +18,7 @@ export const authOptions: NextAuthOptions = {
   theme: {
     colorScheme: "dark", // "auto" | "dark" | "light"
     brandColor: "#238636", // Hex color code
-    logo: "public/logo.png", // Absolute URL to image
+    logo: "/favicon/favicon-32x32.png", // Absolute URL to image
   },
   // Configure one or more authentication providers
   providers: [

utils/actions/getAllServices.ts

@@ -174,7 +174,7 @@ export default async function getAllServices({
           notion: { error: "no notion token", data: [], fullData: [] },
           slack: { error: "no slack token", data: [], fullData: [] },
           watermelon_user: "team",
-          AISummary,
+          AISummary: 2,
           ResponseTexts,
           SearchAmount,
         };

utils/actions/markdownHelpers/count.ts

@@ -11,6 +11,9 @@ const countMarkdown = ({
     if (count.error) {
       return `\n We're sorry, we ran into an error: ${count.error}`;
     } else {
+      if (count.name && count.github_app_uses > 500) {
+        return `Your team has surpassed the free monthly usage. [Please click here](https://buy.stripe.com/28o0289KVaYV5wY004) to upgrade.`;
+      }
       if (count.name && count.github_app_uses) {
         return `\n Your team ${count.name} has used Watermelon ${count.github_app_uses} times.`;
       }

utils/actions/detectConsoleLogs.ts → utils/codeSmells/detectConsoleLogs.ts

@@ -1,5 +1,6 @@
 const { Configuration, OpenAIApi } = require("openai");
 import { App } from "@octokit/app";
+import { getLineDiffs } from "./getLineDiffs";
 
 const configuration = new Configuration({
   apiKey: process.env.OPEN_AI_KEY,
@@ -10,31 +11,8 @@ const app = new App({
   appId: process.env.GITHUB_APP_ID!,
   privateKey: process.env.GITHUB_PRIVATE_KEY!,
 });
-const commentBody = `This PR contains console logs. Please review or remove them.`;
 
-function getLineDiffs(filePatch: string) {
-  const additions: string[] = [];
-  const removals: string[] = [];
-
-  // Split the patch into lines
-  const lines = filePatch.split("\n");
-
-  // Loop through lines
-  for (let i = 0; i < lines.length; i++) {
-    const line = lines[i];
-
-    // Check if entering a deletion block
-    if (line.startsWith("-")) {
-      removals.push(line.replace("-", "").trim());
-    }
-
-    // Check if exiting a deletion block
-    if (line.startsWith("+")) {
-      additions.push(line.replace("+", "").trim());
-    }
-  }
-  return { additions: additions.join("\n"), removals: removals.join("\n") };
-}
+const consoleLogCommentBody = `This PR contains console logs. Please review or remove them.`;
 
 export default async function detectConsoleLogs({
   installationId,
@@ -79,26 +57,34 @@ export default async function detectConsoleLogs({
         console.log(err);
       });
   }
+
   const latestCommitHash = await getLatestCommitHash();
 
   const commentPromises = diffFiles.map(async (file) => {
     const { additions } = getLineDiffs(file.patch ?? "");
 
+    // Leftout comment RegEx
+    const leftoverCommentRegex = /^\/\*[\s\S]*?\*\/|\/\/[\s\S]*?\n/gm;
+    const matches = additions.match(leftoverCommentRegex);
     const splitAdditions = additions.split("\n");
 
     // RegEx to detect console log equivalents in different languages
-    const consoleLogRegex = /(console\.log|print|printf|fmt\.Print|log\.Print|NSLog|puts|println|println!)\([^)]*\)(?![^]*?\/\/|[^]*?\/\*|#)/;
-
+    const consoleLogRegex =
+      /(console\.log|print|printf|fmt\.Print|log\.Print|NSLog|puts|println|println!)\([^)]*\)(?![^]*?\/\/|[^]*?\/\*|#)/;
+
     // RegEx to ignore lines that contian //, /*, etc.
     const commentRegex = /^\s*\/{2,}|^\s*\/\*|\*\/|#/;
 
-    for (let i=0; i < splitAdditions.length; i++) {
+    for (let i = 0; i < splitAdditions.length; i++) {
       let currentLine = splitAdditions[i];
-      if (!currentLine.match(commentRegex) && currentLine.match(consoleLogRegex)) {
-        const commentFileDiff = async () => {
 
+      if (
+        !currentLine.match(commentRegex) &&
+        currentLine.match(consoleLogRegex)
+      ) {
+        const commentFileDiff = async () => {
           const consoleLogPosition = i + 1; // The +1 is because IDEs and GitHub file diff view index LOC at 1, not 0
-  
+
           await octokit
             .request("POST /repos/{owner}/{repo}/pulls/{pull_number}/reviews", {
               owner,
@@ -114,18 +100,17 @@ export default async function detectConsoleLogs({
                 {
                   path: file.filename,
                   position: consoleLogPosition || 1, // comment at the beggining of the file by default
-                  body: commentBody,
+                  body: consoleLogCommentBody,
                 },
               ],
             })
             .catch((err) => {
               throw err;
             });
         };
-  
+
         commentFileDiff();
       }
-
     }
   });
   try {

utils/codeSmells/detectLefoutComments.ts

@@ -0,0 +1,115 @@
+const { Configuration, OpenAIApi } = require("openai");
+import { App } from "@octokit/app";
+import { getLineDiffs } from "./getLineDiffs";
+
+const configuration = new Configuration({
+  apiKey: process.env.OPEN_AI_KEY,
+});
+const openai = new OpenAIApi(configuration);
+
+const app = new App({
+  appId: process.env.GITHUB_APP_ID!,
+  privateKey: process.env.GITHUB_PRIVATE_KEY!,
+});
+
+const leftoverCommentBody = `This PR contains leftover multi-line comments. Please review or remove them.`;
+
+export default async function detectLefoutComments({
+  installationId,
+  owner,
+  repo,
+  issue_number,
+  reqUrl,
+  reqEmail,
+}: {
+  prTitle?: string;
+  businessLogicSummary?: string;
+  installationId: number;
+  owner: string;
+  repo: string;
+  issue_number: number;
+  reqUrl: string;
+  reqEmail: string;
+}) {
+  const octokit = await app.getInstallationOctokit(installationId);
+
+  // get the diffs
+  const { data: diffFiles } = await octokit.request(
+    "GET /repos/{owner}/{repo}/pulls/{pull_number}/files",
+    {
+      owner,
+      repo,
+      pull_number: issue_number,
+    }
+  );
+
+  function getLatestCommitHash() {
+    return octokit
+      .request("GET /repos/{owner}/{repo}/pulls/{pull_number}", {
+        owner,
+        repo,
+        pull_number: issue_number,
+      })
+      .then((result) => {
+        return result.data.head.sha;
+      })
+      .catch((err) => {
+        console.log(err);
+      });
+  }
+
+  const latestCommitHash = await getLatestCommitHash();
+
+  const commentPromises = diffFiles.map(async (file) => {
+    const { additions } = getLineDiffs(file.patch ?? "");
+
+    // Leftout comment RegEx
+    const leftoverCommentRegex = /^\/\*[\s\S]*?\*\/|\/\/[\s\S]*?\n/gm;
+    const matches = additions.match(leftoverCommentRegex);
+
+    if (matches) {
+      const firstMatch = matches[0];
+
+      // Find the position of the start of the comment, then split the additions into lines
+      const startPos = additions.indexOf(firstMatch);
+      const lines = additions.split("\n");
+
+      // This is very important
+      // lineNumber is not the position of the comment in the file, but the line number in the diff (this is on the Octokit docs)
+      // What's important to note here is that after the header that contains a "@@" on the GitHub code review UI, GitHub adds 3 lines before the code diff. So that's why we need to index this variable at 4.
+      let lineNumber = 4;
+
+      for (let i = 0; i < lines.length; i++) {
+        const line = lines[i];
+        if (line.includes(firstMatch)) {
+          lineNumber = i + 1;
+          break;
+        }
+      }
+
+      await octokit
+        .request("POST /repos/{owner}/{repo}/pulls/{pull_number}/reviews", {
+          owner,
+          repo,
+          pull_number: issue_number,
+          commit_id:
+            typeof latestCommitHash === "string" ? latestCommitHash : undefined,
+          event: "COMMENT",
+          path: file.filename,
+          comments: [
+            {
+              path: file.filename,
+              position: lineNumber, // comment at the beggining of the file by default
+              body: leftoverCommentBody,
+            },
+          ],
+        })
+        .catch((err) => {
+          throw err;
+        });
+    }
+  });
+  try {
+    await Promise.allSettled(commentPromises);
+  } catch {}
+}

utils/codeSmells/getLineDiffs.ts

@@ -0,0 +1,23 @@
+export function getLineDiffs(filePatch: string) {
+    const additions: string[] = [];
+    const removals: string[] = [];
+
+    // Split the patch into lines
+    const lines = filePatch.split("\n");
+
+    // Loop through lines
+    for (let i = 0; i < lines.length; i++) {
+      const line = lines[i];
+
+      // Check if entering a deletion block
+      if (line.startsWith("-")) {
+        removals.push(line.replace("-", "").trim());
+      }
+
+      // Check if exiting a deletion block
+      if (line.startsWith("+")) {
+        additions.push(line.replace("+", "").trim());
+      }
+    }
+    return { additions: additions.join("\n"), removals: removals.join("\n") };
+  }