From b2b45c81621d60a5199909ec00de794216a32bd8 Mon Sep 17 00:00:00 2001 From: James Quinley Date: Thu, 5 May 2022 23:59:50 -0700 Subject: [PATCH] This server update allows it to interface with the modern game client api. --- .../delegationServices.java | 24 +++++++++++++------ 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/jamesquinley/DelegationServices/delegationServices.java b/src/main/java/com/jamesquinley/DelegationServices/delegationServices.java index 30cee1f..cacddc5 100644 --- a/src/main/java/com/jamesquinley/DelegationServices/delegationServices.java +++ b/src/main/java/com/jamesquinley/DelegationServices/delegationServices.java @@ -127,11 +127,6 @@ public class delegationServices { System.out.println("Delegation Has Started"); if(requesttype == 0 || requesttype == 1 || requesttype == 2 || requesttype == 3 || requesttype == 4 || requesttype == 5 || requesttype == 6 || requesttype ==7 || requesttype == 8 || requesttype ==9 || requesttype ==10 || requesttype ==11 || requesttype ==12 || requesttype == 20 || requesttype == 21 || requesttype == 41 || requesttype == 18) { - if ( requesttype == 7 || requesttype == 12 || requesttype == 4 || requesttype == 5 || requesttype == 6 || requesttype == 19 || requesttype == 12) { - System.out.println("An Excluded Request (7MAL, 12S, 4C, 5C, 6C) Has Been Detected, Ignoring"); - //Thinking of moving all purge timer call to here to centralize deletion decision. - System.out.println(requesttype); - } if (requesttype == 41) { System.out.println("Update Request"); @@ -623,10 +618,17 @@ public class delegationServices { Fname = (String) accountServer.get("FName"); Path = (String) accountServer.get("Path"); Email = (String) accountServer.get("Email"); - Uid = (String) accountServer.get("Uid"); + // Uid = (String) accountServer.get("Uid"); UserName = (String) accountServer.get("User"); BasicDBObject searchQuery = new BasicDBObject(); searchQuery.append("clientid", ClientID); + Filter = RGFilter.find(eq("rgkey", "UAROCKS")).first(); + String apiV = (String) Filter.get("gameAPI"); + String MOTD = (String) Filter.get("motd"); + + + + BasicDBObject updateQuery = new BasicDBObject(); BasicDBObject updateQuery2 = new BasicDBObject(); @@ -637,6 +639,8 @@ public class delegationServices { BasicDBObject updateQuery7 = new BasicDBObject(); BasicDBObject updateQuery8 = new BasicDBObject(); BasicDBObject updateQuery9 = new BasicDBObject(); + BasicDBObject updateQuery10 = new BasicDBObject(); + // BasicDBObject updateQuery11 = new BasicDBObject(); updateQuery.append("$set", new BasicDBObject().append("type", 8)); updateQuery2.append("$set", @@ -656,6 +660,10 @@ public class delegationServices { new BasicDBObject().append("status", true)); updateQuery8.append("$set", new BasicDBObject().append("Token", TKN)); + updateQuery9.append("$set", + new BasicDBObject().append("api",apiV)); + updateQuery10.append("$set", + new BasicDBObject().append("motd",MOTD)); System.out.println("Sending Info To Forwarding Server"); dCollection.updateOne(searchQuery, updateQuery); dCollection.updateOne(searchQuery, updateQuery2); @@ -665,6 +673,8 @@ public class delegationServices { dCollection.updateOne(searchQuery, updateQuery6); dCollection.updateOne(searchQuery, updateQuery8); dCollection.updateOne(searchQuery, updateQuery7); + dCollection.updateOne(searchQuery, updateQuery9); + dCollection.updateOne(searchQuery, updateQuery10); //delegationTimer.trigger(); delegationTimer.DeleteTargetRequest(ClientID); } else { @@ -700,7 +710,7 @@ public class delegationServices { delegationTimer.DeleteTargetRequest(ClientID); } } catch (MongoCommandException ERC) { - System.out.println("Malformed Request"); + System.out.println("Malformed Request " + ERC); BasicDBObject searchQuery = new BasicDBObject(); searchQuery.append("clientid", ClientID);