summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/db/index.js6
-rw-r--r--lib/index.js7
2 files changed, 12 insertions, 1 deletions
diff --git a/lib/db/index.js b/lib/db/index.js
index 93fdd0e..573528d 100644
--- a/lib/db/index.js
+++ b/lib/db/index.js
@@ -4,7 +4,6 @@ var connection = require("./bookshelf")
var bookshelf = connection.bookshelf
var knex = connection.knex
-
/* MODELS */
var Image = db.Image = bookshelf.Model.extend({
@@ -30,6 +29,11 @@ db.getRandom = function () {
qb.orderBy(knex.raw('RAND()')).limit(1)
}).fetch()
}
+db.getRandomAscii = function () {
+ return ShaderImage.query(function(qb){
+ qb.where("tag", "=", "ascii").orderBy(knex.raw('RAND()')).limit(1)
+ }).fetch()
+}
db.getIndex = function(limit, offset) {
return Image.query(function(qb){
qb.orderBy("id", "desc").limit(limit)
diff --git a/lib/index.js b/lib/index.js
index a4e5263..29baa70 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -78,6 +78,12 @@ site.init = function(){
})
})
+ app.get("/p/get/randomascii", function(req, res){
+ db.getRandomAscii().then(function(img){
+ res.json(img)
+ })
+ })
+
/* shaderblaster / asciiblaster apis */
app.post("/cgi-bin/im/shader/upload", multer_upload.single('qqfile'), function(req, res){
var now = Math.floor(Date.now() / 1000)
@@ -112,6 +118,7 @@ site.init = function(){
app.get("/p/:id", function(req, res){
res.sendFile("index.html", {root: './public'})
})
+ app.use('/panke/', express.static(path.join(__dirname, '../public')))
app.use('/p/', express.static(path.join(__dirname, '../public')))
}