Merge branch 'master' of ghghgh.us:armory-fmf-cms

4 files changed, 9 insertions, 8 deletions

diff --git a/db.json b/db.json
index cb67d05..a8c7bb2 100644
--- a/db.json
+++ b/db.json
@@ -1530,7 +1530,7 @@
       "medium": "Technology",
       "category": "Drones",
       "keywords": "#Surveillance #Drone #UAV #Technology #Camera #Verticality #Control #All-Seeing Eye #Military #Panopticon #Reconnaissance #Remote Sensing #Warfare #Data #Information #Sensor #US-Air Force\r\n",
-      "description": "Gorgon Stare is a revolutionary airborne surveillance system made that is mounted on the underside of a drone. It’s electro-optical and infrared sensors system includes nine video cameras which are able to transmit live video images of physical movement across an entire town. While the system can see everything, the adversary on the ground does not know what or who is being looked at.\r\nIn greek mythology, the Gordon was a creature which unblinking eyes turned it’s beholder into stone.\r\n",
+      "description": "Gorgon Stare is a revolutionary airborne surveillance system made that is mounted on the underside of a drone. It’s electro-optical and infrared sensors system includes nine video cameras which are able to transmit live video images of physical movement across an entire town. While the system can see everything, the adversary on the ground does not know what or who is being looked at.\r\n\r\nIn greek mythology, the Gordon was a creature which unblinking eyes turned it’s beholder into stone.\r\n",
       "image": {
         "uri": "https://marsupial.s3.amazonaws.com/armory/205dbf50-36fd-11e7-a37a-4579121b15f0.jpg",
         "caption": "",
diff --git a/lib/awmail/index.js b/lib/awmail/index.js
index 0373100..f7a758b 100644
--- a/lib/awmail/index.js
+++ b/lib/awmail/index.js
@@ -63,21 +63,21 @@ function AWMail (options) {
     deferToNextTick().then(function(){
       console.log("upload dots")
       return uploadImage({
-        filename: uuid + '-dots.jpg',
+        filename: id + '-dots.jpg',
         file: req.files.dots[0],
       })
     }).then(function(url){
       console.log("upload lines")
       dots_url = url
       return uploadImage({
-        filename: uuid + '-lines.jpg',
+        filename: id + '-lines.jpg',
         file: req.files.lines[0],
       })
     }).then(function(url){
       console.log("upload plain")
       lines_url = url
       return uploadImage({
-        filename: uuid + '-plain.jpg',
+        filename: id + '-plain.jpg',
         file: req.files.plain[0],
       })
     }).then(function(url){
diff --git a/templates/email.html b/templates/email.html
index fab1372..7456eeb 100644
--- a/templates/email.html
+++ b/templates/email.html
@@ -1,6 +1,6 @@
 HANSEL AND GRETEL
 <br><br>
-<img src='cid:plain.jpg'>
+<img src='cid:face.jpg'>
 <br><br>
 <a href='https://hanselgretelarmory.com/photo/{{id}}'>Download your photo</a>
 <br><br>
diff --git a/templates/photo.liquid b/templates/photo.liquid
index 278d4fe..088403b 100644
--- a/templates/photo.liquid
+++ b/templates/photo.liquid
@@ -169,9 +169,10 @@ a {
 </body>
 <script>
 var hash = document.location.pathname.replace('/photo/','').replace(/\/.*/,'')
-image('dots')
-image('lines')
-image('plain')
+console.log(hash)
+image(hash, 'dots')
+image(hash, 'lines')
+image(hash, 'plain')
 function image(hash, type) {
 	var img = new Image
 	img.src = 'https://marsupial.s3.amazonaws.com/armory/mail/' + hash + '-' + type + '.jpg'