From 07cc6d8919193c38cc13b2567ede5a510938db18 Mon Sep 17 00:00:00 2001
From: troido <troido@protonmail.com>
Date: Fri, 21 Feb 2020 17:49:50 +0100
Subject: players can now go to different rooms

---
 src/template.rs | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

(limited to 'src/template.rs')

diff --git a/src/template.rs b/src/template.rs
index 9072032..52f7d2d 100644
--- a/src/template.rs
+++ b/src/template.rs
@@ -3,6 +3,7 @@
 use std::collections::HashMap;
 use serde_json::{json, Value};
 use crate::parameter::Parameter;
+use crate::{Result, aerr};
 
 #[derive(Debug, Clone, PartialEq)]
 pub struct Template {
@@ -33,20 +34,20 @@ impl Template {
 		Self::new(name, HashMap::new())
 	}
 	
-	pub fn from_json(val: &Value) -> Option<Template> {
+	pub fn from_json(val: &Value) -> Result<Template> {
 		if val.is_string(){
-			return Some(Self::empty(val.as_str()?));
+			return Ok(Self::empty(val.as_str().ok_or(aerr!("json string is not a string?"))?));
 		}
-		let name = val.get("type")?.as_str()?.to_string();
+		let name = val.get("type").ok_or(aerr!("template doesn't have 'type'"))?.as_str().ok_or(aerr!("template type not a string"))?.to_string();
 		let mut args = Vec::new();
-		for arg in val.get("args").unwrap_or(&json!({})).as_array()? {
-			args.push(Parameter::guess_from_json(arg)?);
+		for arg in val.get("args").unwrap_or(&json!([])).as_array().ok_or(aerr!("template args not an array"))? {
+			args.push(Parameter::guess_from_json(arg).ok_or(aerr!("template arg not a parameter"))?);
 		}
 		let mut kwargs = HashMap::new();
-		for (key, arg) in val.get("kwargs").unwrap_or(&json!({})).as_object()? {
-			kwargs.insert(key.to_string(), Parameter::guess_from_json(arg)?);
+		for (key, arg) in val.get("kwargs").unwrap_or(&json!({})).as_object().ok_or(aerr!("template kwargs not a json object"))? {
+			kwargs.insert(key.to_string(), Parameter::guess_from_json(arg).ok_or(aerr!("template arg not a parameter"))?);
 		}
-		Some(Template {name, args, kwargs, save: true})
+		Ok(Template {name, args, kwargs, save: true})
 	}
 	
 	pub fn to_json(&self) -> Value {
-- 
cgit