From 1b3865b325c4d0d86af344473594c9e1640eb456 Mon Sep 17 00:00:00 2001
From: ppc <albie@ppc.moe>
Date: Tue, 3 Sep 2024 14:12:26 +0100
Subject: [PATCH] apply updates to amnet-native

---
 amnet-native/app/ServerCardIn.tsx |  2 +-
 amnet-native/models/AMCard.ts     |  6 +++---
 amnet-native/models/AMServer.ts   | 10 +++++++---
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/amnet-native/app/ServerCardIn.tsx b/amnet-native/app/ServerCardIn.tsx
index 0d53aae..28fa3df 100644
--- a/amnet-native/app/ServerCardIn.tsx
+++ b/amnet-native/app/ServerCardIn.tsx
@@ -112,7 +112,7 @@ export default function ServerCardIn({route, navigation}) {
         setCardInCompleted(false);
 
         const abortController = new AbortController();
-        performCardIn(server.serverAddress, {cardId: selectedCard.code}, abortController.signal).then(async r => {
+        performCardIn(server, {cardId: selectedCard.code}, abortController.signal).then(async r => {
             const now = new Date();
 
             setCardInCompleted(r);
diff --git a/amnet-native/models/AMCard.ts b/amnet-native/models/AMCard.ts
index 22ee596..72948b4 100644
--- a/amnet-native/models/AMCard.ts
+++ b/amnet-native/models/AMCard.ts
@@ -15,14 +15,14 @@ export class AMCard extends Realm.Object<AMCard> implements AMCardData {
     name: string;
 
     added: Date;
-    lastUsed?: Date | null;
+    lastUsed?: Date;
 
     static generate(code: string, name: string) {
         return {
             _id: new Realm.BSON.ObjectId(),
+            added: new Date(),
             code: code, 
-            name: name, 
-            added: new Date()
+            name: name
         };
     }
 
diff --git a/amnet-native/models/AMServer.ts b/amnet-native/models/AMServer.ts
index 8c3aa7f..59ad780 100644
--- a/amnet-native/models/AMServer.ts
+++ b/amnet-native/models/AMServer.ts
@@ -4,22 +4,25 @@ import {AMServerInfoResponse} from "amnet-shared";
 export class AMServer extends Realm.Object<AMServer> implements AMServerInfoResponse {
     _id!: Realm.BSON.ObjectId;
 
+    apiVersion: number;
+    gameId?: string;
+
     serverName: string;
     serverAddress: string;
 
     lastUsed: Date;
     createdAt: Date;
-    apiVersion: number;
 
     static generate(serverAddress: string) {
         return {
             _id: new Realm.BSON.ObjectId(),
+
             apiVersion: 0,
-            serverAddress,
+
             serverName: "New Server",
+            serverAddress: serverAddress,
 
             createdAt: new Date(),
-
             lastUsed: null
         }
     }
@@ -31,6 +34,7 @@ export class AMServer extends Realm.Object<AMServer> implements AMServerInfoResp
         properties: {
             _id: "objectId",
             apiVersion: {type: "int", default: 0},
+            gameId: {type: "string", optional: true},
             serverAddress: "string",
             serverName: {type: "string", default: "New Server"},
             createdAt: {type: "date", default: new Date()},