|
|
|
@ -2,7 +2,7 @@ var opts = require('./opts');
|
|
|
|
|
if (require.main == module) opts.parse_args();
|
|
|
|
|
opts.load_defaults();
|
|
|
|
|
|
|
|
|
|
const khash = require("kana-hash");
|
|
|
|
|
//const khash = require("kana-hash");
|
|
|
|
|
|
|
|
|
|
var _ = require('../lib/underscore'),
|
|
|
|
|
amusement = require('./amusement'),
|
|
|
|
@ -23,7 +23,7 @@ var _ = require('../lib/underscore'),
|
|
|
|
|
render = require('./render'),
|
|
|
|
|
request = require('request'),
|
|
|
|
|
STATE = require('./state'),
|
|
|
|
|
tripcode = require('../tripcode').make(),//{hash:function(a,b){return new khash.Kana(0, this.salt).once(a);}, setSalt:function(a){if(a) this.salt = new khash.Salt(a); else this.salt = khash.Salt.Default; return this.salt;}}, //require('./../tripcode/tripcode'),
|
|
|
|
|
//tripcode = require('../tripcode').make(),//{hash:function(a,b){return new khash.Kana(0, this.salt).once(a);}, setSalt:function(a){if(a) this.salt = new khash.Salt(a); else this.salt = khash.Salt.Default; return this.salt;}}, //require('./../tripcode/tripcode'),
|
|
|
|
|
urlParse = require('url').parse,
|
|
|
|
|
web = require('./web'),
|
|
|
|
|
winston = require('winston');
|
|
|
|
@ -848,7 +848,7 @@ function allocate_post(msg, client, callback) {
|
|
|
|
|
post.trip = spec[parsed[1]];
|
|
|
|
|
}
|
|
|
|
|
else if (parsed[1] || parsed[2]) {
|
|
|
|
|
var trip = tripcode.hash(parsed[1], parsed[2]);
|
|
|
|
|
var trip = "Can this just be a string?"; //tripcode.hash(parsed[1], parsed[2]);
|
|
|
|
|
if (trip)
|
|
|
|
|
post.trip = trip;
|
|
|
|
|
}
|
|
|
|
@ -1245,8 +1245,8 @@ function non_daemon_pid_setup() {
|
|
|
|
|
if (require.main == module) {
|
|
|
|
|
if (!process.getuid())
|
|
|
|
|
throw new Error("Refusing to run as root.");
|
|
|
|
|
if (!tripcode.setSalt(config.SECURE_SALT))
|
|
|
|
|
throw "Bad SECURE_SALT";
|
|
|
|
|
// if (!tripcode.setSalt(config.SECURE_SALT))
|
|
|
|
|
// throw "Bad SECURE_SALT";
|
|
|
|
|
async.series([
|
|
|
|
|
imager.make_media_dirs,
|
|
|
|
|
setup_imager_relay,
|
|
|
|
|