Skip to content

Commit

Permalink
Attempting damonbot => multibot abstraction
Browse files Browse the repository at this point in the history
  • Loading branch information
Christopher Joel committed Aug 26, 2011
1 parent 48f97e2 commit 5b76d49
Show file tree
Hide file tree
Showing 4 changed files with 30 additions and 28 deletions.
3 changes: 0 additions & 3 deletions damonbot

This file was deleted.

6 changes: 3 additions & 3 deletions lib/adapter/index.js
Expand Up @@ -49,7 +49,7 @@ exports.createAdapter = function(type, options) {

var adapter = child.spawn(
'python',
[path.join(__dirname, './skype.py'), options.port]
[path.resolve(__dirname, './skype.py'), options.port]
);

adapter.on(
Expand All @@ -72,7 +72,7 @@ exports.createAdapter = function(type, options) {
try {

var client = child.spawn(
path.join(process.cwd, './support/skypekit/skype')
path.resolve(__dirname, '../../support/skypekit/skype')
);

} catch(e) {
Expand Down Expand Up @@ -106,7 +106,7 @@ exports.createAdapter = function(type, options) {

adapter = child.spawn(
'python',
[path.join(__dirname, './skypekit-bridge.py'), options.account, options.secret, options.port]
[path.resolve(__dirname, './skypekit-bridge.py'), options.account, options.secret, options.port]
);

watch("Skypekit Bridge", adapter);
Expand Down
24 changes: 13 additions & 11 deletions lib/index.js
@@ -1,20 +1,22 @@
var skype = require('./bridge'),
log = require('./log'),
bot = require('./bot');
var log = require('./log'),
bridge = require('./bridge');

exports.run = function() {
exports = module.exports = function() {

var bridge = skype.createBridge(),
damon = bot.createBot();
var handlers = Array.prototype.slice.call(arguments),
interface = bridge.createBridge();

bridge.on(
interface.on(
'message',
function(message) {

log('Received message from ' + message.data.sender.name + ': "' + message.data.body + '"');
if(message.data.body.match(/^damonbot/i))
damon.parse(message);
(function(index) {

var next = arguments.callee;

if(index < handlers.length)
handlers[index](message, function() { next(index + 1); });
})(0);
}
);

};
25 changes: 14 additions & 11 deletions package.json
@@ -1,15 +1,18 @@
{
"author": "Christopher Joel <chris@cloudflare.com> (http://www.cloudflare.com)",
"name": "damonbot",
"description": "Damonbot is a Skype chatbot",
"version": "0.0.0",
"repository": {
"type": "git",
"url": "git://github.com/cdata/damonbot.git"
"author" : "Christopher Joel <chris@cloudflare.com> (http://www.cloudflare.com)",
"name" : "multibot",
"description" : "Multibot is a universal chatbot framework.",
"version" : "0.0.1",
"repository" : {
"type" : "git",
"url" : "git://github.com/cdata/damonbot.git"
},
"engines": {
"node": "~0.4.10"
"engines" : {
"node" : "~0.4.10"
},
"dependencies": {},
"devDependencies": {}
"dependencies" : {
"optimist" : "~0.2.6",
"websocket-server" : "~1.4.04"
},
"devDependencies" : {}
}

0 comments on commit 5b76d49

Please sign in to comment.