From 1b71c79bb92f60f0ca178e47c1ddd2913e836213 Mon Sep 17 00:00:00 2001 From: ntr Date: Fri, 20 Sep 2019 14:56:49 +1000 Subject: [PATCH 1/2] name max len of 20 --- server/src/construct.rs | 7 +++++-- server/src/mtx.rs | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/server/src/construct.rs b/server/src/construct.rs index 80b4d7bb..f464d39c 100644 --- a/server/src/construct.rs +++ b/server/src/construct.rs @@ -271,8 +271,11 @@ impl Construct { self } - pub fn new_name(self, name: String) -> Construct { - self.named(&name) + pub fn new_name(self, name: String) -> Result { + if name.len() > 20 { + return Err(err_msg("20 character name maximum")); + } + Ok(self.named(&name)) } pub fn learn(mut self, s: Skill) -> Construct { diff --git a/server/src/mtx.rs b/server/src/mtx.rs index 3352d100..f32f9339 100644 --- a/server/src/mtx.rs +++ b/server/src/mtx.rs @@ -152,7 +152,7 @@ pub fn apply(tx: &mut Transaction, account: &Account, variant: MtxVariant, const account::debit(tx, account.id, cost)?; construct = match mtx.variant { - MtxVariant::Rename => construct.new_name(name), + MtxVariant::Rename => construct.new_name(name)?, _ => construct.new_img(), }; From 14070ac5c4bc2a4e2dccfec9481184bc3b1667b2 Mon Sep 17 00:00:00 2001 From: ntr Date: Fri, 20 Sep 2019 15:32:21 +1000 Subject: [PATCH 2/2] fix game skill clear --- server/src/construct.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/src/construct.rs b/server/src/construct.rs index f464d39c..21647aef 100644 --- a/server/src/construct.rs +++ b/server/src/construct.rs @@ -238,7 +238,7 @@ impl Construct { pub fn from_skeleton(skeleton: &ConstructSkeleton) -> Construct { return Construct { id: skeleton.id, - account: skeleton.id, + account: skeleton.account, img: skeleton.img, name: skeleton.name.clone(), @@ -249,7 +249,7 @@ impl Construct { pub fn to_skeleton(&self) -> ConstructSkeleton { ConstructSkeleton { id: self.id, - account: self.id, + account: self.account, img: self.img, name: self.name.clone(), }