{feat} CordCat new features, updated deprecated modals

Author: nay-cat

analyzers/CordCat/CordCatModal.tsx

@@ -23,6 +23,69 @@ interface BreachData {
     discordname?: string;
     categories?: string[];
     date?: string;
+    fields?: Record<string, string>;
+}
+
+interface IPGeoData {
+    asn?: string;
+    organization?: string;
+    country?: string;
+}
+
+interface FivemResult {
+    id: number;
+    license?: string | null;
+    license2?: string | null;
+    steam?: string | null;
+    name?: string | null;
+    ip?: string | null;
+    discord_id?: string | null;
+    discord_name?: string | null;
+    email?: string | null;
+    source_file?: string | null;
+    ip_asn?: IPGeoData | null;
+}
+
+interface ScoreSignal {
+    key: string;
+    label: string;
+    detail?: string;
+    points: number;
+    kind: "good" | "risk";
+}
+
+interface BotInfo {
+    score: number;
+    level: string;
+    isBot: boolean;
+    reasons?: string[];
+}
+
+interface ScoreData {
+    risk: number;
+    level: string;
+    signals?: ScoreSignal[];
+    bot?: BotInfo;
+}
+
+interface MetaData {
+    cached?: boolean;
+    fetchedAt?: string;
+    lastChecked?: string | null;
+    changes?: unknown[];
+}
+
+interface BreachResponseData {
+    results?: BreachData[];
+    bySource?: Record<string, Record<string, string>[] | null>;
+    ipGeo?: Record<string, IPGeoData>;
+}
+
+interface GuildTag {
+    tag: string;
+    identity_guild_id: string;
+    identity_enabled: boolean;
+    badge?: string;
 }
 
 interface UserInfo {
@@ -32,23 +95,48 @@ interface UserInfo {
     discriminator?: string;
     avatar?: string;
     banner?: string;
+    banner_color?: string | null;
     public_flags?: number;
+    flags?: number;
     accent_color?: number | null;
-    clan?: { tag: string; identity_guild_id: string; identity_enabled: boolean; };
-    primary_guild?: { tag: string; identity_guild_id: string; identity_enabled: boolean; };
+    avatar_decoration_data?: unknown;
+    collectibles?: unknown;
+    display_name_styles?: unknown;
+    clan?: GuildTag;
+    primary_guild?: GuildTag;
 }
 
 const TEXT_NORMAL = "var(--text-normal, var(--header-primary, #dcddde))";
 const TEXT_MUTED = "var(--text-muted, var(--header-secondary, #b5bac1))";
 
+const RISK_COLORS: Record<string, string> = {
+    low: "var(--status-positive)",
+    medium: "var(--text-warning)",
+    high: "var(--status-danger)",
+    critical: "var(--status-danger)",
+};
+
+const SIGNAL_COLORS: Record<ScoreSignal["kind"], string> = {
+    risk: "var(--status-danger)",
+    good: "var(--status-positive)",
+};
+
 function fmtEnum(value: string | undefined, prefix: string) {
     return (value ?? "UNKNOWN").replace(prefix, "").replace(/_/g, " ");
 }
 
-function fmtDate(value: string | undefined) {
+function fmtDate(value: string | undefined | null) {
     return value ? String(value).slice(0, 10) : "—";
 }
 
+function fmtDateTime(value: string | undefined | null) {
+    return value ? String(value).replace("T", " ").slice(0, 19) : "—";
+}
+
+function riskColor(level: string | undefined) {
+    return RISK_COLORS[(level ?? "").toLowerCase()] ?? TEXT_MUTED;
+}
+
 function Tag({ children, color }: { children: React.ReactNode; color: string; }) {
     return (
         <span style={{ background: color, color: "#fff", borderRadius: 3, padding: "1px 6px", fontSize: 11, fontWeight: 700, textTransform: "uppercase" as const }}>
@@ -74,7 +162,7 @@ function SanctionCard({ s }: { s: StatementData; }) {
                 <Tag color="var(--text-warning)">{fmtEnum(s.category, "STATEMENT_CATEGORY_")}</Tag>
                 {s.incompatible_content_illegal === "Yes" && <Tag color="#7b0000">ILLEGAL</Tag>}
             </div>
-            {/* {s.incompatible_content_ground && <Field label="Rule broken" value={s.incompatible_content_ground} />} */}
+            {s.incompatible_content_ground && <Field label="Rule broken" value={s.incompatible_content_ground} />}
             {s.incompatible_content_explanation && <Field label="Explanation" value={s.incompatible_content_explanation} />}
             {s.category_specification_other && <Field label="Sub-category" value={s.category_specification_other} />}
             {s.decision_facts && <Field label="Facts" value={s.decision_facts} />}
@@ -96,6 +184,36 @@ function BreachCard({ b }: { b: BreachData; }) {
     );
 }
 
+function FivemCard({ r }: { r: FivemResult; }) {
+    return (
+        <div style={{ borderLeft: "3px solid var(--brand-experiment, #5865f2)", background: "var(--background-secondary)", borderRadius: 4, padding: "8px 12px", marginBottom: 6 }}>
+            <div style={{ fontWeight: 700, marginBottom: 4 }}>{r.source_file ?? `Result #${r.id}`}</div>
+            {r.name && <Field label="Name" value={r.name} />}
+            {r.license && <Field label="License" value={r.license} />}
+            {r.steam && <Field label="Steam" value={r.steam} />}
+            {r.ip && <Field label="IP" value={r.ip} />}
+            {r.discord_name && <Field label="Discord name" value={r.discord_name} />}
+            {r.email && <Field label="Email" value={r.email} />}
+            {r.ip_asn && (
+                <Field label="IP location" value={[r.ip_asn.organization, r.ip_asn.country].filter(Boolean).join(" — ")} />
+            )}
+        </div>
+    );
+}
+
+function SignalRow({ s }: { s: ScoreSignal; }) {
+    const points = s.points >= 0 ? `+${s.points}` : String(s.points);
+    return (
+        <div style={{ display: "flex", gap: 8, alignItems: "baseline", fontSize: 13, marginBottom: 4 }}>
+            <Tag color={SIGNAL_COLORS[s.kind]}>{points}</Tag>
+            <div>
+                <span style={{ color: TEXT_NORMAL, fontWeight: 600 }}>{s.label}</span>
+                {s.detail && <span style={{ color: TEXT_MUTED }}> — {s.detail}</span>}
+            </div>
+        </div>
+    );
+}
+
 function SectionTitle({ children }: { children: React.ReactNode; }) {
     return (
         <div style={{ fontSize: 11, fontWeight: 700, textTransform: "uppercase" as const, letterSpacing: "0.06em", color: TEXT_MUTED, borderBottom: "1px solid var(--background-modifier-accent)", paddingBottom: 3, marginBottom: 8, marginTop: 4 }}>
@@ -107,20 +225,27 @@ function SectionTitle({ children }: { children: React.ReactNode; }) {
 export function CordCatModal({ data }: { data: any; }) {
     const u: UserInfo = data.userInfo ?? {};
     const statements: StatementData[] = data.statements ?? [];
+    const score: ScoreData | undefined = data.score;
+    const meta: MetaData | undefined = data.meta;
 
-    // Handle breach data with fallbacks
-    let breachResults: any[] = [];
+    let breachResults: BreachData[] = [];
     let breachError: string | null = null;
+    let ipGeo: Record<string, IPGeoData> = {};
     if (data.breach) {
         if (data.breach.success === false && data.breach.error) {
             breachError = `${data.breach.error.status}: ${data.breach.error.message}`;
-        } else if (Array.isArray(data.breach.data?.results)) {
-            breachResults = data.breach.data.results;
-        } else if (Array.isArray(data.breach?.results)) {
-            breachResults = data.breach.results;
+        } else {
+            const breachData: BreachResponseData | undefined = data.breach.data ?? data.breach;
+            if (Array.isArray(breachData?.results)) {
+                breachResults = breachData.results;
+                ipGeo = breachData.ipGeo ?? {};
+            }
         }
     }
-    const breachCount: number = data.breach?.resultsCount ?? breachResults.length ?? 0;
+    const breachCount: number = data.breach?.resultsCount ?? breachResults.length;
+
+    const fivemResults: FivemResult[] = Array.isArray(data.fivem?.data?.results) ? data.fivem.data.results : [];
+    const fivemTotal: number = data.fivem?.data?.total ?? fivemResults.length;
 
     const avatar = u.avatar
         ? `https://cdn.discordapp.com/avatars/${u.id}/${u.avatar}.${u.avatar.startsWith("a_") ? "gif" : "png"}?size=80`
@@ -136,8 +261,8 @@ export function CordCatModal({ data }: { data: any; }) {
 
     const guild = u.clan ?? u.primary_guild;
     const uniqueIPs = [...new Set(breachResults
-        .map((b: any) => b.ip)
-        .filter((ip: any) => typeof ip === "string" && ip.length > 0)
+        .map(b => b.ip)
+        .filter((ip): ip is string => typeof ip === "string" && ip.length > 0)
     )];
 
     return (
@@ -163,8 +288,37 @@ export function CordCatModal({ data }: { data: any; }) {
                 <Tag color={breachCount > 0 ? "var(--text-warning)" : "var(--status-positive)"}>
                     {breachCount > 0 ? `${breachCount} breach${breachCount !== 1 ? "es" : ""}` : "No breaches"}
                 </Tag>
+                {score && (
+                    <Tag color={riskColor(score.level)}>Risk {score.risk} ({score.level})</Tag>
+                )}
+                {score?.bot?.isBot && (
+                    <Tag color="var(--status-danger)">Likely bot</Tag>
+                )}
             </div>
 
+            {score && (<>
+                <SectionTitle>Risk Score</SectionTitle>
+                <div style={{ display: "flex", gap: 12, alignItems: "center", marginBottom: 8 }}>
+                    <div style={{ fontSize: 22, fontWeight: 800, color: riskColor(score.level) }}>{score.risk}</div>
+                    <div>
+                        <div style={{ fontSize: 13, fontWeight: 700, color: TEXT_NORMAL, textTransform: "capitalize" as const }}>{score.level} risk</div>
+                        {score.bot && (
+                            <div style={{ fontSize: 12, color: TEXT_MUTED }}>
+                                Bot likelihood: <span style={{ color: TEXT_NORMAL }}>{score.bot.level}</span> ({score.bot.score}/100)
+                            </div>
+                        )}
+                    </div>
+                </div>
+                {score.signals && score.signals.length > 0 && (
+                    <div style={{ marginBottom: 8 }}>
+                        {score.signals.map((s, i) => <SignalRow key={i} s={s} />)}
+                    </div>
+                )}
+                {score.bot?.reasons && score.bot.reasons.length > 0 && (
+                    <Field label="Bot reasons" value={score.bot.reasons.join(", ")} />
+                )}
+            </>)}
+
             <SectionTitle>User Info</SectionTitle>
             {u.global_name && <Field label="Display name" value={u.global_name} />}
             <Field label="Username" value={u.username ?? "—"} />
@@ -192,15 +346,43 @@ export function CordCatModal({ data }: { data: any; }) {
                 </div>
             ) : uniqueIPs.length > 0 && (
                 <div style={{ marginBottom: 8, fontSize: 13 }}>
-                    <span style={{ color: TEXT_MUTED }}>Leaked IPs: </span>
-                    {uniqueIPs.map((ip, i) => <code key={i} style={{ marginRight: 8 }}>{ip}</code>)}
+                    <div style={{ color: TEXT_MUTED, marginBottom: 2 }}>Leaked IPs:</div>
+                    {uniqueIPs.map((ip, i) => {
+                        const geo = ipGeo[ip];
+                        return (
+                            <div key={i} style={{ display: "flex", gap: 8, alignItems: "baseline", marginBottom: 2 }}>
+                                <code>{ip}</code>
+                                {geo && (
+                                    <span style={{ color: TEXT_MUTED, fontSize: 12 }}>
+                                        {[geo.organization, geo.asn, geo.country].filter(Boolean).join(" • ")}
+                                    </span>
+                                )}
+                            </div>
+                        );
+                    })}
                 </div>
             )}
             {breachError ? null : breachResults.length === 0
                 ? <div style={{ color: TEXT_MUTED, fontSize: 13 }}>No breach data found.</div>
                 : breachResults.map((b, i) => <BreachCard key={i} b={b} />)
             }
 
+            {data.fivem && (<>
+                <SectionTitle>FiveM Leaks ({fivemTotal})</SectionTitle>
+                {fivemResults.length === 0
+                    ? <div style={{ color: TEXT_MUTED, fontSize: 13 }}>No FiveM data found.</div>
+                    : fivemResults.map((r, i) => <FivemCard key={i} r={r} />)
+                }
+            </>)}
+
+            {meta && (
+                <div style={{ marginTop: 14, paddingTop: 8, borderTop: "1px solid var(--background-modifier-accent)", display: "flex", flexWrap: "wrap" as const, gap: 12, fontSize: 11, color: TEXT_MUTED }}>
+                    <span>{meta.cached ? "Served from cache" : "Freshly fetched"}</span>
+                    {meta.fetchedAt && <span>Fetched: {fmtDateTime(meta.fetchedAt)}</span>}
+                    {meta.lastChecked && <span>Last checked: {fmtDateTime(meta.lastChecked)}</span>}
+                </div>
+            )}
+
         </div>
     );
 }

analyzers/CordCat/index.tsx

@@ -4,30 +4,25 @@
  * SPDX-License-Identifier: GPL-3.0-or-later
  */
 
-import { ModalContent, ModalFooter, ModalHeader, ModalRoot, ModalSize, openModal } from "@utils/modal";
 import { PluginNative } from "@utils/types";
-import { Button, React, Toasts } from "@webpack/common";
+import { Modal, openModal, React, Toasts } from "@webpack/common";
 
 import { safeToast } from "../../utils";
 import { CordCatModal } from "./CordCatModal";
 import { settings } from "../../settings";
-import { result } from "lodash";
 
 const Native = VencordNative.pluginHelpers.vAnalyzer as PluginNative<typeof import("./native")>;
 
 export async function analyzeUserWithCordCat(userId: string, username: string): Promise<void> {
-    safeToast(`Querying CordCat for ${username}...`);
-
-    const apiKey = settings.store.cordCatApiKey;
-    let result;
-
+    const apiKey = settings.store.cordCatApiKey?.trim();
     if (!apiKey) {
-        // sometimes cordcat returns data without an apikey, but is unreliable, for some reason the request works without the apikey
-        result = await Native.queryCordCat(userId);
-    } else {
-        result = await Native.queryCordCat(userId, apiKey);
+        safeToast("CordCat requires an API key. Set it in vAnalyzer settings.", Toasts.Type.FAILURE);
+        return;
     }
 
+    safeToast(`Querying CordCat for ${username}...`);
+
+    const result = await Native.queryCordCat(userId, apiKey);
 
     if (result.status !== 200) {
         safeToast(`CordCat lookup failed: HTTP ${result.status}`, Toasts.Type.FAILURE);
@@ -46,16 +41,13 @@ export async function analyzeUserWithCordCat(userId: string, username: string):
     const title = `CordCat: ${data.userInfo?.global_name || username}${suffix}`;
 
     openModal(modalProps => (
-        <ModalRoot {...modalProps} size={ModalSize.MEDIUM}>
-            <ModalHeader>
-                <span style={{ fontWeight: 700, fontSize: 16, color: "var(--white-500, #fff)" }}>{title}</span>
-            </ModalHeader>
-            <ModalContent>
-                <CordCatModal data={data} />
-            </ModalContent>
-            <ModalFooter>
-                <Button onClick={modalProps.onClose}>Close</Button>
-            </ModalFooter>
-        </ModalRoot>
+        <Modal
+            {...modalProps}
+            size="md"
+            title={title}
+            actions={[{ text: "Close", variant: "secondary", onClick: modalProps.onClose }]}
+        >
+            <CordCatModal data={data} />
+        </Modal>
     ));
 }

analyzers/CordCat/native.ts

@@ -18,7 +18,7 @@ function evictOldest() {
     }
 }
 
-export async function queryCordCat(_: IpcMainInvokeEvent, userId: string, apiKey?: string): Promise<{ status: number; data: any; }> {
+export async function queryCordCat(_: IpcMainInvokeEvent, userId: string, apiKey: string): Promise<{ status: number; data: any; }> {
     const cached = resultCache.get(userId);
     if (cached) {
         // move to end
@@ -28,12 +28,11 @@ export async function queryCordCat(_: IpcMainInvokeEvent, userId: string, apiKey
     }
 
     try {
-
         const res = await fetch(`https://api.cord.cat/api/v2/query/${userId}`, {
             headers: {
                 "accept": "application/json",
                 "user-agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/124.0.0.0 Safari/537.36",
-                "authorization": apiKey ? `Bearer ${apiKey}` : "",
+                "authorization": `Bearer ${apiKey}`,
             }
         });