From 773d35e85e10fd6c47999f2312b2ea4f5fcedef1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Yusuf=20=C4=B0pek?= <yusufipek@protonmail.com>
Date: Sun, 5 Oct 2025 04:23:38 +0300
Subject: [PATCH] refactor: simplify superchat amount extraction and display
 logic

---
 backend/src/ingestion/youtubei.ts | 65 +++++++------------------------
 client/app/dashboard/page.tsx     |  2 +-
 client/app/globals.css            |  1 +
 3 files changed, 17 insertions(+), 51 deletions(-)

diff --git a/backend/src/ingestion/youtubei.ts b/backend/src/ingestion/youtubei.ts
index 21f368e..1650b71 100644
--- a/backend/src/ingestion/youtubei.ts
+++ b/backend/src/ingestion/youtubei.ts
@@ -157,7 +157,6 @@ function extractBadges(item: any): Badge[] {
 }
 
 function extractSuperChatInfo(item: any): SuperChatInfo | undefined {
-  // Support multiple superchat-like types from Innertube
   const superTypes = new Set([
     'LiveChatPaidMessage',
     'LiveChatPaidSticker',
@@ -168,8 +167,7 @@ function extractSuperChatInfo(item: any): SuperChatInfo | undefined {
   const isSuper = superTypes.has(typeName) || !!(item.purchase_amount_text || item.purchaseAmountText);
   if (!isSuper) return undefined;
 
-  // Try multiple possible field names for the amount (search shallow + nested header)
-  let amount = '';
+  let amountText = '';
   const candidates = [
     item.purchase_amount_text,
     item.purchaseAmountText,
@@ -185,58 +183,25 @@ function extractSuperChatInfo(item: any): SuperChatInfo | undefined {
     if (typeof v === 'number') return String(v);
     if (typeof v.simpleText === 'string') return v.simpleText;
     if (Array.isArray(v.runs)) return v.runs.map((r: any) => r.text ?? '').join('');
-    if (typeof v.toString === 'function') return v.toString();
     return '';
   }
 
   for (const v of candidates) {
-    amount = toText(v);
-    if (amount) break;
+    amountText = toText(v);
+    if (amountText) break;
   }
 
-  // Fallback deep scan for a purchase/amount text-like field
-  if (!amount) {
-    try {
-      const stack: any[] = [item];
-      const seen = new Set<any>();
-      while (stack.length) {
-        const cur = stack.pop();
-        if (!cur || typeof cur !== 'object' || seen.has(cur)) continue;
-        seen.add(cur);
-        for (const [k, v] of Object.entries(cur)) {
-          if (/purchase.*amount.*text|purchaseAmountText|amountText|purchase_amount_text/i.test(k)) {
-            amount = toText(v);
-            if (amount) throw new Error('_found');
-          }
-          if (v && typeof v === 'object') stack.push(v);
-        }
-      }
-    } catch (e: any) {
-      if (e?.message !== '_found') throw e;
+  let amount = 'Super Chat';
+  let currency = '';
+
+  if (amountText) {
+    const match = amountText.match(/^([\$\€\£\¥\₹\₺A-Z]+)?\s*([\d,\.]+)/);
+    if (match) {
+      currency = match[1] || '';
+      amount = match[2];
     }
   }
 
-  // Last resort: search any string-like leaf for a currency pattern
-  if (!amount) {
-    const currencyPattern = /([€$£¥₹]|AUD|USD|EUR|GBP|JPY|INR)\s?\d{1,3}(?:[\,\s]?\d{3})*(?:[\.,]\d{1,2})?/i;
-    const stack: any[] = [item];
-    const seen = new Set<any>();
-    while (stack.length) {
-      const cur = stack.pop();
-      if (!cur || typeof cur !== 'object' || seen.has(cur)) continue;
-      seen.add(cur);
-      for (const v of Object.values(cur)) {
-        if (typeof v === 'string') {
-          const m = v.match(currencyPattern);
-          if (m) { amount = m[0]; stack.length = 0; break; }
-        } else if (v && typeof v === 'object') {
-          stack.push(v);
-        }
-      }
-    }
-  }
-
-  // Normalize color; Innertube often provides ARGB/number
   let rawColor = item.body_background_color ?? item.bodyBackgroundColor ?? item.headerBackgroundColor;
   let color = '#1e3a8a';
   if (rawColor != null) {
@@ -250,8 +215,8 @@ function extractSuperChatInfo(item: any): SuperChatInfo | undefined {
   }
 
   return {
-    amount: amount || 'Super Chat',
-    currency: item.currency ?? 'USD',
+    amount,
+    currency,
     color
   };
 }
@@ -280,10 +245,10 @@ function normalizeAction(action: any): ChatMessage | null {
     
     // Extract membership level for new members
     let membershipLevel: string | undefined;
-    if (isMembership || isGiftPurchase || isGiftReceived) {
+    if (isMembership || isGiftPurchase || isGiftReceived || isPaid) {
       membershipLevel = item.header_subtext?.toString() || 
                        item.header_primary_text?.toString() || 
-                       'New member';
+                       (isPaid ? undefined : 'New member');
     }
     
     return {
diff --git a/client/app/dashboard/page.tsx b/client/app/dashboard/page.tsx
index 9af7bc5..abe6baa 100644
--- a/client/app/dashboard/page.tsx
+++ b/client/app/dashboard/page.tsx
@@ -409,7 +409,7 @@ function ChatItem({ message, isSelected, onSelect }: ChatItemProps) {
       </div>
       {message.superChat && (
         <div className="chatItem__superchat" style={{ backgroundColor: message.superChat.color }}>
-          💰 {message.superChat.amount} {message.superChat.currency}
+          💰 {message.superChat.currency}{message.superChat.amount}
         </div>
       )}
       <p className="chatItem__text">{message.text}</p>
diff --git a/client/app/globals.css b/client/app/globals.css
index 141a988..3467ce9 100644
--- a/client/app/globals.css
+++ b/client/app/globals.css
@@ -519,6 +519,7 @@ main {
   overflow-y: auto;
   overflow-x: hidden;
   padding-right: 0.25rem;
+  padding-bottom: 1rem; /* Add space at the bottom */
   min-height: 0;
 }