fix: Limit GFI bot recommendations to supported repositories. (hiero-ledger#1740)

Signed-off-by: Abhijeet Saharan <abhijeetsaharan2236@gmail.com>
Signed-off-by: Abhijeet <abhijeetsaharan2236@gmail.com>

Author: Abhijeet2409

.github/scripts/bot-next-issue-recommendation.js

@@ -1,22 +1,29 @@
+const SUPPORTED_GFI_REPOS = [
+  'hiero-sdk-cpp',
+  'hiero-sdk-swift',
+  'hiero-sdk-python',
+  'hiero-website',
+];
+
 module.exports = async ({ github, context, core }) => {
   const { payload } = context;
-  
+
   // Get PR information from automatic pull_request_target trigger
   let prNumber = payload.pull_request?.number;
   let prBody = payload.pull_request?.body || '';
-  
+
   // Manual workflow_dispatch is no longer supported - inputs were removed
   // Only automatic triggers from merged PRs will work
   const repoOwner = context.repo.owner;
   const repoName = context.repo.repo;
-  
+
   if (!prNumber) {
     core.info('No PR number found, skipping');
     return;
   }
-  
+
   core.info(`Processing PR #${prNumber}`);
-  
+
   // Parse PR body to find linked issues
   const MAX_PR_BODY_LENGTH = 50000; // Reasonable limit for PR body
   if (prBody.length > MAX_PR_BODY_LENGTH) {
@@ -25,54 +32,53 @@ module.exports = async ({ github, context, core }) => {
   }
   const issueRegex = /(fixes|closes|resolves|fix|close|resolve)\s+(?:[\w-]+\/[\w-]+)?#(\d+)/gi;
   const matches = [...prBody.matchAll(issueRegex)];
-  
+
   if (matches.length === 0) {
     core.info('No linked issues found in PR body');
     return;
   }
-  
+
   // Get the first linked issue number
   const issueNumber = parseInt(matches[0][2]);
   core.info(`Found linked issue #${issueNumber}`);
-  
+
   try {
     // Fetch issue details
     const { data: issue } = await github.rest.issues.get({
       owner: repoOwner,
       repo: repoName,
       issue_number: issueNumber,
     });
-    
+
     // Normalize and check issue labels (case-insensitive)
     const labelNames = issue.labels.map(label => label.name.toLowerCase());
     const labelSet = new Set(labelNames);
     core.info(`Issue labels: ${labelNames.join(', ')}`);
-    
+
     // Determine issue difficulty level
     const difficultyLevels = {
       beginner: labelSet.has('beginner'),
       goodFirstIssue: labelSet.has('good first issue'),
       intermediate: labelSet.has('intermediate'),
       advanced: labelSet.has('advanced'),
     };
-    
+
     // Skip if intermediate or advanced
     if (difficultyLevels.intermediate || difficultyLevels.advanced) {
       core.info('Issue is intermediate or advanced level, skipping recommendation');
       return;
     }
-    
+
     // Only proceed for Good First Issue or beginner issues
     if (!difficultyLevels.goodFirstIssue && !difficultyLevels.beginner) {
       core.info('Issue is not a Good First Issue or beginner issue, skipping');
       return;
     }
-    
+
     let recommendedIssues = [];
     let recommendedLabel = null;
     let isFallback = false;
-    let recommendationScope = 'repo';
-    
+
     recommendedIssues = await searchIssues(github, core, repoOwner, repoName, 'beginner');
     recommendedLabel = 'Beginner';
 
@@ -82,29 +88,20 @@ module.exports = async ({ github, context, core }) => {
       recommendedLabel = 'Good First Issue';
     }
 
-    if (recommendedIssues.length === 0) {
-      recommendationScope = 'org';
-      recommendedLabel = 'Good First Issue';
-      recommendedIssues = await github.rest.search.issuesAndPullRequests({
-        q: `org:hiero-ledger type:issue state:open label:"good first issue" no:assignee`,
-        per_page: 6,
-      }).then(res => res.data.items);
-    }
 
     // Remove the issue they just solved
     recommendedIssues = recommendedIssues.filter(i => i.number !== issueNumber);
-    
+
     // Generate and post comment
     const completedLabel = difficultyLevels.goodFirstIssue ? 'Good First Issue' : 'Beginner';
     const completedLabelText = completedLabel === 'Beginner' ? 'Beginner issue' : completedLabel;
     const recommendationMeta = {
       completedLabelText,
       recommendedLabel,
       isFallback,
-      recommendationScope,
     };
     await generateAndPostComment(github, context, core, prNumber, recommendedIssues, recommendationMeta);
-    
+
   } catch (error) {
     core.setFailed(`Error processing issue #${issueNumber}: ${error.message}`);
   }
@@ -114,12 +111,12 @@ async function searchIssues(github, core, owner, repo, label) {
   try {
     const query = `repo:${owner}/${repo} type:issue state:open label:"${label}" no:assignee`;
     core.info(`Searching for issues with query: ${query}`);
-    
+
     const { data: searchResult } = await github.rest.search.issuesAndPullRequests({
       q: query,
       per_page: 6,
     });
-    
+
     core.info(`Found ${searchResult.items.length} issues with label "${label}"`);
     return searchResult.items;
   } catch (error) {
@@ -128,22 +125,21 @@ async function searchIssues(github, core, owner, repo, label) {
   }
 }
 
-async function generateAndPostComment(github, context, core, prNumber, recommendedIssues, { completedLabelText, recommendedLabel, isFallback, recommendationScope }) {
+async function generateAndPostComment(github, context, core, prNumber, recommendedIssues, { completedLabelText, recommendedLabel, isFallback}) {
   const marker = '<!-- next-issue-bot-marker -->';
-  
+
   // Build comment content
   let comment = `${marker}\n\n🎉 **Nice work completing a ${completedLabelText}!**\n\n`;
   comment += `Thank you for your contribution to the Hiero Python SDK! We're excited to have you as part of our community.\n\n`;
-  
+
   if (recommendedIssues.length > 0) {
-    if (recommendationScope === 'org') {
-      comment += `Here are some **Good First Issues across the Hiero organization** you might be interested in working on next:\n\n`;
-    } else if (isFallback) {
+
+    if (isFallback) {
       comment += `Here are some **${recommendedLabel}** issues at a similar level you might be interested in working on next:\n\n`;
     } else {
       comment += `Here are some issues labeled **${recommendedLabel}** you might be interested in working on next:\n\n`;
     }
-    
+
     // Sanitize title: escape markdown link syntax and special characters
     const sanitizeTitle = (title) => title
       .replace(/\[/g, '\\[')
@@ -168,37 +164,51 @@ async function generateAndPostComment(github, context, core, prNumber, recommend
     });
   } else {
     comment += `There are currently no open issues available at or near the ${completedLabelText} level in this repository.\n\n`;
-    const orgLabel = recommendedLabel === 'Beginner' ? 'beginner' : 'good first issue';
-    const orgLabelQuery = encodeURIComponent(`label:"${orgLabel}"`);
-    comment += `You can check out ${recommendedLabel.toLowerCase()} issues across the entire Hiero organization: ` +
-      `[Hiero ${recommendedLabel} Issues](https://github.com/issues?q=org%3Ahiero-ledger+type%3Aissue+state%3Aopen+${orgLabelQuery})\n\n`;
+    comment += `You can check out **Good First Issues** in other Hiero repositories:\n\n`;
+    const repoQuery = SUPPORTED_GFI_REPOS
+      .map(repo => `repo:${context.repo.owner}/${repo}`)
+      .join(' OR ');
+
+    const gfiSearchQuery = [
+      'is:open',
+      'is:issue',
+      `org:${context.repo.owner}`,
+      'archived:false',
+      'no:assignee',
+      '(label:"good first issue" OR label:"skill: good first issue")',
+      `(${repoQuery})`,
+    ].join(' ');
+
+    const gfiQuery = `https://github.com/issues?q=${encodeURIComponent(gfiSearchQuery)}`;
+
+    comment += `[View Good First Issues across supported Hiero repositories](${gfiQuery})\n\n`;
   }
-  
+
   comment += `🌟 **Stay connected with the project:**\n`;
   comment += `- ⭐ [Star this repository](https://github.com/${context.repo.owner}/${context.repo.repo}) to show your support\n`;
   comment += `- 👀 [Watch this repository](https://github.com/${context.repo.owner}/${context.repo.repo}/watchers) to get notified of new issues and releases\n\n`;
-  
+
   comment += `We look forward to seeing more contributions from you! If you have any questions, feel free to ask in our [Discord community](https://github.com/hiero-ledger/hiero-sdk-python/blob/main/docs/discord.md).\n\n`;
   comment += `From the Hiero Python SDK Team 🚀`;
-  
+
   // Check for existing comment
   try {
     const { data: comments } = await github.rest.issues.listComments({
       owner: context.repo.owner,
       repo: context.repo.repo,
       issue_number: prNumber,
     });
-    
-    const existingComment = comments.find(comment => comment.body.includes(marker));
-    
+
+    const existingComment = comments.find(c => c.body.includes(marker));
+
     if (existingComment) {
       core.info('Comment already exists, skipping');
       return;
     }
   } catch (error) {
     core.warning(`Error checking existing comments: ${error.message}`);
   }
-  
+
   // Post the comment
   try {
     await github.rest.issues.createComment({
@@ -207,7 +217,7 @@ async function generateAndPostComment(github, context, core, prNumber, recommend
       issue_number: prNumber,
       body: comment,
     });
-    
+
     core.info(`Successfully posted comment to PR #${prNumber}`);
   } catch (error) {
     core.setFailed(`Error posting comment: ${error.message}`);

CHANGELOG.md

@@ -253,6 +253,7 @@ This changelog is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.
 - chore: update MAINTAINERS.md to include new maintainer Manish Dait and sort maintainers by GitHub ID. (#1691)
 
 ### Fixed
+- Updated Good First Issue recommendations to supported Hiero repositories. (#1689)
 - Fix the next-issue recommendation bot to post the correct issue recommendation comment. (#1593)
 - Ensured that the GFI assignment bot skips posting `/assign` reminders for repository collaborators to avoid unnecessary notifications.(#1568).
 - Reduced notification spam by skipping the entire advanced qualification job for non-advanced issues and irrelevant events (#1517)