Merge branch 'main' into feat/historical-trend-view

Author: JhaSourav07

.github/workflows/conflict-notifier.yml

@@ -81,7 +81,7 @@ jobs:
                   });
                 }
 
-                // Check existing comments to enforce a 2-hour notification gap
+                // Check existing comments to enforce a 24-hour notification gap
                 const { data: comments } = await github.rest.issues.listComments({
                   owner: context.repo.owner,
                   repo: context.repo.repo,
@@ -101,8 +101,8 @@ jobs:
                   const lastComment = conflictComments[conflictComments.length - 1];
                   const lastCommentTime = new Date(lastComment.created_at).getTime();
                   const nowTime = new Date().getTime();
-                  const TWO_HOURS_MS = 2 * 60 * 60 * 1000;
-                  if (nowTime - lastCommentTime >= TWO_HOURS_MS) {
+                  const TWENTY_FOUR_HOURS_MS = 24 * 60 * 60 * 1000;
+                  if (nowTime - lastCommentTime >= TWENTY_FOUR_HOURS_MS) {
                     shouldComment = true;
                   }
                 }

README.md

@@ -189,6 +189,7 @@ URL Parameter > Theme Default > System Fallback
 | `labelColor`      | `hex`     | No         | —                              | Custom text color for the isometric labels — **without** `#`                                                                                                              |
 | `versus`          | `string`  | No         | —                              | GitHub username of an opponent to compare against in side-by-side versus mode                                                                                             |
 | `shading`         | `boolean` | No         | `false`                        | Apply intensity-based opacity shading to tower faces so lower intensity levels appear slightly dimmer                                                                     |
+| `opacity`         | `number`  | No         | `1.0`                          | Global opacity scalar for all tower fill-opacity values (0.1–1.0). `opacity=0.5` = semi-transparent ghost look. `opacity=0.8` = faded, great on light backgrounds.        |
 | `gradient`        | `boolean` | No         | `false`                        | Opt-in to show volumetric gradients on the monolith floor                                                                                                                 |
 
 ### Grace Period Examples
@@ -322,6 +323,14 @@ Explore some of the built-in CommitPulse themes and quickly copy the style you l
 
 ![](https://commitpulse.vercel.app/api/streak?user=jhasourav07&gradient=true&shading=true)
 
+<!-- Semi-transparent ghost city look -->
+
+![](https://commitpulse.vercel.app/api/streak?user=jhasourav07&opacity=0.5)
+
+<!-- Slightly faded — perfect for light background embeds -->
+
+![](https://commitpulse.vercel.app/api/streak?user=jhasourav07&opacity=0.8)
+
 <!-- GitHub-style Heatmap View -->
 
 ![](https://commitpulse.vercel.app/api/streak?user=jhasourav07&view=heatmap)

app/api/compare/route.test.ts

@@ -0,0 +1,93 @@
+import { describe, it, expect, vi, beforeEach } from 'vitest';
+import { GET } from './route';
+
+vi.mock('@/lib/github', () => ({
+  getFullDashboardData: vi.fn(),
+}));
+
+import { getFullDashboardData } from '@/lib/github';
+
+const makeRequest = (search: string) => new Request(`http://localhost:3000/api/compare?${search}`);
+
+describe('GET /api/compare', () => {
+  beforeEach(() => {
+    vi.clearAllMocks();
+    vi.mocked(getFullDashboardData).mockResolvedValue({
+      calendar: { totalContributions: 50, weeks: [] },
+    } as never);
+  });
+
+  // ── Validation ────────────────────────────────────────────────────────────
+
+  it('returns 400 when user1 is missing', async () => {
+    const res = await GET(makeRequest('user2=octocat'));
+    expect(res.status).toBe(400);
+  });
+
+  it('returns 400 when user2 is missing', async () => {
+    const res = await GET(makeRequest('user1=octocat'));
+    expect(res.status).toBe(400);
+  });
+
+  it('returns 400 when both users are missing', async () => {
+    const res = await GET(makeRequest(''));
+    expect(res.status).toBe(400);
+  });
+
+  it('returns 400 for invalid GitHub username format for user1', async () => {
+    const res = await GET(makeRequest('user1=-invalid&user2=octocat'));
+    expect(res.status).toBe(400);
+    const data = await res.json();
+    expect(data.details.fieldErrors.user1).toBeDefined();
+  });
+
+  it('returns 400 for invalid GitHub username format for user2', async () => {
+    const res = await GET(makeRequest('user1=octocat&user2=-invalid'));
+    expect(res.status).toBe(400);
+    const data = await res.json();
+    expect(data.details.fieldErrors.user2).toBeDefined();
+  });
+
+  it('returns 400 for username exceeding 39 characters', async () => {
+    const res = await GET(makeRequest(`user1=${'a'.repeat(40)}&user2=octocat`));
+    expect(res.status).toBe(400);
+  });
+
+  it('returns 400 when comparing a user with themselves', async () => {
+    const res = await GET(makeRequest('user1=octocat&user2=octocat'));
+    expect(res.status).toBe(400);
+    const data = await res.json();
+    expect(data.details.fieldErrors.user2).toContain('Cannot compare a user with themselves.');
+  });
+
+  it('returns 400 for self-comparison regardless of case', async () => {
+    const res = await GET(makeRequest('user1=OctoCat&user2=octocat'));
+    expect(res.status).toBe(400);
+  });
+
+  // ── Success ──────────────────────────────────────────────────────────────
+
+  it('returns 200 with comparison data for valid users', async () => {
+    const res = await GET(makeRequest('user1=alice&user2=bob'));
+    expect(res.status).toBe(200);
+    const data = await res.json();
+    expect(data.user1).toBeDefined();
+    expect(data.user2).toBeDefined();
+  });
+
+  // ── Error handling ────────────────────────────────────────────────────────
+
+  it('returns 404 when user1 is not found on GitHub', async () => {
+    vi.mocked(getFullDashboardData).mockRejectedValueOnce(new Error('Not found'));
+    const res = await GET(makeRequest('user1=ghost123&user2=octocat'));
+    expect(res.status).toBe(404);
+  });
+
+  it('returns 404 when user2 is not found on GitHub', async () => {
+    vi.mocked(getFullDashboardData)
+      .mockResolvedValueOnce({ calendar: { totalContributions: 0, weeks: [] } } as never)
+      .mockRejectedValueOnce(new Error('Not found'));
+    const res = await GET(makeRequest('user1=octocat&user2=ghost123'));
+    expect(res.status).toBe(404);
+  });
+});

app/api/compare/route.ts

@@ -1,23 +1,23 @@
 import { NextResponse } from 'next/server';
 import { getFullDashboardData } from '@/lib/github';
+import { compareParamsSchema } from '@/lib/validations';
 
 export const revalidate = 3600;
 
 export async function GET(request: Request) {
   const { searchParams } = new URL(request.url);
-  const user1 = searchParams.get('user1');
-  const user2 = searchParams.get('user2');
 
-  if (!user1 || !user2) {
+  const parseResult = compareParamsSchema.safeParse(Object.fromEntries(searchParams.entries()));
+
+  if (!parseResult.success) {
+    const fieldErrors = parseResult.error.flatten();
     return NextResponse.json(
-      { error: 'Both user1 and user2 query parameters are required.' },
+      { error: 'Invalid parameters', details: fieldErrors },
       { status: 400 }
     );
   }
 
-  if (user1.toLowerCase() === user2.toLowerCase()) {
-    return NextResponse.json({ error: 'Cannot compare a user with themselves.' }, { status: 400 });
-  }
+  const { user1, user2 } = parseResult.data;
 
   try {
     const [result1, result2] = await Promise.allSettled([