sceneStash.primary));
@@ -125,10 +131,13 @@ async function stash() {
}
async function unstash() {
+ console.log('unstash!', user);
+
try {
favorited.value = false;
await del(`/stashes/${user.primaryStash.id}/scenes/${props.scene.id}`);
} catch (error) {
+ console.error(error);
favorited.value = true;
}
}
@@ -149,6 +158,10 @@ async function unstash() {
fill: var(--text-light);
}
}
+
+ &.unstashed {
+ opacity: .5;
+ }
}
.poster-container {
diff --git a/config/default.cjs b/config/default.cjs
index 6fbf76d..d75c48d 100755
--- a/config/default.cjs
+++ b/config/default.cjs
@@ -17,6 +17,7 @@ module.exports = {
host: '127.0.0.1',
sqlPort: 9306,
httpPort: 9308,
+ forceSql: true,
maxMatches: 2000, // high match count needed primarily for actor aggregations
maxAggregateSize: 2000, // must be lower or equal to maxMatches
maxQueryTime: 10000,
diff --git a/package-lock.json b/package-lock.json
index 88ce9e6..472808e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -10,6 +10,7 @@
"@brillout/json-serializer": "^0.5.8",
"@dicebear/collection": "^7.0.5",
"@dicebear/core": "^7.0.5",
+ "@faker-js/faker": "^8.4.1",
"@floating-ui/dom": "^1.5.3",
"@floating-ui/vue": "^1.0.2",
"@resvg/resvg-js": "^2.6.0",
@@ -31,12 +32,15 @@
"express-query-boolean": "^2.0.0",
"express-session": "^1.18.0",
"floating-vue": "^5.2.2",
+ "ip-cidr": "^4.0.0",
"knex": "^3.1.0",
"manticoresearch": "^4.0.0",
"markdown-it": "^14.0.0",
"mathjs": "^12.2.1",
"mitt": "^3.0.1",
+ "mysql": "^2.18.1",
"nanoid": "^5.0.4",
+ "object.omit": "^3.0.0",
"path-to-regexp": "^6.2.1",
"pg": "^8.11.3",
"redis": "^4.6.12",
@@ -54,6 +58,7 @@
"@babel/cli": "^7.23.4",
"@babel/core": "^7.23.6",
"@babel/eslint-parser": "^7.23.3",
+ "@babel/plugin-syntax-import-attributes": "^7.23.3",
"@babel/plugin-transform-optional-chaining": "^7.23.4",
"@babel/preset-env": "^7.23.6",
"@csstools/postcss-global-data": "^2.1.1",
@@ -2867,6 +2872,21 @@
"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
}
},
+ "node_modules/@faker-js/faker": {
+ "version": "8.4.1",
+ "resolved": "https://registry.npmjs.org/@faker-js/faker/-/faker-8.4.1.tgz",
+ "integrity": "sha512-XQ3cU+Q8Uqmrbf2e0cIC/QN43sTBSC8KF12u29Mb47tWrt2hAgBXSgpZMj4Ao8Uk0iJcU99QsOCaIL8934obCg==",
+ "funding": [
+ {
+ "type": "opencollective",
+ "url": "https://opencollective.com/fakerjs"
+ }
+ ],
+ "engines": {
+ "node": "^14.17.0 || ^16.13.0 || >=18.0.0",
+ "npm": ">=6.14.13"
+ }
+ },
"node_modules/@floating-ui/core": {
"version": "1.5.2",
"resolved": "https://registry.npmjs.org/@floating-ui/core/-/core-1.5.2.tgz",
@@ -4029,6 +4049,14 @@
}
]
},
+ "node_modules/bignumber.js": {
+ "version": "9.0.0",
+ "resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-9.0.0.tgz",
+ "integrity": "sha512-t/OYhhJ2SD+YGBQcjY8GzzDHEk9f3nerxjtfa6tlMXfe7frs/WozhvCNoGvpM0P3bNf3Gq5ZRMlGr5f3r4/N8A==",
+ "engines": {
+ "node": "*"
+ }
+ },
"node_modules/binary-extensions": {
"version": "2.2.0",
"resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz",
@@ -4527,6 +4555,11 @@
"url": "https://opencollective.com/core-js"
}
},
+ "node_modules/core-util-is": {
+ "version": "1.0.3",
+ "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz",
+ "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ=="
+ },
"node_modules/cross-env": {
"version": "7.0.3",
"resolved": "https://registry.npmjs.org/cross-env/-/cross-env-7.0.3.tgz",
@@ -6301,6 +6334,29 @@
"node": ">= 0.10"
}
},
+ "node_modules/ip-address": {
+ "version": "9.0.5",
+ "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-9.0.5.tgz",
+ "integrity": "sha512-zHtQzGojZXTwZTHQqra+ETKd4Sn3vgi7uBmlPoXVWZqYvuKmtI0l/VZTjqGmJY9x88GGOaZ9+G9ES8hC4T4X8g==",
+ "dependencies": {
+ "jsbn": "1.1.0",
+ "sprintf-js": "^1.1.3"
+ },
+ "engines": {
+ "node": ">= 12"
+ }
+ },
+ "node_modules/ip-cidr": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/ip-cidr/-/ip-cidr-4.0.0.tgz",
+ "integrity": "sha512-i1Jhb9sqm2+PuOHTfya3ekAUi+dadhgcEz+4FKKY1hXemocP4Xf7io8Xflc74/i2ejxe/5fp4z8z3BAsfAZ8sw==",
+ "dependencies": {
+ "ip-address": "^9.0.5"
+ },
+ "engines": {
+ "node": ">=16.14.0"
+ }
+ },
"node_modules/ipaddr.js": {
"version": "1.9.1",
"resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz",
@@ -6407,6 +6463,17 @@
"url": "https://github.com/sponsors/ljharb"
}
},
+ "node_modules/is-extendable": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
+ "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
+ "dependencies": {
+ "is-plain-object": "^2.0.4"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
"node_modules/is-extglob": {
"version": "2.1.1",
"resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
@@ -6478,6 +6545,17 @@
"node": ">=8"
}
},
+ "node_modules/is-plain-object": {
+ "version": "2.0.4",
+ "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
+ "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
+ "dependencies": {
+ "isobject": "^3.0.1"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
"node_modules/is-promise": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/is-promise/-/is-promise-4.0.0.tgz",
@@ -6590,6 +6668,14 @@
"resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
"integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw=="
},
+ "node_modules/isobject": {
+ "version": "3.0.1",
+ "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+ "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
"node_modules/jackspeak": {
"version": "2.3.6",
"resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-2.3.6.tgz",
@@ -6630,6 +6716,11 @@
"js-yaml": "bin/js-yaml.js"
}
},
+ "node_modules/jsbn": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-1.1.0.tgz",
+ "integrity": "sha512-4bYVV3aAMtDTTu4+xsDYa6sy9GyJ69/amsu9sYF2zqjiEoZA5xJi3BrfX3uY+/IekIu7MwdObdbDWpoZdBv3/A=="
+ },
"node_modules/jsesc": {
"version": "2.5.2",
"resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
@@ -7069,6 +7160,47 @@
"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
"integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
},
+ "node_modules/mysql": {
+ "version": "2.18.1",
+ "resolved": "https://registry.npmjs.org/mysql/-/mysql-2.18.1.tgz",
+ "integrity": "sha512-Bca+gk2YWmqp2Uf6k5NFEurwY/0td0cpebAucFpY/3jhrwrVGuxU2uQFCHjU19SJfje0yQvi+rVWdq78hR5lig==",
+ "dependencies": {
+ "bignumber.js": "9.0.0",
+ "readable-stream": "2.3.7",
+ "safe-buffer": "5.1.2",
+ "sqlstring": "2.3.1"
+ },
+ "engines": {
+ "node": ">= 0.6"
+ }
+ },
+ "node_modules/mysql/node_modules/isarray": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+ "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ=="
+ },
+ "node_modules/mysql/node_modules/readable-stream": {
+ "version": "2.3.7",
+ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+ "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+ "dependencies": {
+ "core-util-is": "~1.0.0",
+ "inherits": "~2.0.3",
+ "isarray": "~1.0.0",
+ "process-nextick-args": "~2.0.0",
+ "safe-buffer": "~5.1.1",
+ "string_decoder": "~1.1.1",
+ "util-deprecate": "~1.0.1"
+ }
+ },
+ "node_modules/mysql/node_modules/string_decoder": {
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+ "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+ "dependencies": {
+ "safe-buffer": "~5.1.0"
+ }
+ },
"node_modules/nanoid": {
"version": "5.0.4",
"resolved": "https://registry.npmjs.org/nanoid/-/nanoid-5.0.4.tgz",
@@ -7267,6 +7399,17 @@
"get-intrinsic": "^1.2.1"
}
},
+ "node_modules/object.omit": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/object.omit/-/object.omit-3.0.0.tgz",
+ "integrity": "sha512-EO+BCv6LJfu+gBIF3ggLicFebFLN5zqzz/WWJlMFfkMyGth+oBkhxzDl0wx2W4GkLzuQs/FsSkXZb2IMWQqmBQ==",
+ "dependencies": {
+ "is-extendable": "^1.0.0"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
"node_modules/object.values": {
"version": "1.1.7",
"resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.7.tgz",
@@ -7765,6 +7908,11 @@
"node": ">= 0.8.0"
}
},
+ "node_modules/process-nextick-args": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
+ "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="
+ },
"node_modules/proxy-addr": {
"version": "2.0.7",
"resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz",
@@ -8498,6 +8646,19 @@
"node": ">= 10.x"
}
},
+ "node_modules/sprintf-js": {
+ "version": "1.1.3",
+ "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.3.tgz",
+ "integrity": "sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA=="
+ },
+ "node_modules/sqlstring": {
+ "version": "2.3.1",
+ "resolved": "https://registry.npmjs.org/sqlstring/-/sqlstring-2.3.1.tgz",
+ "integrity": "sha512-ooAzh/7dxIG5+uDik1z/Rd1vli0+38izZhGzSa34FwR7IbelPWCCKSNIl8jlL/F7ERvy8CB2jNeM1E9i9mXMAQ==",
+ "engines": {
+ "node": ">= 0.6"
+ }
+ },
"node_modules/stack-trace": {
"version": "0.0.10",
"resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.10.tgz",
@@ -11857,6 +12018,11 @@
"integrity": "sha512-gMsVel9D7f2HLkBma9VbtzZRehRogVRfbr++f06nL2vnCGCNlzOD+/MUov/F4p8myyAHspEhVobgjpX64q5m6A==",
"dev": true
},
+ "@faker-js/faker": {
+ "version": "8.4.1",
+ "resolved": "https://registry.npmjs.org/@faker-js/faker/-/faker-8.4.1.tgz",
+ "integrity": "sha512-XQ3cU+Q8Uqmrbf2e0cIC/QN43sTBSC8KF12u29Mb47tWrt2hAgBXSgpZMj4Ao8Uk0iJcU99QsOCaIL8934obCg=="
+ },
"@floating-ui/core": {
"version": "1.5.2",
"resolved": "https://registry.npmjs.org/@floating-ui/core/-/core-1.5.2.tgz",
@@ -12657,6 +12823,11 @@
"resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
"integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA=="
},
+ "bignumber.js": {
+ "version": "9.0.0",
+ "resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-9.0.0.tgz",
+ "integrity": "sha512-t/OYhhJ2SD+YGBQcjY8GzzDHEk9f3nerxjtfa6tlMXfe7frs/WozhvCNoGvpM0P3bNf3Gq5ZRMlGr5f3r4/N8A=="
+ },
"binary-extensions": {
"version": "2.2.0",
"resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz",
@@ -13006,6 +13177,11 @@
"browserslist": "^4.22.2"
}
},
+ "core-util-is": {
+ "version": "1.0.3",
+ "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz",
+ "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ=="
+ },
"cross-env": {
"version": "7.0.3",
"resolved": "https://registry.npmjs.org/cross-env/-/cross-env-7.0.3.tgz",
@@ -14317,6 +14493,23 @@
"resolved": "https://registry.npmjs.org/interpret/-/interpret-2.2.0.tgz",
"integrity": "sha512-Ju0Bz/cEia55xDwUWEa8+olFpCiQoypjnQySseKtmjNrnps3P+xfpUmGr90T7yjlVJmOtybRvPXhKMbHr+fWnw=="
},
+ "ip-address": {
+ "version": "9.0.5",
+ "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-9.0.5.tgz",
+ "integrity": "sha512-zHtQzGojZXTwZTHQqra+ETKd4Sn3vgi7uBmlPoXVWZqYvuKmtI0l/VZTjqGmJY9x88GGOaZ9+G9ES8hC4T4X8g==",
+ "requires": {
+ "jsbn": "1.1.0",
+ "sprintf-js": "^1.1.3"
+ }
+ },
+ "ip-cidr": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/ip-cidr/-/ip-cidr-4.0.0.tgz",
+ "integrity": "sha512-i1Jhb9sqm2+PuOHTfya3ekAUi+dadhgcEz+4FKKY1hXemocP4Xf7io8Xflc74/i2ejxe/5fp4z8z3BAsfAZ8sw==",
+ "requires": {
+ "ip-address": "^9.0.5"
+ }
+ },
"ipaddr.js": {
"version": "1.9.1",
"resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz",
@@ -14390,6 +14583,14 @@
"has-tostringtag": "^1.0.0"
}
},
+ "is-extendable": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
+ "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
+ "requires": {
+ "is-plain-object": "^2.0.4"
+ }
+ },
"is-extglob": {
"version": "2.1.1",
"resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
@@ -14434,6 +14635,14 @@
"integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==",
"dev": true
},
+ "is-plain-object": {
+ "version": "2.0.4",
+ "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
+ "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
+ "requires": {
+ "isobject": "^3.0.1"
+ }
+ },
"is-promise": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/is-promise/-/is-promise-4.0.0.tgz",
@@ -14510,6 +14719,11 @@
"resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
"integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw=="
},
+ "isobject": {
+ "version": "3.0.1",
+ "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+ "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg=="
+ },
"jackspeak": {
"version": "2.3.6",
"resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-2.3.6.tgz",
@@ -14539,6 +14753,11 @@
"argparse": "^2.0.1"
}
},
+ "jsbn": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-1.1.0.tgz",
+ "integrity": "sha512-4bYVV3aAMtDTTu4+xsDYa6sy9GyJ69/amsu9sYF2zqjiEoZA5xJi3BrfX3uY+/IekIu7MwdObdbDWpoZdBv3/A=="
+ },
"jsesc": {
"version": "2.5.2",
"resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
@@ -14860,6 +15079,46 @@
"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
"integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
},
+ "mysql": {
+ "version": "2.18.1",
+ "resolved": "https://registry.npmjs.org/mysql/-/mysql-2.18.1.tgz",
+ "integrity": "sha512-Bca+gk2YWmqp2Uf6k5NFEurwY/0td0cpebAucFpY/3jhrwrVGuxU2uQFCHjU19SJfje0yQvi+rVWdq78hR5lig==",
+ "requires": {
+ "bignumber.js": "9.0.0",
+ "readable-stream": "2.3.7",
+ "safe-buffer": "5.1.2",
+ "sqlstring": "2.3.1"
+ },
+ "dependencies": {
+ "isarray": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+ "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ=="
+ },
+ "readable-stream": {
+ "version": "2.3.7",
+ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+ "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+ "requires": {
+ "core-util-is": "~1.0.0",
+ "inherits": "~2.0.3",
+ "isarray": "~1.0.0",
+ "process-nextick-args": "~2.0.0",
+ "safe-buffer": "~5.1.1",
+ "string_decoder": "~1.1.1",
+ "util-deprecate": "~1.0.1"
+ }
+ },
+ "string_decoder": {
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+ "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+ "requires": {
+ "safe-buffer": "~5.1.0"
+ }
+ }
+ }
+ },
"nanoid": {
"version": "5.0.4",
"resolved": "https://registry.npmjs.org/nanoid/-/nanoid-5.0.4.tgz",
@@ -15003,6 +15262,14 @@
"get-intrinsic": "^1.2.1"
}
},
+ "object.omit": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/object.omit/-/object.omit-3.0.0.tgz",
+ "integrity": "sha512-EO+BCv6LJfu+gBIF3ggLicFebFLN5zqzz/WWJlMFfkMyGth+oBkhxzDl0wx2W4GkLzuQs/FsSkXZb2IMWQqmBQ==",
+ "requires": {
+ "is-extendable": "^1.0.0"
+ }
+ },
"object.values": {
"version": "1.1.7",
"resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.7.tgz",
@@ -15338,6 +15605,11 @@
"integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
"dev": true
},
+ "process-nextick-args": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
+ "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="
+ },
"proxy-addr": {
"version": "2.0.7",
"resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz",
@@ -15857,6 +16129,16 @@
"resolved": "https://registry.npmjs.org/split2/-/split2-4.2.0.tgz",
"integrity": "sha512-UcjcJOWknrNkF6PLX83qcHM6KHgVKNkV62Y8a5uYDVv9ydGQVwAHMKqHdJje1VTWpljG0WYpCDhrCdAOYH4TWg=="
},
+ "sprintf-js": {
+ "version": "1.1.3",
+ "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.3.tgz",
+ "integrity": "sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA=="
+ },
+ "sqlstring": {
+ "version": "2.3.1",
+ "resolved": "https://registry.npmjs.org/sqlstring/-/sqlstring-2.3.1.tgz",
+ "integrity": "sha512-ooAzh/7dxIG5+uDik1z/Rd1vli0+38izZhGzSa34FwR7IbelPWCCKSNIl8jlL/F7ERvy8CB2jNeM1E9i9mXMAQ=="
+ },
"stack-trace": {
"version": "0.0.10",
"resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.10.tgz",
diff --git a/package.json b/package.json
index e80d9a7..2dbb34d 100644
--- a/package.json
+++ b/package.json
@@ -10,6 +10,7 @@
"@brillout/json-serializer": "^0.5.8",
"@dicebear/collection": "^7.0.5",
"@dicebear/core": "^7.0.5",
+ "@faker-js/faker": "^8.4.1",
"@floating-ui/dom": "^1.5.3",
"@floating-ui/vue": "^1.0.2",
"@resvg/resvg-js": "^2.6.0",
@@ -31,12 +32,15 @@
"express-query-boolean": "^2.0.0",
"express-session": "^1.18.0",
"floating-vue": "^5.2.2",
+ "ip-cidr": "^4.0.0",
"knex": "^3.1.0",
"manticoresearch": "^4.0.0",
"markdown-it": "^14.0.0",
"mathjs": "^12.2.1",
"mitt": "^3.0.1",
+ "mysql": "^2.18.1",
"nanoid": "^5.0.4",
+ "object.omit": "^3.0.0",
"path-to-regexp": "^6.2.1",
"pg": "^8.11.3",
"redis": "^4.6.12",
@@ -55,6 +59,7 @@
"@babel/cli": "^7.23.4",
"@babel/core": "^7.23.6",
"@babel/eslint-parser": "^7.23.3",
+ "@babel/plugin-syntax-import-attributes": "^7.23.3",
"@babel/plugin-transform-optional-chaining": "^7.23.4",
"@babel/preset-env": "^7.23.6",
"@csstools/postcss-global-data": "^2.1.1",
diff --git a/pages/stashes/@username/+Page.vue b/pages/stashes/@username/+Page.vue
new file mode 100644
index 0000000..49f1480
--- /dev/null
+++ b/pages/stashes/@username/+Page.vue
@@ -0,0 +1,91 @@
+
+
+
+
+
+
+
+
diff --git a/pages/stashes/@username/+onBeforeRender.js b/pages/stashes/@username/+onBeforeRender.js
new file mode 100644
index 0000000..ca934c0
--- /dev/null
+++ b/pages/stashes/@username/+onBeforeRender.js
@@ -0,0 +1,51 @@
+import { render } from 'vike/abort'; /* eslint-disable-line import/extensions */
+
+import { fetchStashByUsernameAndSlug } from '#/src/stashes.js';
+import { fetchScenes } from '#/src/scenes.js';
+import { curateScenesQuery } from '#/src/web/scenes.js';
+import { HttpError } from '#/src/errors.js';
+
+export async function onBeforeRender(pageContext) {
+ try {
+ const stash = await fetchStashByUsernameAndSlug(pageContext.routeParams.username, pageContext.routeParams.stashSlug, pageContext.user);
+
+ const stashScenes = await fetchScenes(await curateScenesQuery({
+ ...pageContext.urlQuery,
+ scope: pageContext.routeParams.scope || 'latest',
+ stashId: stash.id,
+ }), {
+ page: Number(pageContext.routeParams.page) || 1,
+ limit: Number(pageContext.urlParsed.search.limit) || 30,
+ }, pageContext.user);
+
+ const {
+ scenes,
+ aggActors,
+ aggTags,
+ aggChannels,
+ total,
+ limit,
+ } = stashScenes;
+
+ return {
+ pageContext: {
+ title: `${stash.name} by ${stash.user.username}`,
+ pageProps: {
+ stash,
+ scenes,
+ aggActors,
+ aggTags,
+ aggChannels,
+ total,
+ limit,
+ },
+ },
+ };
+ } catch (error) {
+ if (error instanceof HttpError) {
+ throw render(error.httpCode, error.message);
+ }
+
+ throw error;
+ }
+}
diff --git a/pages/stashes/@username/+route.js b/pages/stashes/@username/+route.js
new file mode 100644
index 0000000..1823d3b
--- /dev/null
+++ b/pages/stashes/@username/+route.js
@@ -0,0 +1,23 @@
+import { match } from 'path-to-regexp';
+// import { resolveRoute } from 'vike/routing'; // eslint-disable-line import/extensions
+
+const path = '/stash/:username/:stashSlug/:scope?/:page?';
+const urlMatch = match(path, { decode: decodeURIComponent });
+
+export default (pageContext) => {
+ const matched = urlMatch(pageContext.urlPathname);
+
+ if (matched) {
+ return {
+ routeParams: {
+ username: matched.params.username,
+ stashSlug: matched.params.stashSlug,
+ scope: matched.params.scope || 'latest',
+ page: matched.params.page || '1',
+ path,
+ },
+ };
+ }
+
+ return false;
+};
diff --git a/src/auth.js b/src/auth.js
index 3d82d4a..329d2df 100755
--- a/src/auth.js
+++ b/src/auth.js
@@ -8,7 +8,9 @@ import { shapes } from '@dicebear/collection';
import { knexOwner as knex } from './knex.js';
import { curateUser, fetchUser } from './users.js';
import { HttpError } from './errors.js';
+import initLogger from './logger.js';
+const logger = initLogger();
const scrypt = util.promisify(crypto.scrypt);
async function verifyPassword(password, storedPassword) {
@@ -32,22 +34,21 @@ async function generateAvatar(user) {
});
await fs.mkdir('media/avatars', { recursive: true });
-
await avatar.png().toFile(`media/avatars/${user.id}_${user.username}.png`);
+
+ logger.verbose(`Generated avatar for '${user.username}' (${user.id})`);
}
-export async function login(credentials) {
+export async function login(credentials, userIp) {
if (!config.auth.login) {
throw new HttpError('Logins are currently disabled', 405);
}
- const user = await fetchUser(credentials.username.trim(), {
+ const { user, stashes } = await fetchUser(credentials.username.trim(), {
email: true,
raw: true,
});
- console.log('login user', user);
-
if (!user) {
throw new HttpError('Username or password incorrect', 401);
}
@@ -58,15 +59,21 @@ export async function login(credentials) {
.update('last_login', 'NOW()')
.where('id', user.id);
- if (!user.avatar) {
+ console.log('login user', user);
+
+ logger.verbose(`Login from '${user.username}' (${user.id}, ${userIp})`);
+
+ try {
+ await fs.access(`media/avatars/${user.id}_${user.username}.png`);
+ } catch (error) {
await generateAvatar(user);
}
// fetched the raw user for password verification, don't return directly to user
- return curateUser(user);
+ return curateUser(user, { stashes });
}
-export async function signup(credentials) {
+export async function signup(credentials, userIp) {
if (!config.auth.signup) {
throw new HttpError('Sign-ups are currently disabled', 405);
}
@@ -126,6 +133,8 @@ export async function signup(credentials) {
primary: true,
});
+ logger.verbose(`Signup from '${curatedUsername}' (${userId}, ${credentials.email}, ${userIp})`);
+
await generateAvatar({
id: userId,
username: curatedUsername,
diff --git a/src/knex.js b/src/knex.js
index 6e04eda..167bc25 100755
--- a/src/knex.js
+++ b/src/knex.js
@@ -19,4 +19,17 @@ export const knexOwner = knex({
// debug: process.env.NODE_ENV === 'development',
});
+export const knexManticore = knex({
+ client: 'mysql',
+ connection: {
+ host: config.database.manticore.host,
+ port: config.database.manticore.sqlPort,
+ database: 'Manticore',
+ },
+ asyncStackTraces: process.env.NODE_ENV === 'development',
+ wrapIdentifier(value, _original, _queryContext) {
+ return value;
+ },
+});
+
export default knexQuery;
diff --git a/src/manticore.js b/src/manticore.js
index 74a971d..7765c6c 100644
--- a/src/manticore.js
+++ b/src/manticore.js
@@ -6,3 +6,5 @@ const mantiClient = new manticore.ApiClient();
mantiClient.basePath = `http://${config.database.manticore.host}:${config.database.manticore.httpPort}`;
export const searchApi = new manticore.SearchApi(mantiClient);
+export const indexApi = new manticore.IndexApi(mantiClient);
+export const utilsApi = new manticore.UtilsApi();
diff --git a/src/scenes.js b/src/scenes.js
index 808ae59..88e0a13 100644
--- a/src/scenes.js
+++ b/src/scenes.js
@@ -1,7 +1,8 @@
import config from 'config';
+import util from 'util'; /* eslint-disable-line no-unused-vars */
-import { knexOwner as knex } from './knex.js';
-import { searchApi } from './manticore.js';
+import { knexOwner as knex, knexManticore } from './knex.js';
+import { searchApi, utilsApi } from './manticore.js';
import { HttpError } from './errors.js';
import { fetchActorsById, curateActor, sortActorsByGender } from './actors.js';
import { fetchTagsById } from './tags.js';
@@ -151,6 +152,8 @@ export async function fetchScenesById(sceneIds, reqUser) {
}).filter(Boolean);
}
+const sqlImplied = ['scenes_stashed'];
+
function curateOptions(options) {
if (options?.limit > 100) {
throw new HttpError('Limit must be <= 100', 400);
@@ -163,10 +166,12 @@ function curateOptions(options) {
aggregateActors: (options.aggregate ?? true) && (options.aggregateActors ?? true),
aggregateTags: (options.aggregate ?? true) && (options.aggregateTags ?? true),
aggregateChannels: (options.aggregate ?? true) && (options.aggregateChannels ?? true),
+ index: options.index || 'scenes',
+ useSql: options.useSql || (typeof options.useSql === 'undefined' && sqlImplied.includes(options.index)) || false,
};
}
-function buildQuery(filters = {}) {
+function buildQuery(filters = {}, options) {
const query = {
bool: {
must: [],
@@ -210,6 +215,7 @@ function buildQuery(filters = {}) {
}
if (filters.query) {
+ /*
query.bool.must.push({
bool: {
should: [
@@ -224,6 +230,9 @@ function buildQuery(filters = {}) {
],
},
});
+ */
+
+ query.bool.must.push({ match: { '!title': filters.query } }); // title_filtered is matched instead of title
}
if (filters.tagIds) {
@@ -249,6 +258,10 @@ function buildQuery(filters = {}) {
});
}
+ if (filters.stashId && options.index === 'scenes_stashed') {
+ query.bool.must.push({ equals: { stash_id: filters.stashId } });
+ }
+
/* tag filter
must_not: [
{
@@ -281,6 +294,7 @@ function buildAggregates(options) {
field: 'tag_ids',
size: config.database.manticore.maxAggregateSize,
},
+ sort: [{ 'count(*)': { order: 'desc' } }],
};
}
@@ -290,6 +304,7 @@ function buildAggregates(options) {
field: 'channel_id',
size: config.database.manticore.maxAggregateSize,
},
+ sort: [{ 'count(*)': { order: 'desc' } }],
};
}
@@ -304,20 +319,11 @@ function countAggregations(buckets) {
return Object.fromEntries(buckets.map((bucket) => [bucket.key, { count: bucket.doc_count }]));
}
-export async function fetchScenes(filters, rawOptions, reqUser) {
- const options = curateOptions(rawOptions);
- const { query, sort } = buildQuery(filters);
-
- console.log('filters', filters);
- console.log('options', options);
- console.log('query', query.bool.must);
-
- console.log('request user', reqUser);
-
- console.time('manticore');
+async function queryManticoreJson(filters, options, _reqUser) {
+ const { query, sort } = buildQuery(filters, options);
const result = await searchApi.search({
- index: 'scenes',
+ index: options.index,
query,
limit: options.limit,
offset: (options.page - 1) * options.limit,
@@ -339,31 +345,181 @@ export async function fetchScenes(filters, rawOptions, reqUser) {
},
});
- console.timeEnd('manticore');
+ const scenes = result.hits.hits.map((hit) => ({
+ id: hit._id,
+ ...hit._source,
+ _score: hit._score,
+ }));
- const actorCounts = options.aggregateActors && countAggregations(result.aggregations?.actorIds?.buckets);
- const tagCounts = options.aggregateTags && countAggregations(result.aggregations?.tagIds?.buckets);
- const channelCounts = options.aggregateChannels && countAggregations(result.aggregations?.channelIds?.buckets);
+ return {
+ scenes,
+ total: result.hits.total,
+ aggregations: result.aggregations && Object.fromEntries(Object.entries(result.aggregations).map(([key, { buckets }]) => [key, buckets])),
+ };
+}
+
+async function queryManticoreSql(filters, options, _reqUser) {
+ const aggSize = 10 || config.database.manticore.maxAggregateSize;
+
+ const sqlQuery = knexManticore.raw(`
+ :query:
+ OPTION field_weights=(
+ title_filtered=7,
+ actors=10,
+ tags=9,
+ meta=6,
+ channel_name=2,
+ channel_slug=3,
+ network_name=1,
+ network_slug=1
+ ),
+ max_matches=:maxMatches:,
+ max_query_time=:maxQueryTime:
+ :actorsFacet:
+ :tagsFacet:
+ :channelsFacet:
+ `, {
+ query: knexManticore('scenes')
+ .select(knex.raw('*, weight() as _score'))
+ .modify((builder) => {
+ if (filters.stashId) {
+ builder
+ .innerJoin('scenes_stashed', 'scenes.id', 'scenes_stashed.scene_id')
+ .where('scenes_stashed.stash_id', filters.stashId);
+ }
+
+ if (filters.query) {
+ builder.whereRaw('match(\'@!title :query:\', scenes)', { query: filters.query });
+ }
+
+ if (filters.tagIds?.length > 0) {
+ builder.whereIn('any(tag_ids)', filters.tagIds);
+ }
+
+ if (filters.entityId) {
+ builder.where((whereBuilder) => {
+ whereBuilder
+ .where('channel_id', filters.entityId)
+ .orWhere('network_id', filters.entityId);
+ });
+ }
+
+ if (filters.actorIds?.length > 0) {
+ builder.whereIn('any(actor_ids)', filters.actorIds);
+ }
+
+ if (!filters.scope || filters.scope === 'latest') {
+ builder
+ .where('effective_date', '<
+
+
+
+
+ ![]()
{{ stash.user.username }}
+
+
+
+
+
+
+
+
+
+