ShinobiSystems
/
Shinobi
mirror of https://gitlab.com/Shinobi-Systems/Shinobi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

sqlQuery Conversion : minor cleanup

add-archived-and-accountType-columns
Moe 2020-07-11 13:16:01 -07:00
parent 69f038a477
commit f1fc729435
6 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libs/auth.js
View File

@ -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()
})

2
libs/monitor.js
View File

@ -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 = {

4
libs/notification.js
View File

@ -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===''){

24
libs/socketio.js
View File

@ -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;

2
libs/timelapse.js
View File

@ -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,

4
libs/user.js
View File

@ -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);