diff --git a/package.json b/package.json index 83e0495..b1cf691 100644 --- a/package.json +++ b/package.json @@ -22,8 +22,9 @@ "chart.js": "^2.7.2", "diskspace": "^2.0.0", "formidable": "1.0.17", - "hashloli": "file:../home/flandre/work/hashloli", + "hashloli": "git+ssh://public@flanchan.moe:hashloli.git", "jsoncompress": "^0.1.3", + "kana-hash": "file:../kana-hash/node", "minimist": "1.2.0", "nan": "^2.14.0", "recaptcha2": "^1.3.2", diff --git a/server/server.js b/server/server.js index 5be16cd..fe5e331 100644 --- a/server/server.js +++ b/server/server.js @@ -2,6 +2,8 @@ var opts = require('./opts'); if (require.main == module) opts.parse_args(); opts.load_defaults(); +const khash = require("kana-hash"); + var _ = require('../lib/underscore'), amusement = require('./amusement'), async = require('async'), @@ -21,7 +23,7 @@ var _ = require('../lib/underscore'), render = require('./render'), request = require('request'), STATE = require('./state'), - tripcode = {hash:function(a){return a;}, setSalt:function(a){return a;}}, //require('./../tripcode/tripcode'), + tripcode = {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');