From 5684fa9d8b4470de429e648f4d93fc26fcddbdbe Mon Sep 17 00:00:00 2001
From: PalmDevs <git@palmdevs.me>
Date: Tue, 19 Aug 2025 22:14:45 +0700
Subject: [PATCH] feat: use native bridge for alerting errors

---
 src/init.ts    |  2 +-
 src/preinit.ts | 29 +++++++++++++++--------------
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/src/init.ts b/src/init.ts
index 6af55e1..99aa28a 100644
--- a/src/init.ts
+++ b/src/init.ts
@@ -3,7 +3,7 @@ import '@revenge-mod/react/init'
 import '@revenge-mod/storage/init'
 
 import { onRunApplication } from '@revenge-mod/react/native'
-import { onError } from './preinit'
+import { onError } from '~preinit'
 
 const unsub = onRunApplication(() => {
     unsub()
diff --git a/src/preinit.ts b/src/preinit.ts
index 3dcff95..3fce30b 100644
--- a/src/preinit.ts
+++ b/src/preinit.ts
@@ -5,8 +5,9 @@ import {
     onModuleFirstRequired,
     onModuleInitialized,
 } from '@revenge-mod/modules/metro/subscriptions'
+import { callBridgeMethod } from '@revenge-mod/modules/native'
 import { getErrorStack } from '@revenge-mod/utils/error'
-import { BuildEnvironment, FullVersion } from './constants'
+import { BuildEnvironment, FullVersion } from '~constants'
 
 const IndexModuleId = 0
 
@@ -49,19 +50,19 @@ onModuleFirstRequired(IndexModuleId, function onIndexRequired() {
     }
 })
 
-export function onError(e: unknown) {
-    // TODO(init): Move to use native provided alert function, which will accept a string stack trace
-    // Above will reduce the need for runCatching() to exist, as the code won't be able to be deduped any further
-    const { ClientInfoModule, DeviceModule } =
-        require('@revenge-mod/discord/native') as typeof import('@revenge-mod/discord/native')
+export function onError(error: unknown) {
+    const stack = getErrorStack(error) ?? String(error)
 
-    const Client = ClientInfoModule.getConstants()
-    const Device = DeviceModule.getConstants()
+    callBridgeMethod('revenge.alertError', [
+        stack,
+        `${FullVersion} (${BuildEnvironment})`,
+    ])
 
-    alert(
-        `Failed to load Revenge (${FullVersion} (${BuildEnvironment}))\n` +
-            `Discord: ${Client.Version} (${Client.Build})\n` +
-            `Device: ${Device.deviceManufacturer} ${Device.deviceModel}\n\n` +
-            getErrorStack(e),
-    )
+    nativeLoggingHook(`\u001b[31m${stack}\u001b[0m`, 2)
+}
+
+declare module '@revenge-mod/modules/native' {
+    export interface Methods {
+        'revenge.alertError': [[error: string, title?: string], void]
+    }
 }