Merge branch 'develop' of ssh://git.mnml.gg:40022/~/mnml into develop

2019-09-12 16:19:28 +10:00
parent 7b27f8d51f b1e18f68f2
commit d873c80e92
10 changed files with 121 additions and 42 deletions
@@ -83,6 +83,7 @@ pub enum RpcRequest {

    AccountState {},
    AccountShop {},
+    AccountInstances {},
    AccountConstructs {},
    AccountSetTeam { ids: Vec<Uuid> },

@@ -154,7 +155,8 @@ impl Connection {
                        Ok(RpcMessage::AccountState(account.clone())),
                    RpcRequest::AccountConstructs {} =>
                        Ok(RpcMessage::AccountConstructs(account::constructs(&mut tx, &account)?)),
-
+                    RpcRequest::AccountInstances {} =>
+                        Ok(RpcMessage::AccountInstances(account::account_instances(&mut tx, account)?)),
                    RpcRequest::AccountSetTeam { ids } =>
                        Ok(RpcMessage::AccountTeam(account::set_team(&mut tx, &account, ids)?)),