From b3c1619d2027939963d4f906e9da40b26e17eee1 Mon Sep 17 00:00:00 2001
From: Jules <jules@asdf.us>
Date: Sat, 31 Mar 2018 08:56:10 -0400
Subject: server fixes, raises size limit

---
 lib/db/index.js |  2 +-
 lib/index.js    | 10 +++++-----
 lib/upload.js   |  4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/lib/db/index.js b/lib/db/index.js
index b2ea59c..93fdd0e 100644
--- a/lib/db/index.js
+++ b/lib/db/index.js
@@ -34,7 +34,7 @@ db.getIndex = function(limit, offset) {
   return Image.query(function(qb){
     qb.orderBy("id", "desc").limit(limit)
     if (offset) qb.offset(offset)
-  }).fetch()
+  }).fetchAll()
 }
 db.createImage = function(url){
   return new Image({ url: url }).save()
diff --git a/lib/index.js b/lib/index.js
index 6d07dda..a4e5263 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -30,11 +30,6 @@ site.init = function(){
     console.log('plop listening at http://5.k:%s', server.address().port)
   })
 
-  app.get("/p/get/random", function(req, res){
-    db.getRandom().then(function(img){
-      res.json(img)
-    })
-  })
   app.get("/p/list/", function(req, res){
     limit = parseInt(req.params.limit)
     if (isNaN(limit)) limit = 20
@@ -45,6 +40,11 @@ site.init = function(){
       res.json(img)
     })
   })
+  app.get("/p/get/random", function(req, res){
+    db.getRandom().then(function(img){
+      res.json(img)
+    })
+  })
   app.get("/p/get/", function(req, res){
     db.getLatest().then(function(img){
       res.json(img)
diff --git a/lib/upload.js b/lib/upload.js
index 82ea9b5..385e626 100644
--- a/lib/upload.js
+++ b/lib/upload.js
@@ -37,8 +37,8 @@ module.exports.put = function (key, file, opt) {
 	else if (file.size < 10) {
 		err = "File too small"
 	}
-	else if (file.size > 2097152) { // 2mb limit
-		err = "File too large. Uploads can be a maximum of 2 mb."
+	else if (file.size > 1024*1024*3) { // 3mb limit
+		err = "File too large. Uploads can be a maximum of 3 mb."
 	}
 
 	if (err) {
-- 
cgit v1.2.3-70-g09d2


From 19d8a1315cfaa51cb342570cd31df525e56e0513 Mon Sep 17 00:00:00 2001
From: Jules <jules@asdf.us>
Date: Sat, 31 Mar 2018 09:10:55 -0400
Subject: fix router order

---
 lib/db/index.js |  2 +-
 lib/index.js    | 11 +++++------
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/lib/db/index.js b/lib/db/index.js
index 573528d..6e36602 100644
--- a/lib/db/index.js
+++ b/lib/db/index.js
@@ -31,7 +31,7 @@ db.getRandom = function () {
 }
 db.getRandomAscii = function () {
   return ShaderImage.query(function(qb){
-    qb.where("tag", "=", "ascii").orderBy(knex.raw('RAND()')).limit(1)
+    qb.where("tag", "ascii").orderBy(knex.raw('RAND()')).limit(1)
   }).fetch()
 }
 db.getIndex = function(limit, offset) {
diff --git a/lib/index.js b/lib/index.js
index 29baa70..781ac04 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -45,6 +45,11 @@ site.init = function(){
       res.json(img)
     })
   })
+  app.get("/p/get/randomascii", function(req, res){
+    db.getRandomAscii().then(function(img){
+      res.json(img)
+    })
+  })
   app.get("/p/get/", function(req, res){
     db.getLatest().then(function(img){
       res.json(img)
@@ -78,12 +83,6 @@ 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)
-- 
cgit v1.2.3-70-g09d2