diff options
| -rw-r--r-- | bucky-schema.sql | 59 | ||||
| -rw-r--r-- | bucky/app/site.js | 2 | ||||
| -rw-r--r-- | package-lock.json | 97 | ||||
| -rw-r--r-- | package.json | 4 |
4 files changed, 71 insertions, 91 deletions
diff --git a/bucky-schema.sql b/bucky-schema.sql index 9095d66..2adcfec 100644 --- a/bucky-schema.sql +++ b/bucky-schema.sql @@ -1,8 +1,8 @@ --- MySQL dump 10.13 Distrib 5.6.22, for osx10.10 (x86_64) +-- MariaDB dump 10.17 Distrib 10.4.7-MariaDB, for Linux (x86_64) -- -- Host: localhost Database: bucky3 -- ------------------------------------------------------ --- Server version 5.6.22 +-- Server version 10.3.12-MariaDB-log /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; @@ -28,7 +28,7 @@ CREATE TABLE `boxes` ( `owner` varchar(16) NOT NULL DEFAULT '', `editable` tinyint(4) DEFAULT NULL, PRIMARY KEY (`id`) -) ENGINE=MyISAM AUTO_INCREMENT=593 DEFAULT CHARSET=utf8; +) ENGINE=MyISAM AUTO_INCREMENT=662 DEFAULT CHARSET=utf8; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -40,14 +40,15 @@ DROP TABLE IF EXISTS `comments`; /*!40101 SET character_set_client = utf8 */; CREATE TABLE `comments` ( `id` int(11) NOT NULL AUTO_INCREMENT, - `thread` int(11) NOT NULL DEFAULT '0', - `parent_id` int(11) NOT NULL DEFAULT '0', + `thread` int(11) NOT NULL DEFAULT 0, + `parent_id` int(11) NOT NULL DEFAULT 0, `username` varchar(16) NOT NULL DEFAULT '', - `date` int(11) NOT NULL DEFAULT '0', - `comment` blob, + `date` int(11) NOT NULL DEFAULT 0, + `comment` blob DEFAULT NULL, `hidden` int(11) DEFAULT NULL, + `storage` varchar(32) DEFAULT NULL, PRIMARY KEY (`id`) -) ENGINE=MyISAM AUTO_INCREMENT=24058 DEFAULT CHARSET=utf8; +) ENGINE=MyISAM AUTO_INCREMENT=35359 DEFAULT CHARSET=utf8; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -62,12 +63,12 @@ CREATE TABLE `files` ( `thread` int(11) DEFAULT NULL, `username` varchar(16) NOT NULL DEFAULT '', `filename` varchar(192) NOT NULL DEFAULT '', - `date` int(11) NOT NULL DEFAULT '0', + `date` int(11) NOT NULL DEFAULT 0, `size` int(11) DEFAULT NULL, - `private` int(11) DEFAULT NULL, + `privacy` smallint(1) DEFAULT NULL, `storage` varchar(32) DEFAULT NULL, PRIMARY KEY (`id`) -) ENGINE=MyISAM AUTO_INCREMENT=26430 DEFAULT CHARSET=utf8; +) ENGINE=MyISAM AUTO_INCREMENT=29503 DEFAULT CHARSET=utf8; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -80,9 +81,9 @@ DROP TABLE IF EXISTS `invites`; CREATE TABLE `invites` ( `id` int(11) NOT NULL AUTO_INCREMENT, `hash` varchar(16) DEFAULT '', - `state` int(11) NOT NULL DEFAULT '0', + `state` int(11) NOT NULL DEFAULT 0, `attest` varchar(16) DEFAULT '', - `created` int(11) NOT NULL DEFAULT '0', + `created` int(11) NOT NULL DEFAULT 0, `username` varchar(16) DEFAULT '', PRIMARY KEY (`id`) ) ENGINE=MyISAM AUTO_INCREMENT=159 DEFAULT CHARSET=latin1; @@ -99,12 +100,12 @@ CREATE TABLE `keywords` ( `id` int(11) NOT NULL AUTO_INCREMENT, `keyword` varchar(16) NOT NULL DEFAULT '', `owner` varchar(16) NOT NULL DEFAULT '', - `createdate` int(11) NOT NULL DEFAULT '0', + `createdate` int(11) NOT NULL DEFAULT 0, `settings` varchar(512) DEFAULT NULL, `public` int(11) DEFAULT NULL, `color` varchar(16) DEFAULT NULL, PRIMARY KEY (`id`) -) ENGINE=MyISAM AUTO_INCREMENT=94 DEFAULT CHARSET=utf8; +) ENGINE=MyISAM AUTO_INCREMENT=140 DEFAULT CHARSET=utf8; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -120,11 +121,11 @@ CREATE TABLE `messages` ( `unread` tinyint(4) DEFAULT NULL, `sender` varchar(16) NOT NULL DEFAULT '', `recipient` varchar(16) NOT NULL DEFAULT '', - `date` int(11) NOT NULL DEFAULT '0', + `date` int(11) NOT NULL DEFAULT 0, `subject` varchar(64) NOT NULL DEFAULT '', - `body` blob, + `body` blob DEFAULT NULL, PRIMARY KEY (`id`) -) ENGINE=MyISAM AUTO_INCREMENT=6471 DEFAULT CHARSET=utf8; +) ENGINE=MyISAM AUTO_INCREMENT=6651 DEFAULT CHARSET=utf8; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -155,18 +156,18 @@ CREATE TABLE `threads` ( `title` varchar(64) NOT NULL DEFAULT '', `username` varchar(16) NOT NULL DEFAULT '', `keyword` varchar(16) DEFAULT NULL, - `createdate` int(11) NOT NULL DEFAULT '0', + `createdate` int(11) NOT NULL DEFAULT 0, `lastmodified` int(11) DEFAULT NULL, `size` int(11) DEFAULT NULL, - `private` smallint(6) DEFAULT NULL, - `allowed` varchar(512) DEFAULT NULL, + `privacy` smallint(6) DEFAULT 0, + `allowed` varchar(500) DEFAULT NULL, `flagged` int(11) DEFAULT NULL, `color` varchar(16) DEFAULT NULL, `viewed` int(11) DEFAULT NULL, - `revision` int(11) DEFAULT '0', + `revision` int(11) DEFAULT 0, `settings` varchar(512) DEFAULT '{}', PRIMARY KEY (`id`) -) ENGINE=MyISAM AUTO_INCREMENT=3401 DEFAULT CHARSET=utf8; +) ENGINE=MyISAM AUTO_INCREMENT=4504 DEFAULT CHARSET=utf8; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -183,19 +184,19 @@ CREATE TABLE `users` ( `realname` varchar(64) DEFAULT NULL, `email` varchar(64) DEFAULT NULL, `ulevel` int(11) DEFAULT NULL, - `grass` blob, + `grass` blob DEFAULT NULL, `firstseen` int(11) DEFAULT NULL, `lastseen` int(11) DEFAULT NULL, `phone` varchar(64) DEFAULT NULL, - `location` varchar(64) DEFAULT NULL, - `twitter` varchar(256) DEFAULT NULL, `website` varchar(255) DEFAULT NULL, - `avatar` varchar(255) DEFAULT NULL, + `location` varchar(64) DEFAULT NULL, + `twitter` varchar(255) DEFAULT NULL, `keywords` varchar(512) DEFAULT '', `stickies` varchar(512) DEFAULT '', `settings` varchar(512) DEFAULT '', + `avatar` varchar(255) DEFAULT NULL, PRIMARY KEY (`id`) -) ENGINE=MyISAM AUTO_INCREMENT=221 DEFAULT CHARSET=utf8; +) ENGINE=MyISAM AUTO_INCREMENT=244 DEFAULT CHARSET=utf8; /*!40101 SET character_set_client = @saved_cs_client */; /*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */; @@ -207,4 +208,4 @@ CREATE TABLE `users` ( /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; --- Dump completed on 2017-12-13 0:31:19 +-- Dump completed on 2019-08-26 22:40:10 diff --git a/bucky/app/site.js b/bucky/app/site.js index e266716..d38b094 100644 --- a/bucky/app/site.js +++ b/bucky/app/site.js @@ -46,7 +46,7 @@ site.init = function(){ } if (!process.env.SESSIONS_IN_MEMORY) { sessionSettings.store = new MongoStore({ - url: 'mongodb://127.0.0.1:28108/buckySessionDb' + url: 'mongodb://127.0.0.1:28108/buckySessionDb-'+ process.env.DB_NAME // type: 'mongodb', // host: 'localhost', // port: 27017, diff --git a/package-lock.json b/package-lock.json index 3c6edd9..d0bc7b0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5,9 +5,9 @@ "requires": true, "dependencies": { "@sailshq/lodash": { - "version": "3.10.3", - "resolved": "https://registry.npmjs.org/@sailshq/lodash/-/lodash-3.10.3.tgz", - "integrity": "sha512-XTF5BtsTSiSpTnfqrCGS5Q8FvSHWCywA0oRxFAZo8E1a8k1MMFUvk3VlRk3q/SusEYwy7gvVdyt9vvNlTa2VuA==" + "version": "3.10.4", + "resolved": "https://registry.npmjs.org/@sailshq/lodash/-/lodash-3.10.4.tgz", + "integrity": "sha512-YXJqp9gdHcZKAmBY/WnwFpPtNQp2huD/ME2YMurH2YHJvxrVzYsmpKw/pb7yINArRpp8E++fwbQd3ajYXGA45Q==" }, "accepts": { "version": "1.3.5", @@ -77,11 +77,11 @@ "integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=" }, "async": { - "version": "2.6.0", - "resolved": "https://registry.npmjs.org/async/-/async-2.6.0.tgz", - "integrity": "sha512-xAfGg1/NTLBBKlHFmnd7PlmUW9KhVQIUuSrYem9xzFUZy13ScvtyGGejaae9iAVRiRq9+Cx7DPFaAAhCpyxyPw==", + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/async/-/async-2.6.2.tgz", + "integrity": "sha512-H1qVYh1MYhEEFLsP97cVKqCGo7KfCyTt6uEWqsTBr9SO84oK9Uwbyd/yCW+6rKJLHksBNUVWZDAjfS+Ccx0Bbg==", "requires": { - "lodash": "^4.14.0" + "lodash": "^4.17.11" } }, "atob": { @@ -1022,9 +1022,9 @@ "integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=" }, "glob": { - "version": "7.1.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz", - "integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==", + "version": "7.1.4", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.4.tgz", + "integrity": "sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==", "requires": { "fs.realpath": "^1.0.0", "inflight": "^1.0.4", @@ -1424,9 +1424,9 @@ } }, "lodash": { - "version": "4.17.11", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz", - "integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==" + "version": "4.17.15", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz", + "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==" }, "lru-cache": { "version": "2.5.0", @@ -1521,9 +1521,9 @@ "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=" }, "mixin-deep": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.1.tgz", - "integrity": "sha512-8ZItLHeEgaqEvd5lYBXfm4EZSFCX29Jb9K+lAHhDKzReKBQKj3R+7NOF6tjqYi9t4oI8VUfaWITJQm86wnXGNQ==", + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz", + "integrity": "sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==", "requires": { "for-in": "^1.0.2", "is-extendable": "^1.0.1" @@ -2113,11 +2113,11 @@ "integrity": "sha1-G0KmJmoh8HQh0bC1S33BZ7AcATs=" }, "rimraf": { - "version": "2.6.2", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz", - "integrity": "sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==", + "version": "2.7.1", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz", + "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==", "requires": { - "glob": "^7.0.5" + "glob": "^7.1.3" } }, "rndm": { @@ -2211,28 +2211,28 @@ } }, "sessionstore": { - "version": "1.3.3", - "resolved": "https://registry.npmjs.org/sessionstore/-/sessionstore-1.3.3.tgz", - "integrity": "sha512-6DSWrLLPmenxp7r5SWM48RalJ4TjXGEshQQEVAO0KeNH4wX4fTfgHDQoUV7t/MMdXtYH5XJyoabF2qS3tzFShQ==", + "version": "1.3.5", + "resolved": "https://registry.npmjs.org/sessionstore/-/sessionstore-1.3.5.tgz", + "integrity": "sha512-15ZpdTyGDTH77tlr/YIWGqfzGpIQzawnY9RvES48Uyptpujai0q+HA6lszOFbzfilAM0ihUgs34IabCYAaQdTA==", "requires": { - "async": "2.6.0", + "async": "2.6.2", "jsondate": "0.0.1", - "lodash": "4.17.10", + "lodash": "4.17.14", "parent-require": "1.0.0", "tolerance": "1.0.0" }, "dependencies": { "lodash": { - "version": "4.17.10", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.10.tgz", - "integrity": "sha512-UejweD1pDoXu+AD825lWwp4ZGtSwgnpZxb3JDViD7StjQz+Nb/6l093lx4OQ0foGWNRoc19mWy7BzL+UAK2iVg==" + "version": "4.17.14", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.14.tgz", + "integrity": "sha512-mmKYbW3GLuJeX+iGP+Y7Gp1AiGHGbXHCOh/jZmrawMmsE7MS4znI3RL2FsjbqOyMayHInjOeykW7PEajUk1/xw==" } } }, "set-value": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.0.tgz", - "integrity": "sha512-hw0yxk9GT/Hr5yJEYnHNKYXkIA8mVJgd9ditYZCe16ZczcaELYYcfvaXesNACk2O8O0nTiPQcQhGUQj8JLzeeg==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz", + "integrity": "sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==", "requires": { "extend-shallow": "^2.0.1", "is-extendable": "^0.1.1", @@ -2282,9 +2282,9 @@ }, "dependencies": { "lodash": { - "version": "4.17.11", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz", - "integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==" + "version": "4.17.15", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz", + "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==" } } }, @@ -2682,35 +2682,14 @@ "integrity": "sha1-5z3T17DXxe2G+6xrCufYxqadUPo=" }, "union-value": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.0.tgz", - "integrity": "sha1-XHHDTLW61dzr4+oM0IIHulqhrqQ=", + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz", + "integrity": "sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==", "requires": { "arr-union": "^3.1.0", "get-value": "^2.0.6", "is-extendable": "^0.1.1", - "set-value": "^0.4.3" - }, - "dependencies": { - "extend-shallow": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "requires": { - "is-extendable": "^0.1.0" - } - }, - "set-value": { - "version": "0.4.3", - "resolved": "https://registry.npmjs.org/set-value/-/set-value-0.4.3.tgz", - "integrity": "sha1-fbCPnT0i3H945Trzw79GZuzfzPE=", - "requires": { - "extend-shallow": "^2.0.1", - "is-extendable": "^0.1.1", - "is-plain-object": "^2.0.1", - "to-object-path": "^0.3.0" - } - } + "set-value": "^2.0.1" } }, "unix-crypt-td-js": { diff --git a/package.json b/package.json index cf3be6b..19eb68a 100644 --- a/package.json +++ b/package.json @@ -31,7 +31,7 @@ "fs-readfile-promise": "^3.0.1", "knex": "^0.15.2", "knox": "^0.9.2", - "lodash": "^4.17.11", + "lodash": "^4.17.15", "mock-express": "^1.3.0", "mongodb": "^2.2.36", "multer": "^1.4.1", @@ -42,7 +42,7 @@ "passport": "^0.3.0", "passport-local": "^1.0.0", "serve-favicon": "^2.5.0", - "sessionstore": "^1.3.3", + "sessionstore": "^1.3.5", "skipper": "^0.8.7", "uglify-es": "^3.3.9", "unix-crypt-td-js": "^1.0.0", |