room is now an object

This commit is contained in:
rnhmjoj 2017-02-22 22:11:20 +01:00
parent 65bdf14f59
commit 0dfc276c71
No known key found for this signature in database
GPG Key ID: 362BB82B7E496B7C
4 changed files with 16 additions and 16 deletions

View File

@ -11,7 +11,7 @@ before = (done) ->
robot = new Robot null, "mock-adapter", no, 'asjon' robot = new Robot null, "mock-adapter", no, 'asjon'
robot.adapter.on 'connected', -> robot.adapter.on 'connected', ->
# Initialize mocked environment # Initialize mocked environment
user = robot.brain.userForId "1", { name: 'mocha', room: '#mocha' } user = robot.brain.userForId "1", { name: 'mocha', room: name: 'mocha', id: '#mocha' }
adapter = robot.adapter adapter = robot.adapter
send = (s) -> robot.adapter.receive new TextMessage user, s send = (s) -> robot.adapter.receive new TextMessage user, s
receive = (f) -> robot.adapter.on 'send', f receive = (f) -> robot.adapter.on 'send', f

View File

@ -28,7 +28,7 @@ module.exports = (robot) ->
isFromAdmin = (res) -> isFromAdmin = (res) ->
res.robot.adapterName is 'shell' or res.robot.adapterName is 'shell' or
res.message.room is process.env.ADMIN_ROOM res.message.room.id is process.env.ADMIN_ROOM
# find closest match with levenshtein metric # find closest match with levenshtein metric

View File

@ -34,7 +34,7 @@ module.exports = (robot) ->
# allow direct talk in user chat or campfire # allow direct talk in user chat or campfire
unless message.done or (true in results) unless message.done or (true in results)
if message.room == message.user.id or message.user.id is 1 if robot.adapterName is 'shell' or message.room.private
message.text = robot.name + ' ' + message.text message.text = robot.name + ' ' + message.text
results.push listeners()... results.push listeners()...

View File

@ -18,7 +18,7 @@ nope = ['BZBZ 400-BAD-REQUEST', 'BZBZ DOES-NOT-COMPUTE',
isFromAdmin = (res) -> isFromAdmin = (res) ->
res.robot.adapterName is 'shell' or res.robot.adapterName is 'shell' or
res.message.room is process.env.ADMIN_ROOM res.message.room.id is process.env.ADMIN_ROOM
runCmd = (cmd,res,cb) -> runCmd = (cmd,res,cb) ->
@ -44,31 +44,31 @@ module.exports = (robot) ->
runCmd 'npm test', dest runCmd 'npm test', dest
if process.env.AUTO_INFORM_ON_START if process.env.AUTO_INFORM_ON_START
r = room: process.env.AUTO_INFORM_ON_START room = id: process.env.AUTO_INFORM_ON_START
robot.send r, 'asjon avviato e operativo!' robot.messageRoom room, 'asjon avviato e operativo!'
robot.respond /aggiornati|scarica (?:gli )?aggiornamenti/i, (res) -> robot.respond /aggiornati|scarica (?:gli )?aggiornamenti/i, (res) ->
return res.send res.random nope unless isFromAdmin(res) return res.send res.random nope unless isFromAdmin res
runCmd 'git pull && npm install', res runCmd 'git pull && npm install', res
robot.respond /(?:controlla gli )?aggiornamenti/i, (res) -> robot.respond /(?:controlla gli )?aggiornamenti/i, (res) ->
return res.send res.random nope unless isFromAdmin(res) return res.send res.random nope unless isFromAdmin res
runCmd 'git fetch && git status', res runCmd 'git fetch && git status', res
robot.respond /(?:installa (?:le )?)?dipendenze/i, (res) -> robot.respond /(?:installa (?:le )?)?dipendenze/i, (res) ->
return res.send res.random nope unless isFromAdmin(res) return res.send res.random nope unless isFromAdmin res
runCmd 'npm install', res runCmd 'npm install', res
robot.respond /(?:esegui (?:i )?)?test/i, (res) -> robot.respond /(?:esegui (?:i )?)?test/i, (res) ->
return res.send res.random nope unless isFromAdmin(res) return res.send res.random nope unless isFromAdmin res
runCmd 'npm test', res runCmd 'npm test', res
robot.respond /secret-kill-code/i, (res) -> robot.respond /secret-kill-code/i, (res) ->
return res.send res.random nope unless isFromAdmin(res) return res.send res.random nope unless isFromAdmin res
process.exit 0 process.exit 0
robot.respond /(emergency|reverse) shell|phone home/i, (res) -> robot.respond /(emergency|reverse) shell|phone home/i, (res) ->
return res.send res.random nope unless isFromAdmin(res) return res.send res.random nope unless isFromAdmin res
rhost = process.env.REV_REMOTE_HOST rhost = process.env.REV_REMOTE_HOST
rport = process.env.REV_REMOTE_PORT || 22 rport = process.env.REV_REMOTE_PORT || 22
rtport = process.env.REV_REMOTE_TUNNEL_PORT || 2200 rtport = process.env.REV_REMOTE_TUNNEL_PORT || 2200