From f1fc729435702384fc93bf207b5700d5378e9b6d Mon Sep 17 00:00:00 2001 From: Moe Date: Sat, 11 Jul 2020 13:16:01 -0700 Subject: [PATCH] sqlQuery Conversion : minor cleanup --- libs/auth.js | 10 +++++----- libs/monitor.js | 2 +- libs/notification.js | 4 ++-- libs/socketio.js | 24 ++++++++++++------------ libs/timelapse.js | 2 +- libs/user.js | 4 ++-- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/libs/auth.js b/libs/auth.js index d16e37d7..edd8822c 100644 --- a/libs/auth.js +++ b/libs/auth.js @@ -16,7 +16,7 @@ module.exports = function(s,config,lang){ ['uid','=',params.uid], ['ke','=',params.ke], ] - },function(err,r) { + },(err,r) => { if(!r)r = [] var user = r[0] callback(err,user) @@ -31,7 +31,7 @@ module.exports = function(s,config,lang){ ['auth','=',params.auth], ['ke','=',params.ke], ] - },function(err,r) { + },(err,r) => { if(!r)r = [] var user = r[0] callback(err,user) @@ -50,7 +50,7 @@ module.exports = function(s,config,lang){ ['pass','=',s.createHash(params.password)], ], limit: 1 - },function(err,r) { + },(err,r) => { if(!r)r = [] var user = r[0] callback(err,user) @@ -66,7 +66,7 @@ module.exports = function(s,config,lang){ ['code','=',params.auth], ['ke','=',params.ke], ] - },function(err,r) { + },(err,r) => { if(!r)r = [] var apiKey = r[0] callback(err,apiKey) @@ -268,7 +268,7 @@ module.exports = function(s,config,lang){ where: [ ['details','NOT LIKE','%"sub"%'], ] - },function(err,r) { + },(err,r) => { adminUsersSelected = r success() }) diff --git a/libs/monitor.js b/libs/monitor.js index 1892e32c..74f3dfa1 100644 --- a/libs/monitor.js +++ b/libs/monitor.js @@ -1410,7 +1410,7 @@ module.exports = function(s,config,lang){ ['ke','=',form.ke], ['mid','=',form.mid], ] - },function(err,r) { + },(err,r) => { var affectMonitor = false var monitorQuery = {} var txData = { diff --git a/libs/notification.js b/libs/notification.js index 9ef37aa3..7c9cc089 100644 --- a/libs/notification.js +++ b/libs/notification.js @@ -215,7 +215,7 @@ module.exports = function(s,config,lang){ ['ke','=',e.ke], ['details','NOT LIKE','%"sub"%'], ] - },function(err,r) { + },(err,r) => { r = r[0] var mailOptions = { from: config.mail.from, // sender address @@ -299,7 +299,7 @@ module.exports = function(s,config,lang){ ['ke','=',d.ke], ['details','NOT LIKE','%"sub"%'], ] - },function(err,r) { + },(err,r) => { r=r[0]; var detector_mail_timeout if(!d.mon.details.detector_mail_timeout||d.mon.details.detector_mail_timeout===''){ diff --git a/libs/socketio.js b/libs/socketio.js index 16cbe2a2..aa202b40 100644 --- a/libs/socketio.js +++ b/libs/socketio.js @@ -62,7 +62,7 @@ module.exports = function(s,config,lang,io){ ['auth','=',options.auth], ['uid','=',options.uid], ] - },function(err,r) { + },(err,r) => { if(r&&r[0]){ resolve(r) }else{ @@ -75,7 +75,7 @@ module.exports = function(s,config,lang,io){ ['code','=',options.auth], ['uid','=',options.uid], ] - },function(err,r) { + },(err,r) => { if(r && r[0]){ r = r[0] r.details = JSON.parse(r.details) @@ -88,7 +88,7 @@ module.exports = function(s,config,lang,io){ ['ke','=',options.ke], ['uid','=',options.uid], ] - },function(err,r) { + },(err,r) => { if(r && r[0]){ resolve(r) }else{ @@ -382,7 +382,7 @@ module.exports = function(s,config,lang,io){ where: [ ['ke','=',d.ke], ] - },function(err,r) { + },(err,r) => { if(r && r[0]){ r.forEach(function(monitor){ s.cameraSendSnapshot({mid:monitor.mid,ke:monitor.ke,mon:monitor},{useIcon: true}) @@ -414,7 +414,7 @@ module.exports = function(s,config,lang,io){ columns: "*", table: "Users", where: whereQuery - },function(err,r) { + },(err,r) => { if(r && r[0]){ details = JSON.parse(r[0].details) details.monitorOrder = d.monitorOrder @@ -437,7 +437,7 @@ module.exports = function(s,config,lang,io){ columns: "*", table: "Users", where: whereQuery - },function(err,r) { + },(err,r) => { if(r && r[0]){ details = JSON.parse(r[0].details) details.monitorListOrder = d.monitorListOrder @@ -467,7 +467,7 @@ module.exports = function(s,config,lang,io){ ['uid','=',d.uid], ], limit: 1 - },function(err,r) { + },(err,r) => { if(r && r[0]){ r = r[0]; d.d=JSON.parse(r.details); @@ -563,7 +563,7 @@ module.exports = function(s,config,lang,io){ where: eventWhereQuery, orderBy: ['time','desc'], limit: d.eventLimit - },function(err,r) { + },(err,r) => { if(err){ console.error(err) callback([]) @@ -619,7 +619,7 @@ module.exports = function(s,config,lang,io){ where: videoWhereQuery, orderBy: ['time','desc'], limit: d.videoLimit || '100' - },function(err,r) { + },(err,r) => { if(err){ console.error(err) setTimeout(function(){ @@ -700,7 +700,7 @@ module.exports = function(s,config,lang,io){ ['mid','=',d.id], ], limit: 1 - },function(err,r) { + },(err,r) => { if(r && r[0]){ r = r[0] s.camera(d.ff,{type:r.type,url:s.buildMonitorUrl(r),id:d.id,mode:d.ff,ke:cn.ke}); @@ -810,7 +810,7 @@ module.exports = function(s,config,lang,io){ ['uid','=',d.uid], ], limit: 1 - },function(err,r) { + },(err,r) => { if(r && r[0]){ r = r[0]; if(!s.group[d.ke]){s.group[d.ke]={users:{}}} @@ -842,7 +842,7 @@ module.exports = function(s,config,lang,io){ ['uid','=',d.uid], ], limit: 1 - },function(err,r) { + },(err,r) => { if(r && r[0]){ r = r[0] cn.ke=d.ke,cn.uid=d.uid,cn.auth=d.auth; diff --git a/libs/timelapse.js b/libs/timelapse.js index a6f95230..259c7268 100644 --- a/libs/timelapse.js +++ b/libs/timelapse.js @@ -53,7 +53,7 @@ module.exports = function(s,config,lang,app,io){ where: whereQuery, orderBy: ['time','desc'], limit: frameLimit || '500' - },function(err,r) { + },(err,r) => { if(err){ callback({ ok: false, diff --git a/libs/user.js b/libs/user.js index 7bf76b8b..51a62f93 100644 --- a/libs/user.js +++ b/libs/user.js @@ -452,7 +452,7 @@ module.exports = function(s,config,lang){ ['ke','=',e.ke], ['details','NOT LIKE',`%"sub"%`], ] - },function(err,r) { + },(err,r) => { if(r && r[0]){ r = r[0]; const details = JSON.parse(r.details); @@ -690,7 +690,7 @@ module.exports = function(s,config,lang){ ['ke','=',d.ke], ['uid','=',d.uid], ] - },function(err,r) { + },(err,r) => { if(r && r[0]){ r = r[0]; const details = JSON.parse(r.details);