Merge branch 'dev' into 'master'

fix syntax for video email attachment on event See merge request Shinobi-Systems/Shinobi!15
2018-07-11 19:15:32 +00:00 · 2018-07-11 19:15:32 +00:00 · 80260b0798
parent 7c35dfa6f6 7f9aa5b705
commit 80260b0798
1 changed files with 2 additions and 2 deletions
--- a/camera.js
+++ b/camera.js
@ -3338,8 +3338,8 @@ s.camera=function(x,e,cn,tx){
                        }
                        detectorStreamBuffers.slice(detectorStreamBuffers.length - 2,detectorStreamBuffers.length).forEach(function(filepath,n){
                            files.push({
-                                attachment: filepath,
-                                name: 'Video Clip '+n+'.ts'
+                                filename: 'Video Clip '+n+'.ts',
+                                content: fs.readFileSync(filepath)
                            })
                        })
                        if(screenshotBuffer){