Merge branch 'JhaSourav07:main' into fix/issue-2017

Author: AnushKamble

.gitattributes

@@ -0,0 +1 @@
+* text=auto eol=lf

.github/scripts/issue-management/claim-handler.js

@@ -30,9 +30,10 @@ async function handleClaim({ github, context }) {
 
   const issueAuthor = context.payload.issue.user.login;
 
-  const isAuthorJhasourav07 = issueAuthor.toLowerCase() === 'jhasourav07';
+  const MAINTAINERS = ['jhasourav07', 'aamod007', 'souravjhahind'];
+  const isOpenedByMaintainer = MAINTAINERS.includes(issueAuthor.toLowerCase());
 
-  if (!isAuthorJhasourav07 && commenter.toLowerCase() !== issueAuthor.toLowerCase()) {
+  if (!isOpenedByMaintainer && commenter.toLowerCase() !== issueAuthor.toLowerCase()) {
     await github.rest.issues.createComment({
       owner,
       repo,
@@ -73,7 +74,7 @@ async function handleClaim({ github, context }) {
       owner,
       repo,
       issue_number: issueNumber,
-      body: `❌ You already have **${existingIssues.length}/${MAX_ASSIGNED_ISSUES}** active assigned issues (the maximum allowed).\nPlease complete or unassign one of your current issues before claiming another.\n\n${issueList}`,
+      body: `❌ You already have **${existingIssues.length}/${MAX_ASSIGNED_ISSUES}** active assigned issues (the maximum allowed).\nPlease complete or \`/unclaim\` one of your current issues before claiming another.\n\n${issueList}`,
     });
     return;
   }

.github/scripts/issue-management/main.js

@@ -4,6 +4,7 @@ const { handleAssign } = require('./assign-handler');
 const { handleUnassign } = require('./unassign-handler');
 const { handleAddLabel } = require('./addlabel-handler');
 const { handleClaim } = require('./claim-handler');
+const { handleUnclaim } = require('./unclaim-handler');
 
 module.exports = async ({ github, context, core }) => {
   const commentBody = context.payload.comment?.body;
@@ -48,6 +49,9 @@ module.exports = async ({ github, context, core }) => {
       case 'claim':
         await handleClaim({ github, context });
         break;
+      case 'unclaim':
+        await handleUnclaim({ github, context });
+        break;
       case 'ping':
         await github.rest.issues.createComment({
           owner,

.github/scripts/issue-management/parse-command.js

@@ -15,6 +15,9 @@ function parseCommand(commentBody) {
     const claimMatch = line.match(/^\/claim\s*$/i);
     if (claimMatch) return { command: 'claim' };
 
+    const unclaimMatch = line.match(/^\/unclaim\s*$/i);
+    if (unclaimMatch) return { command: 'unclaim' };
+
     const pingMatch = line.match(/^\/ping\s*$/i);
     if (pingMatch) return { command: 'ping' };
 

.github/scripts/issue-management/unclaim-handler.js

@@ -0,0 +1,44 @@
+async function handleUnclaim({ github, context }) {
+  const { owner, repo } = context.repo;
+  const issueNumber = context.payload.issue.number;
+  const commenter = context.payload.comment.user.login;
+  const issueState = context.payload.issue.state;
+
+  if (issueState === 'closed') {
+    await github.rest.issues.createComment({
+      owner,
+      repo,
+      issue_number: issueNumber,
+      body: `❌ Commands cannot be used on closed issues.`,
+    });
+    return;
+  }
+
+  const currentAssignees = context.payload.issue.assignees.map((a) => a.login.toLowerCase());
+
+  if (!currentAssignees.includes(commenter.toLowerCase())) {
+    await github.rest.issues.createComment({
+      owner,
+      repo,
+      issue_number: issueNumber,
+      body: `ℹ️ @${commenter}, you are not currently assigned to this issue, so there's nothing to unclaim.`,
+    });
+    return;
+  }
+
+  await github.rest.issues.removeAssignees({
+    owner,
+    repo,
+    issue_number: issueNumber,
+    assignees: [commenter],
+  });
+
+  await github.rest.issues.createComment({
+    owner,
+    repo,
+    issue_number: issueNumber,
+    body: `✅ Successfully unclaimed this issue for @${commenter}.\n\n> 🔓 The issue is now open for others to claim.`,
+  });
+}
+
+module.exports = { handleUnclaim };

.github/workflows/assign-request-reminder.yml

@@ -42,7 +42,7 @@ jobs:
         contains(github.event.comment.body, 'can i be assigned') ||
         contains(github.event.comment.body, 'assign me to this') ||
         contains(github.event.comment.body, 'assign me this') ||
-        contains(github.event.comment.body, 'i will work on this') ||
+        contains(github.event.comment.body, 'work on this') ||
         contains(github.event.comment.body, 'i''ll work on this') ||
         contains(github.event.comment.body, 'ill work on this') ||
         contains(github.event.comment.body, 'i can work on this') ||

.github/workflows/conflict-notifier.yml

@@ -2,7 +2,12 @@ name: Merge Conflict Notifier
 
 on:
   schedule:
-    - cron: '*/5 * * * *'
+    - cron: '*/30 * * * *' # Hourly/half-hourly fallback
+  push:
+    branches:
+      - main
+  pull_request_target:
+    types: [synchronize, reopened, edited]
   workflow_dispatch:
 
 permissions:

.github/workflows/issue-management.yml

@@ -22,7 +22,8 @@ jobs:
         contains(github.event.comment.body, '/assign') ||
         contains(github.event.comment.body, '/unassign') ||
         contains(github.event.comment.body, '/addlabel') ||
-        contains(github.event.comment.body, '/claim')
+        contains(github.event.comment.body, '/claim') ||
+        contains(github.event.comment.body, '/unclaim')
       )
     steps:
       - name: Checkout Repository

.gitignore

@@ -1,42 +1,42 @@
-# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
-
-# dependencies
-/node_modules
-/.pnp
-.pnp.*
-.yarn/*
-!.yarn/patches
-!.yarn/plugins
-!.yarn/releases
-!.yarn/versions
-
-# testing
-/coverage
-
-# next.js
-/.next/
-/out/
-
-# production
-/build
-
-# misc
-.DS_Store
-*.pem
-
-# debug
-npm-debug.log*
-yarn-debug.log*
-yarn-error.log*
-.pnpm-debug.log*
-
-# env files — ignore all local secrets but commit the example template
-.env*
-!.env.local.example
-.env.local
-# vercel
-.vercel
-
-# typescript
-*.tsbuildinfo
-next-env.d.ts
+# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
+
+# dependencies
+/node_modules
+/.pnp
+.pnp.*
+.yarn/*
+!.yarn/patches
+!.yarn/plugins
+!.yarn/releases
+!.yarn/versions
+
+# testing
+/coverage
+
+# next.js
+/.next/
+/out/
+
+# production
+/build
+
+# misc
+.DS_Store
+*.pem
+
+# debug
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+.pnpm-debug.log*
+
+# env files — ignore all local secrets but commit the example template
+.env*
+!.env.local.example
+.env.local
+# vercel
+.vercel
+
+# typescript
+*.tsbuildinfo
+next-env.d.ts