Fix UTC display format (.00 → :00) with unresolved negative offset handling

api/cards/productive-time.ts

@@ -3,37 +3,63 @@ import {changToNextGitHubToken} from '../utils/github-token-updater';
 import {getErrorMsgCard} from '../utils/error-card';
 import type {VercelRequest, VercelResponse} from '@vercel/node';
 
+const parseUTCOffset = (offsetParam: string): number => {
+    const normalized = offsetParam.replace(/:/g, '.');
+    const parsed = parseFloat(normalized);
+
+    if (isNaN(parsed)) {
+        throw new Error(`Invalid UTC offset: ${offsetParam}. Valid examples: 8, -5.5, -3:30`);
+    }
+
+    if (parsed < -12 || parsed > 14) {
+        throw new Error('UTC offset must be between -12 and +14');
+    }
+
+    return parsed;
+};
+
 export default async (req: VercelRequest, res: VercelResponse) => {
     const {username, theme = 'default', utcOffset = '0'} = req.query;
+
     if (typeof theme !== 'string') {
-        res.status(400).send('theme must be a string');
-        return;
+        return res.status(400).send('theme must be a string');
     }
     if (typeof username !== 'string') {
-        res.status(400).send('username must be a string');
-        return;
+        return res.status(400).send('username must be a string');
     }
     if (typeof utcOffset !== 'string') {
-        res.status(400).send('utcOffset must be a string');
-        return;
+        return res.status(400).send('utcOffset must be a string');
     }
+
     try {
+        const validatedOffset = parseUTCOffset(utcOffset);
+
         let tokenIndex = 0;
         while (true) {
             try {
-                const cardSVG = await getProductiveTimeSVGWithThemeName(username, theme, Number(utcOffset));
+                const cardSVG = await getProductiveTimeSVGWithThemeName(
+                    username,
+                    theme,
+                    validatedOffset
+                );
                 res.setHeader('Content-Type', 'image/svg+xml');
-                res.send(cardSVG);
-                return;
+                return res.send(cardSVG);
             } catch (err: any) {
-                console.log(err.message);
-                // We update github token and try again, until getNextGitHubToken throw an Error
-                changToNextGitHubToken(tokenIndex);
-                tokenIndex += 1;
+                console.error('API Error:', err.message);
+
+                if (err.message.includes('Bad credentials')) {
+                    changToNextGitHubToken(tokenIndex);
+                    tokenIndex += 1;
+                } else {
+                    throw err;
+                }
             }
         }
     } catch (err: any) {
-        console.log(err);
-        res.send(getErrorMsgCard(err.message, theme));
+        console.error('Final Error:', err);
+        return res.send(getErrorMsgCard(
+            `Failed to generate card: ${err.message}`,
+            theme
+        ));
     }
 };

src/templates/productive-time-card.ts

@@ -4,7 +4,24 @@ import * as d3 from 'd3';
 import * as d3Axis from 'd3-axis';
 
 export function createProductiveCard(chartData: number[], theme: Theme, utcOffset: number) {
-    const title = 'Commits ' + '(UTC ' + (utcOffset >= 0 ? '+' : '') + utcOffset.toFixed(2) + ')';
+    const formatUTCOffset = (offset: number): string => {
+        if (offset >= 14) return 'UTC+14:00';
+        if (offset <= -12) return 'UTC-12:00';
+
+        const sign = offset >= 0 ? '+' : '-';
+        const absOffset = Math.abs(offset);
+
+        const hours = Math.floor(absOffset);
+        const minutes = Math.round((absOffset - hours) * 60);
+
+        if (minutes >= 60) {
+            return `UTC${sign}${hours + 1}:00`;
+        }
+
+        return `UTC${sign}${hours}:${minutes.toString().padStart(2, '0')}`;
+    };
+
+    const title = `Commits ${formatUTCOffset(utcOffset)}`;
     const card = new Card(title, 340, 200, theme);
     const svg = card.getSVG();