diff options
| author | troido <troido@protonmail.com> | 2020-04-23 12:53:01 +0200 |
|---|---|---|
| committer | troido <troido@protonmail.com> | 2020-04-23 12:53:01 +0200 |
| commit | 080466200060d2d3ec64bec32a4959fa061b79ce (patch) | |
| tree | fbe602a0777583086b21799028f882d7b63d5c31 /src/encyclopedia.rs | |
| parent | b41c30fa15aea0b01b8fa30e378d123da046a1e6 (diff) | |
accept authentication messages, and validate registrations
Diffstat (limited to 'src/encyclopedia.rs')
| -rw-r--r-- | src/encyclopedia.rs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/encyclopedia.rs b/src/encyclopedia.rs index 0df7c70..ba9ad94 100644 --- a/src/encyclopedia.rs +++ b/src/encyclopedia.rs @@ -106,13 +106,13 @@ impl Encyclopedia { let assemblage_substitute = val .get("assemblage_substitute") .unwrap_or(&json!({})) - .as_object().ok_or(perr!("assemblage_subtitutions not a json dict"))? + .as_object().ok_or(perr!("assemblage_subtitute not a json dict"))? .iter() .chain( val .get("substitute") .unwrap_or(&json!({})) - .as_object().ok_or(perr!("substitutions not a json dict"))? + .as_object().ok_or(perr!("substitute not a json dict"))? .iter() ) .map(|(from, into)| { @@ -124,15 +124,15 @@ impl Encyclopedia { .collect::<PResult<HashMap<EntityType, EntityType>>>()?; let item_substitute = val - .get("assemblage_substitute") + .get("item_substitute") .unwrap_or(&json!({})) - .as_object().ok_or(perr!("assemblage_subtitutions not a json dict"))? + .as_object().ok_or(perr!("item_subtitute not a json dict"))? .iter() .chain( val .get("substitute") .unwrap_or(&json!({})) - .as_object().ok_or(perr!("substitutions not a json dict"))? + .as_object().ok_or(perr!("substitute not a json dict"))? .iter() ) .map(|(from, into)| { |