GitHub/dbot
3
0
Fork 1
mirror of https://github.com/reality/dbot.git synced 2024-11-23 20:39:25 +01:00
Code Issues Projects Releases Wiki Activity

merge

Browse Source
This commit is contained in:
reality 2013-04-14 18:39:32 +00:00
commit 77f67d64e1
5 changed files with 70 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
modules/api/api.js Normal file
View File

@ -0,0 +1,56 @@
/**
* Name: API
* Description: Expose DBot API functionality with a REST API
*/
var _ = require('underscore')._;
var api = function(dbot) {
this.onLoad = function() {
dbot.modules.web.app.get('/api/:module/:method', function(req, res) {
var module = req.params.module,
method = req.params.method,
reqArgs = req.query,
body = { 'err': null, 'data': null };
if(!_.has(dbot.api, module)) {
body.err = 'No such API module';
} else if(!_.has(dbot.api[module], method)) {
body.err = 'No such API function in ' + module;
} else if(dbot.api[module][method].external !== true) {
body.err = 'API function ' + module + '.' + method +
' not enabled for external access';
}
if(!body.err) {
var func = dbot.api[module][method],
paramNames = func.extMap,
args = [];
_.each(reqArgs, function(arg, name) {
var callbackIndex = paramNames.indexOf(name);
if(callbackIndex != -1) {
args[callbackIndex] = decodeURIComponent(arg);
}
});
var callbackIndex = paramNames.indexOf('callback');
if(callbackIndex != -1) {
args[callbackIndex] = function() {
body.data = Array.prototype.slice.call(arguments, 0);
res.json(body);
};
func.apply(null, args);
} else {
body.data = func.apply(null, args);
res.json(body);
}
} else {
res.json(body);
}
}.bind(this));
}.bind(this);
};
exports.fetch = function(dbot) {
return new api(dbot);
};

2
modules/imgur/imgur.js
View File

@ -67,6 +67,8 @@ var imgur = function(dbot) {
});
}
};
this.api['getRandomImage'].external = true;
this.api['getRandomImage'].extMap = [ 'callback' ];
this.commands = {
'~ri': function(event) {

4
modules/kick/kick.js
View File

@ -4,11 +4,11 @@ var kick = function(dbot) {
this.api = {
'ban': function(server, user, channel) {
dbot.say(event.server, this.config.chanserv, '!ban ' + user)
dbot.say(event.server, this.config.chanserv, 'ban ' + user);
},
'quiet': function(server, user, channel) {
dbot.say(event.server, this.config.chanserv, '!quiet ' + user)
dbot.say(event.server, this.config.chanserv, 'quiet ' + user);
},
'kick': function(server, user, channel, msg) {

3
modules/quotes/quotes.js
View File

@ -111,6 +111,9 @@ var quotes = function(dbot) {
}
};
this.api['getQuoteCategory'].external = true;
this.api['getQuoteCategory'].extMap = [ 'name' ];
this.listener = function(event) {
if(event.action == 'PRIVMSG') {
if(event.user == 'reality') {

14
modules/web/web.js
View File

@ -3,17 +3,17 @@ var express = require('express'),
fs = require('fs');
var webInterface = function(dbot) {
var pub = 'public';
var app = express();
this.pub = 'public';
this.app = express();
app.use(express.static(pub));
app.set('view engine', 'jade');
this.app.use(express.static(this.pub));
this.app.set('view engine', 'jade');
app.get('/', function(req, res) {
this.app.get('/', function(req, res) {
res.render('index', { 'name': dbot.config.name });
});
var server = app.listen(dbot.config.web.webPort);
var server = this.app.listen(dbot.config.web.webPort);
this.reloadPages = function() {
var pages = dbot.pages;
@ -21,7 +21,7 @@ var webInterface = function(dbot) {
if(_.has(pages, p)) {
var func = pages[p];
var mod = func.module;
app.get(p, (function(req, resp) {
this.app.get(p, (function(req, resp) {
// Crazy shim to seperate module views.
var shim = Object.create(resp);
shim.render = (function(view, one, two) {