From bfecea9a4e39790ed5ff85719e317da1f54047ce Mon Sep 17 00:00:00 2001
From: ntr <ntr@smokestack.io>
Date: Thu, 31 Oct 2019 20:35:41 +1100
Subject: [PATCH] add smile mtx

---
 server/src/img.rs | 6 +++---
 server/src/mtx.rs | 9 +++++++--
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/server/src/img.rs b/server/src/img.rs
index 259ce6ae..e2908acf 100644
--- a/server/src/img.rs
+++ b/server/src/img.rs
@@ -258,7 +258,7 @@ fn _hieroglyph() -> String {
 }
 
 
-pub fn smiley(id: Uuid) -> Result<Uuid, Error> {
+pub fn smile(id: Uuid) -> Result<Uuid, Error> {
     let mut rng = thread_rng();
     let mut svg = Vec::new();
 
@@ -382,8 +382,8 @@ mod tests {
     // }
 
     #[test]
-    fn smiley_test() {
-        smiley(Uuid::new_v4()).unwrap();
+    fn smile_test() {
+        smile(Uuid::new_v4()).unwrap();
     }
 }
 
diff --git a/server/src/mtx.rs b/server/src/mtx.rs
index a6acd9a9..f3591563 100644
--- a/server/src/mtx.rs
+++ b/server/src/mtx.rs
@@ -19,9 +19,10 @@ pub const FREE_MTX: [MtxVariant; 2] = [
     MtxVariant::Shapes,
 ];
 
-pub const SHOP_LISTINGS: [Listing; 2] = [
+pub const SHOP_LISTINGS: [Listing; 3] = [
     Listing { variant: MtxVariant::Molecular, credits: 10 },
     Listing { variant: MtxVariant::Invader, credits: 10 },
+    Listing { variant: MtxVariant::Smile, credits: 10 },
 ];
 
 const NEW_IMAGE_COST: i64 = 1;
@@ -46,6 +47,7 @@ pub enum MtxVariant {
     Molecular,
     Invader,
     Shapes,
+    Smile,
 }
 
 impl MtxVariant {
@@ -63,6 +65,7 @@ impl TryFrom<String> for MtxVariant {
             "Rename" => Ok(MtxVariant::Rename),
             "Molecular" => Ok(MtxVariant::Molecular),
             "Invader" => Ok(MtxVariant::Invader),
+            "Smile" => Ok(MtxVariant::Smile),
             "Shapes" => Ok(MtxVariant::Shapes),
             _ => Err(format_err!("mtx variant not found variant={:?}", v)),
         }
@@ -159,7 +162,8 @@ pub fn apply(tx: &mut Transaction, account: &Account, variant: MtxVariant, const
     match mtx.variant {
         MtxVariant::Invader => img::invader_write(construct.img)?,
         MtxVariant::Molecular => img::molecular_write(construct.img)?,
-        MtxVariant::Shapes => img::smiley(construct.img)?,
+        MtxVariant::Shapes => img::shapes_write(construct.img)?,
+        MtxVariant::Smile => img::smile(construct.img)?,
         _ => construct.img,
     };
 
@@ -181,6 +185,7 @@ pub fn account_apply(tx: &mut Transaction, account: &Account, variant: MtxVarian
         MtxVariant::Invader => img::invader_write(account.img)?,
         MtxVariant::Molecular => img::molecular_write(account.img)?,
         MtxVariant::Shapes => img::shapes_write(account.img)?,
+        MtxVariant::Smile => img::smile(account.img)?,
         _ => account.img,
     };