Merge remote-tracking branch 'upstream/main' into fix-7284-footer-i18n

Author: Goutam-2702

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

@@ -28,27 +28,13 @@ async function handleClaim({ github, context }) {
     return;
   }
 
-  const issueAuthor = context.payload.issue.user.login;
-
-  const MAINTAINERS = ['jhasourav07', 'aamod-dev', 'souravjhahind'];
-  const isOpenedByMaintainer = MAINTAINERS.includes(issueAuthor.toLowerCase());
-
-  if (!isOpenedByMaintainer && commenter.toLowerCase() !== issueAuthor.toLowerCase()) {
-    await github.rest.issues.createComment({
-      owner,
-      repo,
-      issue_number: issueNumber,
-      body: `❌ Only the author of this issue (@${issueAuthor}) can claim it.`,
-    });
-    return;
-  }
-
-  // Re-fetch to avoid stale assignee data from the webhook payload
+  // Re-fetch to avoid stale issue/assignee/state data from the webhook payload
   const { data: freshIssue } = await github.rest.issues.get({
     owner,
     repo,
     issue_number: issueNumber,
   });
+
   const currentAssignees = freshIssue.assignees.map((a) => a.login.toLowerCase());
 
   if (currentAssignees.length > 0) {
@@ -71,6 +57,38 @@ async function handleClaim({ github, context }) {
     return;
   }
 
+  const issueAuthor = freshIssue.user.login;
+  const issueAuthorLower = issueAuthor.toLowerCase();
+  const commenterLower = commenter.toLowerCase();
+
+  const MAINTAINERS = ['jhasourav07', 'aamod-dev', 'souravjhahind'];
+  const isOpenedByMaintainer = MAINTAINERS.includes(issueAuthorLower);
+
+  // Check if the issue is older than 1 week (7 days)
+  const createdAt = new Date(freshIssue.created_at);
+  const now = new Date();
+  const ageInMs = now.getTime() - createdAt.getTime();
+  const oneWeekInMs = 7 * 24 * 60 * 60 * 1000;
+  const isOlderThanOneWeek = ageInMs > oneWeekInMs;
+
+  // Check if opened by any other person other than jhasourav07 or aamod007 (and aamod-dev for safety)
+  const isOpenedByOther = !['jhasourav07', 'aamod007', 'aamod-dev'].includes(issueAuthorLower);
+
+  const isAuthor = commenterLower === issueAuthorLower;
+  const canClaimOlderIssue = isOpenedByOther && isOlderThanOneWeek;
+
+  const isAllowedToClaim = isAuthor || isOpenedByMaintainer || canClaimOlderIssue;
+
+  if (!isAllowedToClaim) {
+    await github.rest.issues.createComment({
+      owner,
+      repo,
+      issue_number: issueNumber,
+      body: `❌ Only the author of this issue (@${issueAuthor}) can claim it.`,
+    });
+    return;
+  }
+
   const existingIssues = await findExistingAssignments(github, owner, repo, commenter, issueNumber);
   if (existingIssues.length >= MAX_ASSIGNED_ISSUES) {
     const issueList = existingIssues

CONTRIBUTING.md

@@ -412,7 +412,7 @@ To maintain high quality in our codebase, we use structured **Issue Templates**
 - **🐛 Bug Report Template**: For reporting visual glitches, API errors, or unexpected behavior.
 - **✨ Feature Request Template**: For suggesting new isometric monolith designs, themes, or time/accuracy improvements.
 
-By using these templates, you provide maintainers with clear details and context. Since you authored the issue, you can immediately claim it for yourself by commenting `/claim`! (Note: Issues authored by `jhasourav07` can be claimed by anyone).
+By using these templates, you provide maintainers with clear details and context. Since you authored the issue, you can immediately claim it for yourself by commenting `/claim`! (Note: Issues authored by `jhasourav07` can be claimed by anyone immediately. Additionally, if an issue is opened by anyone other than `jhasourav07` or `aamod007`, is older than 1 week, and has no assignees, any contributor can claim it).
 
 ### 🔍 Semantic Duplicate Detection
 
@@ -427,13 +427,13 @@ To help maintainers keep the repository organized and prevent multiple contribut
 
 Our automation runs entirely through issue comments. Here is how you interact with it:
 
-| Command                       | Who Can Use It?                                         | What It Does                                              |
-| ----------------------------- | ------------------------------------------------------- | --------------------------------------------------------- |
-| `/claim`                      | **Issue Author (or Anyone if authored by jhasourav07)** | Self-assigns the issue to you.                            |
-| `/unclaim`                    | **Assigned Contributor**                                | Removes the assignment from yourself (opens it back up).  |
-| `/addlabel <label1> <label2>` | **Anyone**                                              | Adds labels to the issue (e.g. `/addlabel frontend bug`). |
-| `/unassign @username`         | **Maintainers Only**                                    | Removes the assignee from an issue.                       |
-| `/assign @username`           | **Maintainers Only**                                    | Manually assigns someone to an issue.                     |
+| Command                       | Who Can Use It?                                                                                           | What It Does                                              |
+| ----------------------------- | --------------------------------------------------------------------------------------------------------- | --------------------------------------------------------- |
+| `/claim`                      | **Issue Author (or Anyone if authored by jhasourav07, or Anyone if older than 1 week with no assignees)** | Self-assigns the issue to you.                            |
+| `/unclaim`                    | **Assigned Contributor**                                                                                  | Removes the assignment from yourself (opens it back up).  |
+| `/addlabel <label1> <label2>` | **Anyone**                                                                                                | Adds labels to the issue (e.g. `/addlabel frontend bug`). |
+| `/unassign @username`         | **Maintainers Only**                                                                                      | Removes the assignee from an issue.                       |
+| `/assign @username`           | **Maintainers Only**                                                                                      | Manually assigns someone to an issue.                     |
 
 ### ⏳ The Inactivity Policy (Assignment Expiry)
 
@@ -458,7 +458,7 @@ If the bot rejects your command, check these common scenarios:
 - **"Commands cannot be used on closed issues"**: You cannot claim, assign, or unassign on closed issues. Find an open one!
 - **"You already have X/5 active assigned issues"**: You have reached the maximum of 5 concurrent assignments. Finish one of your current tasks before claiming a new issue. If you're stuck, use the `/unclaim` command to unassign yourself from an issue, or ask a maintainer to `/unassign` you.
 - **"This issue is already assigned to @username"**: Be faster next time! Look for issues without assignees.
-- **"Only the author of this issue can claim it"**: You tried to `/claim` an issue you did not create. You can only claim issues that you authored (unless the issue was authored by `jhasourav07`, which anyone can claim).
+- **"Only the author of this issue can claim it"**: You tried to `/claim` an issue you did not create. You can only claim issues that you authored (unless the issue is older than 1 week with no assignees, or was authored by `jhasourav07`, which anyone can claim).
 - **"The following label(s) do not exist"**: You can only add existing repo labels. The bot will reply with a list of valid labels you can use.
 - **"You don't have permission"**: You tried to use `/assign` or `/unassign`. Please use `/claim` instead.
 

app/components/Footer.error-resilience.test.tsx

@@ -48,6 +48,8 @@ vi.mock('lucide-react', () => ({
   BookOpen: () => null,
   GitBranch: () => null,
   HelpCircle: () => null,
+  Shield: () => <div>Shield</div>,
+  FileText: () => <div>FileText</div>,
 }));
 
 vi.mock('react-icons/fa', () => ({

app/components/Footer.tsx

@@ -12,6 +12,8 @@ import {
   BookOpen,
   GitBranch,
   HelpCircle,
+  Shield,
+  FileText,
 } from 'lucide-react';
 import { FaGithub, FaDiscord, FaLinkedin } from 'react-icons/fa';
 import { FaXTwitter } from 'react-icons/fa6';
@@ -92,6 +94,8 @@ const RESOURCE_ICON_MAP: Record<string, React.ReactNode> = {
   github_repo: <GitBranch size={15} className="shrink-0" />,
   guidelines: <BookOpen size={15} className="shrink-0" />,
   faq: <HelpCircle size={15} className="shrink-0" />,
+  privacy: <Shield size={15} className="shrink-0" />,
+  terms: <FileText size={15} className="shrink-0" />,
 };
 
 export function Footer() {
@@ -128,6 +132,16 @@ export function Footer() {
       href: '/support',
       isExternal: false,
     },
+    {
+      label: t('footer.privacy'),
+      href: '/privacy',
+      isExternal: false,
+    },
+    {
+      label: t('footer.terms'),
+      href: '/terms',
+      isExternal: false,
+    },
   ];
 
   const socialLinks: SocialLink[] = [
@@ -207,6 +221,8 @@ export function Footer() {
                 if (link.href.includes('README')) iconKey = 'documentation';
                 else if (link.href.includes('CODE_OF_CONDUCT') || link.href.includes('guidelines'))
                   iconKey = 'guidelines';
+                else if (link.href === '/privacy') iconKey = 'privacy';
+                else if (link.href === '/terms') iconKey = 'terms';
                 else if (link.href.includes('support') || link.href.includes('faq'))
                   iconKey = 'faq';
 

app/components/navbar.responsive-breakpoints.test.tsx

@@ -142,14 +142,14 @@ describe('Navbar Responsive Breakpoints & Menu Toggle', () => {
     expect(screen.getByRole('button', { name: 'Open menu' })).toBeDefined();
   });
 
-  it('4. Hides the desktop nav row on mobile and only reveals mobile hamburger controls, via complementary md: classes', () => {
+  it('4. Hides the desktop nav row on mobile and only reveals mobile hamburger controls, via complementary lg: classes', () => {
     const { container } = render(<Navbar />);
 
-    const desktopNavRow = container.querySelector('.hidden.items-center.gap-2.md\\:flex');
+    const desktopNavRow = container.querySelector('.hidden.items-center.gap-2.lg\\:flex');
     expect(desktopNavRow).toBeInTheDocument();
 
     const mobileControls = container.querySelector(
-      '.md\\:hidden.inline-flex.items-center.justify-center.gap-1'
+      '.lg\\:hidden.inline-flex.items-center.justify-center.gap-1'
     );
     expect(mobileControls).toBeInTheDocument();
   });