From 9cbc9b1729842d9fa251355c63108e63257a1c5e Mon Sep 17 00:00:00 2001
From: ppc <albie@ppc.moe>
Date: Thu, 15 Aug 2024 09:37:22 +0100
Subject: [PATCH 1/2] mirror amnet-native json responses

---
 AimeNet/AppJsonSerializerContext.cs | 6 +++---
 AimeNet/DllMain.cs                  | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/AimeNet/AppJsonSerializerContext.cs b/AimeNet/AppJsonSerializerContext.cs
index 88c11c3..41fc560 100644
--- a/AimeNet/AppJsonSerializerContext.cs
+++ b/AimeNet/AppJsonSerializerContext.cs
@@ -3,11 +3,11 @@
 namespace AimeNet;
 
 public record SystemState(
-    [property: JsonPropertyName("api_ver")] int ApiVersion,
-    [property: JsonPropertyName("server_name")] string ServerName);
+    [property: JsonPropertyName("apiVersion")] int ApiVersion,
+    [property: JsonPropertyName("serverName")] string ServerName);
 
 public record CardReadRequest(
-    [property: JsonPropertyName("card_id")] string MatrixCode);
+    [property: JsonPropertyName("cardId")] string MatrixCode);
 
 [JsonSerializable(typeof(SystemState))]
 [JsonSerializable(typeof(CardReadRequest))]
diff --git a/AimeNet/DllMain.cs b/AimeNet/DllMain.cs
index ade2ed3..74e8300 100644
--- a/AimeNet/DllMain.cs
+++ b/AimeNet/DllMain.cs
@@ -19,7 +19,7 @@ namespace AimeNet;
 public static class DllMain
 {
     private const int ApiVersion = 1;
-    private const string WebAddress = "http://amnet.ppc.moe";
+    private const string WebAddress = "http://card.ppc.moe";
 
     private static ILogger _serverLogger;
 

From 275c238d4e07ab42799c0db63f44a19b7a6e8396 Mon Sep 17 00:00:00 2001
From: ppc <albie@ppc.moe>
Date: Thu, 15 Aug 2024 09:39:48 +0100
Subject: [PATCH 2/2] apply aimenet-web changes

---
 aimenet-web/src/lib/aime-net.ts          | 4 ++--
 aimenet-web/src/pages/card-in-screen.tsx | 4 ++--
 aimenet-web/src/pages/server-listing.tsx | 8 ++++----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/aimenet-web/src/lib/aime-net.ts b/aimenet-web/src/lib/aime-net.ts
index eac9a26..9066abe 100644
--- a/aimenet-web/src/lib/aime-net.ts
+++ b/aimenet-web/src/lib/aime-net.ts
@@ -1,8 +1,8 @@
 export const AIMENET_API_VERSION = 1;
 
 export interface AimeServerInfo {
-    server_name: string;
-    api_version: number;
+    serverName: string;
+    apiVersion: number;
 }
 
 export interface AimeCardinRequest {
diff --git a/aimenet-web/src/pages/card-in-screen.tsx b/aimenet-web/src/pages/card-in-screen.tsx
index 48b0ac6..7251f83 100644
--- a/aimenet-web/src/pages/card-in-screen.tsx
+++ b/aimenet-web/src/pages/card-in-screen.tsx
@@ -132,7 +132,7 @@ function ServerCardInPage() {
     return (
         <>
             <main className="flex flex-col gap-5 container min-h-screen py-10">
-                <AMHeader title={server?.server_name ?? "Server"}>
+                <AMHeader title={server?.serverName ?? "Server"}>
                     <Button variant="ghost" onClick={() => navigate('/')}>
                         <Home className="h-4 w-4 sm:mr-2"/>
                         <span className="hidden sm:block">Servers</span>
@@ -187,7 +187,7 @@ function ServerCardInPage() {
                     {server?.id && (
                         <AlertDialog>
                             <AlertDialogTrigger>
-                                <p className="text-sm text-red-700">Delete {server.server_name}</p>
+                                <p className="text-sm text-red-700">Delete {server.serverName}</p>
                             </AlertDialogTrigger>
                             <AlertDialogContent>
                                 <AlertDialogHeader>
diff --git a/aimenet-web/src/pages/server-listing.tsx b/aimenet-web/src/pages/server-listing.tsx
index 09a240c..5c05dde 100644
--- a/aimenet-web/src/pages/server-listing.tsx
+++ b/aimenet-web/src/pages/server-listing.tsx
@@ -62,7 +62,7 @@ function ServerList(props: { servers: AimeServer[] | undefined }) {
         {props.servers.map(s =>
             <ContextMenu key={s.id}>
                 <ContextMenuTrigger>
-                    <AMCard title={s.server_name} titlePerformsAction actionClicked={() => navigate(`/servers/${s.id}`)}>
+                    <AMCard title={s.serverName} titlePerformsAction actionClicked={() => navigate(`/servers/${s.id}`)}>
                         {s.lastConnected > 0 && (
                             <AMCardDetail>
                                 <History className="h-5 w-5"/>
@@ -113,14 +113,14 @@ function ServerAddForm() {
         if (!existingServer) {
             const newId = await db.servers.add({
                 lastConnected: 0,
-                server_name: "Server",
+                serverName: "Server",
                 address: values.address,
-                api_version: AIMENET_API_VERSION
+                apiVersion: AIMENET_API_VERSION
             });
 
             // set server name using id
             await db.servers.update(newId, {
-                server_name: `Server #${newId}`
+                serverName: `Server #${newId}`
             });
 
             navigate(`/servers/${newId}`);