DebaucheryLibrarian
/
traxxx
2
1
Fork 1
Code Issues 37 Pull Requests 1 Releases Wiki Activity

Updated MG session acquisition.

This commit is contained in:
DebaucheryLibrarian 2023-03-27 00:01:38 +02:00
parent a7d094f0b6
commit 1a24d39761
30 changed files with 241 additions and 177 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
assets/components/filters/filter-bar.vue
View File

@ -15,7 +15,10 @@
class="total" class="total"
>{{ itemsTotal }} <template v-if="itemsTotal === 1">scene</template><template v-else>scenes</template></span> >{{ itemsTotal }} <template v-if="itemsTotal === 1">scene</template><template v-else>scenes</template></span>
<div class="filters"> <div
v-if="showFilters"
class="filters"
>
<ActorFilter <ActorFilter
class="filters-filter" class="filters-filter"
:available-actors="availableActors" :available-actors="availableActors"
@ -72,9 +75,9 @@ export default {
type: Function, type: Function,
default: null, default: null,
}, },
isHome: { showFilters: {
type: Boolean, type: Boolean,
default: false, default: true,
}, },
showTotal: { showTotal: {
type: Boolean, type: Boolean,

2
assets/components/home/home.vue
View File

@ -10,7 +10,7 @@
<FilterBar <FilterBar
ref="filter" ref="filter"
:fetch-releases="fetchReleases" :fetch-releases="fetchReleases"
:is-home="true" :show-filters="false"
:items-total="totalCount" :items-total="totalCount"
:items-per-page="limit" :items-per-page="limit"
:content="$refs.content" :content="$refs.content"

355
package-lock.json generated
View File

@ -12,6 +12,7 @@
"@casl/ability": "^5.2.2", "@casl/ability": "^5.2.2",
"@graphile-contrib/pg-order-by-related": "^1.0.0-beta.6", "@graphile-contrib/pg-order-by-related": "^1.0.0-beta.6",
"@graphile-contrib/pg-simplify-inflector": "^6.1.0", "@graphile-contrib/pg-simplify-inflector": "^6.1.0",
"@graphile/pg-aggregates": "^0.1.1",
"acorn": "^8.0.4", "acorn": "^8.0.4",
"array-equal": "^1.0.0", "array-equal": "^1.0.0",
"aws-sdk": "^2.847.0", "aws-sdk": "^2.847.0",
@ -62,7 +63,7 @@
"object.omit": "^3.0.0", "object.omit": "^3.0.0",
"opn": "^6.0.0", "opn": "^6.0.0",
"pg": "^8.5.1", "pg": "^8.5.1",
"postgraphile": "^4.10.0", "postgraphile": "^4.13.0",
"postgraphile-plugin-connection-filter": "^2.2.2", "postgraphile-plugin-connection-filter": "^2.2.2",
"promise-task-queue": "^1.2.0", "promise-task-queue": "^1.2.0",
"prop-types": "^15.7.2", "prop-types": "^15.7.2",
@ -3017,6 +3018,22 @@
"node": ">=8.6" "node": ">=8.6"
} }
}, },
"node_modules/@graphile/pg-aggregates": {
"version": "0.1.1",
"resolved": "https://registry.npmjs.org/@graphile/pg-aggregates/-/pg-aggregates-0.1.1.tgz",
"integrity": "sha512-bPfniRw4oN9nNP8tkRlbBslNMA38fhVWNhhaReODhPVEshwquzUmSmSCtSVhS4J+StEFgrP7Z+z1IN0/ror2XA==",
"dependencies": {
"@types/debug": "^4.1.5",
"@types/graphql": "^14.5.0",
"debug": "^4.3.1",
"graphile-utils": "^4.12.0-alpha.0"
},
"peerDependencies": {
"graphile-build": "^4.12.0-alpha.0",
"graphile-build-pg": "^4.12.0-alpha.0",
"graphql": ">0.6.0 <16"
}
},
"node_modules/@humanwhocodes/config-array": { "node_modules/@humanwhocodes/config-array": {
"version": "0.6.0", "version": "0.6.0",
"resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.6.0.tgz", "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.6.0.tgz",
@ -3237,6 +3254,15 @@
"integrity": "sha512-C6N5s2ZFtuZRj54k2/zyRhNDjJwwcViAM3Nbm8zjBpbqAdZ00mr0CFxvSKeO8Y/e03WVFLpQMdHYVfUd6SB+Hw==", "integrity": "sha512-C6N5s2ZFtuZRj54k2/zyRhNDjJwwcViAM3Nbm8zjBpbqAdZ00mr0CFxvSKeO8Y/e03WVFLpQMdHYVfUd6SB+Hw==",
"dev": true "dev": true
}, },
"node_modules/@types/graphql": {
"version": "14.5.0",
"resolved": "https://registry.npmjs.org/@types/graphql/-/graphql-14.5.0.tgz",
"integrity": "sha512-MOkzsEp1Jk5bXuAsHsUi6BVv0zCO+7/2PTiZMXWDSsMXvNU6w/PLMQT2vHn8hy2i0JqojPz1Sz6rsFjHtsU0lA==",
"deprecated": "This is a stub types definition. graphql provides its own type definitions, so you do not need this installed.",
"dependencies": {
"graphql": "*"
}
},
"node_modules/@types/json-schema": { "node_modules/@types/json-schema": {
"version": "7.0.9", "version": "7.0.9",
"resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.9.tgz", "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.9.tgz",
@ -3249,9 +3275,9 @@
"integrity": "sha512-sqm9g7mHlPY/43fcSNrCYfOeX9zkTTK+euO5E6+CVijSMm5tTjkVdwdqRkY3ljjIAf8679vps5jKUoJBCLsMDA==" "integrity": "sha512-sqm9g7mHlPY/43fcSNrCYfOeX9zkTTK+euO5E6+CVijSMm5tTjkVdwdqRkY3ljjIAf8679vps5jKUoJBCLsMDA=="
}, },
"node_modules/@types/jsonwebtoken": { "node_modules/@types/jsonwebtoken": {
"version": "8.5.5", "version": "9.0.1",
"resolved": "https://registry.npmjs.org/@types/jsonwebtoken/-/jsonwebtoken-8.5.5.tgz", "resolved": "https://registry.npmjs.org/@types/jsonwebtoken/-/jsonwebtoken-9.0.1.tgz",
"integrity": "sha512-OGqtHQ7N5/Ap/TUwO6IgHDuLiAoTmHhGpNvgkCm/F4N6pKzx/RBSfr2OXZSwC6vkfnsEdb6+7DNZVtiXiwdwFw==", "integrity": "sha512-c5ltxazpWabia/4UzhIoaDcIza4KViOQhdbjRlfcIGVnsE3c3brkz9Z+F/EeJIECOQP7W7US2hNE930cWWkPiw==",
"dependencies": { "dependencies": {
"@types/node": "*" "@types/node": "*"
} }
@ -4873,7 +4899,7 @@
"node_modules/buffer-equal-constant-time": { "node_modules/buffer-equal-constant-time": {
"version": "1.0.1", "version": "1.0.1",
"resolved": "https://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz", "resolved": "https://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz",
"integrity": "sha1-+OcRMvf/5uAaXJaXpMbz5I1cyBk=" "integrity": "sha512-zRpUiDwd/xk6ADqPMATG8vc9VPrkck7T07OIx0gnjmJAnHnTVXNQG3vfvWNuiZIkwu9KrKdA1iJKfsfTVxE6NA=="
}, },
"node_modules/buffer-from": { "node_modules/buffer-from": {
"version": "1.1.2", "version": "1.1.2",
@ -9123,14 +9149,14 @@
"integrity": "sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==" "integrity": "sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ=="
}, },
"node_modules/graphile-build": { "node_modules/graphile-build": {
"version": "4.12.2", "version": "4.13.0",
"resolved": "https://registry.npmjs.org/graphile-build/-/graphile-build-4.12.2.tgz", "resolved": "https://registry.npmjs.org/graphile-build/-/graphile-build-4.13.0.tgz",
"integrity": "sha512-UqomiSnWPj4pjO6Q6PzT1YeH96k7e0JzCBI3X8kkELG+PP2BOQCNE5e+xLJvohJmUr0YBTgflPQo7P1ZESPwww==", "integrity": "sha512-KPBrHgRw5fury6l9WEQH6ys1UtnxrRrG+Ehnr68NvfNELp4T+QsekTSVFi5LWoJOaXvdYMqP2L8MFBRQP2vKsw==",
"dependencies": { "dependencies": {
"@graphile/lru": "4.11.0", "@graphile/lru": "4.11.0",
"chalk": "^2.4.2", "chalk": "^2.4.2",
"debug": "^4.1.1", "debug": "^4.1.1",
"graphql-parse-resolve-info": "4.12.0", "graphql-parse-resolve-info": "4.13.0",
"iterall": "^1.2.2", "iterall": "^1.2.2",
"lodash": ">=4 <5", "lodash": ">=4 <5",
"lru-cache": "^5.0.0", "lru-cache": "^5.0.0",
@ -9145,18 +9171,18 @@
} }
}, },
"node_modules/graphile-build-pg": { "node_modules/graphile-build-pg": {
"version": "4.12.2", "version": "4.13.0",
"resolved": "https://registry.npmjs.org/graphile-build-pg/-/graphile-build-pg-4.12.2.tgz", "resolved": "https://registry.npmjs.org/graphile-build-pg/-/graphile-build-pg-4.13.0.tgz",
"integrity": "sha512-4zWS7yb2L3afNpzADX9iBc2do4UOd3abiHd/WG0ao8lharU4YxEDS5qKlE2/2s+gSNqW2okKXEuI1/ci9DXVbw==", "integrity": "sha512-1FD+3wjCdK1lbICY1QVO26A7s8efSjR522LarL9Bx1M1iBJHNIpCEW2PK+LkulQjY1l5LGQ1A93GQFqi6cZ6bg==",
"dependencies": { "dependencies": {
"@graphile/lru": "4.11.0", "@graphile/lru": "4.11.0",
"chalk": "^2.4.2", "chalk": "^2.4.2",
"debug": "^4.1.1", "debug": "^4.1.1",
"graphile-build": "4.12.2", "graphile-build": "4.13.0",
"jsonwebtoken": "^8.5.1", "jsonwebtoken": "^9.0.0",
"lodash": ">=4 <5", "lodash": ">=4 <5",
"lru-cache": ">=4 <5", "lru-cache": ">=4 <5",
"pg-sql2": "4.12.1" "pg-sql2": "4.13.0"
}, },
"engines": { "engines": {
"node": ">=8.6" "node": ">=8.6"
@ -9180,9 +9206,9 @@
"integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=" "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI="
}, },
"node_modules/graphile-utils": { "node_modules/graphile-utils": {
"version": "4.12.2", "version": "4.13.0",
"resolved": "https://registry.npmjs.org/graphile-utils/-/graphile-utils-4.12.2.tgz", "resolved": "https://registry.npmjs.org/graphile-utils/-/graphile-utils-4.13.0.tgz",
"integrity": "sha512-2UcTWWMFLFkKwbDLqlN0mF5sxLqz9y0p7I3zNOJpXtHVjrHyp7oQZsWComPsit/PWIrIgtDUagP+HPkypBRrqA==", "integrity": "sha512-6nzlCNeJB1qV9AaPyJ/iHU+CDfs8jxpcmQ47Fmrgmp8r5VwKdL/uDt0LW8IuXu2VZrbM1GGyZ8rQtcdVmQYZ+g==",
"dependencies": { "dependencies": {
"debug": "^4.1.1", "debug": "^4.1.1",
"graphql": ">=0.9 <0.14 || ^14.0.2 || ^15.4.0", "graphql": ">=0.9 <0.14 || ^14.0.2 || ^15.4.0",
@ -9205,9 +9231,9 @@
} }
}, },
"node_modules/graphql-parse-resolve-info": { "node_modules/graphql-parse-resolve-info": {
"version": "4.12.0", "version": "4.13.0",
"resolved": "https://registry.npmjs.org/graphql-parse-resolve-info/-/graphql-parse-resolve-info-4.12.0.tgz", "resolved": "https://registry.npmjs.org/graphql-parse-resolve-info/-/graphql-parse-resolve-info-4.13.0.tgz",
"integrity": "sha512-sQyJeWCzFQwLj8SdgrWeAQG46Nc+VLxof91/AtvEVdbvFCvb+S6OoA4OtIp5OpWBrFo+JzW6LIKifNHXtRKPpA==", "integrity": "sha512-VVJ1DdHYcR7hwOGQKNH+QTzuNgsLA8l/y436HtP9YHoX6nmwXRWq3xWthU3autMysXdm0fQUbhTZCx0W9ICozw==",
"dependencies": { "dependencies": {
"debug": "^4.1.1", "debug": "^4.1.1",
"tslib": "^2.0.1" "tslib": "^2.0.1"
@ -9216,13 +9242,13 @@
"node": ">=8.6" "node": ">=8.6"
}, },
"peerDependencies": { "peerDependencies": {
"graphql": ">=0.9 <0.14 || ^14.0.2 || ^15.4.0" "graphql": ">=0.9 <0.14 || ^14.0.2 || ^15.4.0 || ^16.3.0"
} }
}, },
"node_modules/graphql-ws": { "node_modules/graphql-ws": {
"version": "5.5.5", "version": "5.12.0",
"resolved": "https://registry.npmjs.org/graphql-ws/-/graphql-ws-5.5.5.tgz", "resolved": "https://registry.npmjs.org/graphql-ws/-/graphql-ws-5.12.0.tgz",
"integrity": "sha512-hvyIS71vs4Tu/yUYHPvGXsTgo0t3arU820+lT5VjZS2go0ewp2LqyCgxEN56CzOG7Iys52eRhHBiD1gGRdiQtw==", "integrity": "sha512-PA3ImUp8utrpEjoxBMhvxsjkStvFEdU0E1gEBREt8HZIWkxOUymwJBhFnBL7t/iHhUq1GVPeZevPinkZFENxTw==",
"engines": { "engines": {
"node": ">=10" "node": ">=10"
}, },
@ -10571,34 +10597,50 @@
} }
}, },
"node_modules/jsonwebtoken": { "node_modules/jsonwebtoken": {
"version": "8.5.1", "version": "9.0.0",
"resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-8.5.1.tgz", "resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-9.0.0.tgz",
"integrity": "sha512-XjwVfRS6jTMsqYs0EsuJ4LGxXV14zQybNd4L2r0UvbVnSF9Af8x7p5MzbJ90Ioz/9TI41/hTCvznF/loiSzn8w==", "integrity": "sha512-tuGfYXxkQGDPnLJ7SibiQgVgeDgfbPq2k2ICcbgqW8WxWLBAxKQM/ZCu/IT8SOSwmaYl4dpTFCW5xZv7YbbWUw==",
"dependencies": { "dependencies": {
"jws": "^3.2.2", "jws": "^3.2.2",
"lodash.includes": "^4.3.0", "lodash": "^4.17.21",
"lodash.isboolean": "^3.0.3",
"lodash.isinteger": "^4.0.4",
"lodash.isnumber": "^3.0.3",
"lodash.isplainobject": "^4.0.6",
"lodash.isstring": "^4.0.1",
"lodash.once": "^4.0.0",
"ms": "^2.1.1", "ms": "^2.1.1",
"semver": "^5.6.0" "semver": "^7.3.8"
}, },
"engines": { "engines": {
"node": ">=4", "node": ">=12",
"npm": ">=1.4.28" "npm": ">=6"
}
},
"node_modules/jsonwebtoken/node_modules/lru-cache": {
"version": "6.0.0",
"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
"integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
"dependencies": {
"yallist": "^4.0.0"
},
"engines": {
"node": ">=10"
} }
}, },
"node_modules/jsonwebtoken/node_modules/semver": { "node_modules/jsonwebtoken/node_modules/semver": {
"version": "5.7.1", "version": "7.3.8",
"resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
"integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
"dependencies": {
"lru-cache": "^6.0.0"
},
"bin": { "bin": {
"semver": "bin/semver" "semver": "bin/semver.js"
},
"engines": {
"node": ">=10"
} }
}, },
"node_modules/jsonwebtoken/node_modules/yallist": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
"integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
},
"node_modules/jsprim": { "node_modules/jsprim": {
"version": "1.4.1", "version": "1.4.1",
"resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz", "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
@ -10942,11 +10984,6 @@
"resolved": "https://registry.npmjs.org/lodash.includes/-/lodash.includes-4.3.0.tgz", "resolved": "https://registry.npmjs.org/lodash.includes/-/lodash.includes-4.3.0.tgz",
"integrity": "sha1-YLuYqHy5I8aMoeUTJUgzFISfVT8=" "integrity": "sha1-YLuYqHy5I8aMoeUTJUgzFISfVT8="
}, },
"node_modules/lodash.isboolean": {
"version": "3.0.3",
"resolved": "https://registry.npmjs.org/lodash.isboolean/-/lodash.isboolean-3.0.3.tgz",
"integrity": "sha1-bC4XHbKiV82WgC/UOwGyDV9YcPY="
},
"node_modules/lodash.isdate": { "node_modules/lodash.isdate": {
"version": "4.0.1", "version": "4.0.1",
"resolved": "https://registry.npmjs.org/lodash.isdate/-/lodash.isdate-4.0.1.tgz", "resolved": "https://registry.npmjs.org/lodash.isdate/-/lodash.isdate-4.0.1.tgz",
@ -10964,26 +11001,11 @@
"integrity": "sha1-QVxEePK8wwEgwizhDtMib30+GOA=", "integrity": "sha1-QVxEePK8wwEgwizhDtMib30+GOA=",
"dev": true "dev": true
}, },
"node_modules/lodash.isinteger": {
"version": "4.0.4",
"resolved": "https://registry.npmjs.org/lodash.isinteger/-/lodash.isinteger-4.0.4.tgz",
"integrity": "sha1-YZwK89A/iwTDH1iChAt3sRzWg0M="
},
"node_modules/lodash.isnumber": {
"version": "3.0.3",
"resolved": "https://registry.npmjs.org/lodash.isnumber/-/lodash.isnumber-3.0.3.tgz",
"integrity": "sha1-POdoEMWSjQM1IwGsKHMX8RwLH/w="
},
"node_modules/lodash.isplainobject": { "node_modules/lodash.isplainobject": {
"version": "4.0.6", "version": "4.0.6",
"resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz", "resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz",
"integrity": "sha1-fFJqUtibRcRcxpC4gWO+BJf1UMs=" "integrity": "sha1-fFJqUtibRcRcxpC4gWO+BJf1UMs="
}, },
"node_modules/lodash.isstring": {
"version": "4.0.1",
"resolved": "https://registry.npmjs.org/lodash.isstring/-/lodash.isstring-4.0.1.tgz",
"integrity": "sha1-1SfftUVuynzJu5XV2ur4i6VKVFE="
},
"node_modules/lodash.kebabcase": { "node_modules/lodash.kebabcase": {
"version": "4.1.1", "version": "4.1.1",
"resolved": "https://registry.npmjs.org/lodash.kebabcase/-/lodash.kebabcase-4.1.1.tgz", "resolved": "https://registry.npmjs.org/lodash.kebabcase/-/lodash.kebabcase-4.1.1.tgz",
@ -10995,11 +11017,6 @@
"resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz", "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
"integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==" "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ=="
}, },
"node_modules/lodash.once": {
"version": "4.1.1",
"resolved": "https://registry.npmjs.org/lodash.once/-/lodash.once-4.1.1.tgz",
"integrity": "sha1-DdOXEhPHxW34gJd9UEyI+0cal6w="
},
"node_modules/lodash.pad": { "node_modules/lodash.pad": {
"version": "4.5.1", "version": "4.5.1",
"resolved": "https://registry.npmjs.org/lodash.pad/-/lodash.pad-4.5.1.tgz", "resolved": "https://registry.npmjs.org/lodash.pad/-/lodash.pad-4.5.1.tgz",
@ -13106,9 +13123,9 @@
"integrity": "sha512-muRttij7H8TqRNu/DxrAJQITO4Ac7RmX3Klyr/9mJEOBeIpgnF8f9jAfRz5d3XwQZl5qBjF9gLsUtMPJE0vezQ==" "integrity": "sha512-muRttij7H8TqRNu/DxrAJQITO4Ac7RmX3Klyr/9mJEOBeIpgnF8f9jAfRz5d3XwQZl5qBjF9gLsUtMPJE0vezQ=="
}, },
"node_modules/pg-sql2": { "node_modules/pg-sql2": {
"version": "4.12.1", "version": "4.13.0",
"resolved": "https://registry.npmjs.org/pg-sql2/-/pg-sql2-4.12.1.tgz", "resolved": "https://registry.npmjs.org/pg-sql2/-/pg-sql2-4.13.0.tgz",
"integrity": "sha512-3N6i0EIBYc3uKpGGJntZA7HG2cyphC2R3d00kOoc0H7MxeAP+5dN1VfHJjj9vFGlrUy40Ttq8z3UkNtWR6ySAA==", "integrity": "sha512-9sUlAR+FCuOPezS+2cQCSRUEmnyYrT929DiceZIsINk4R54hCGSh1OTWIP4gbAZeUMTYeEXnwTfnnEOupLYTRQ==",
"dependencies": { "dependencies": {
"@graphile/lru": "4.11.0", "@graphile/lru": "4.11.0",
"@types/pg": ">=6 <9", "@types/pg": ">=6 <9",
@ -13369,13 +13386,13 @@
"dev": true "dev": true
}, },
"node_modules/postgraphile": { "node_modules/postgraphile": {
"version": "4.12.5", "version": "4.13.0",
"resolved": "https://registry.npmjs.org/postgraphile/-/postgraphile-4.12.5.tgz", "resolved": "https://registry.npmjs.org/postgraphile/-/postgraphile-4.13.0.tgz",
"integrity": "sha512-4KLEv4IV8ROhzc6Qb6rpzXuCEs/ifIf9mZlq99sB00T7OWYax7PqfDHXPlpnI0SZNYG2YYFWJu0A0sWQY3Ty/A==", "integrity": "sha512-p2VqUnsECd1XrucylK1iosvKEn96J8CWeMVWzxF7b6G21jmaETvFe2CO2q4+dKY5DFCVEF2O9pEfmUfYCKl5+A==",
"dependencies": { "dependencies": {
"@graphile/lru": "4.11.0", "@graphile/lru": "4.11.0",
"@types/json5": "^0.0.30", "@types/json5": "^0.0.30",
"@types/jsonwebtoken": "^8.3.2", "@types/jsonwebtoken": "^9.0.1",
"@types/pg": ">=6 <9", "@types/pg": ">=6 <9",
"@types/ws": "^7.4.0", "@types/ws": "^7.4.0",
"body-parser": "^1.15.2", "body-parser": "^1.15.2",
@ -13383,20 +13400,20 @@
"commander": "^2.19.0", "commander": "^2.19.0",
"debug": "^4.1.1", "debug": "^4.1.1",
"finalhandler": "^1.0.6", "finalhandler": "^1.0.6",
"graphile-build": "4.12.2", "graphile-build": "4.13.0",
"graphile-build-pg": "4.12.2", "graphile-build-pg": "4.13.0",
"graphile-utils": "^4.12.2", "graphile-utils": "^4.13.0",
"graphql": "^0.6.0 || ^0.7.0 || ^0.8.0-b || ^0.9.0 || ^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.2 || ^15.0.0", "graphql": "^0.6.0 || ^0.7.0 || ^0.8.0-b || ^0.9.0 || ^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.2 || ^15.0.0",
"graphql-ws": "^5.1.2", "graphql-ws": "^5.6.2",
"http-errors": "^1.5.1", "http-errors": "^1.5.1",
"iterall": "^1.0.2", "iterall": "^1.0.2",
"json5": "^2.1.1", "json5": "^2.1.1",
"jsonwebtoken": "^8.0.0", "jsonwebtoken": "^9.0.0",
"parseurl": "^1.3.2", "parseurl": "^1.3.2",
"pg": ">=6.1.0 <9", "pg": ">=6.1.0 <9",
"pg-connection-string": "^2.0.0", "pg-connection-string": "^2.0.0",
"pg-sql2": "4.12.1", "pg-sql2": "4.13.0",
"postgraphile-core": "4.12.2", "postgraphile-core": "4.13.0",
"subscriptions-transport-ws": "^0.9.18", "subscriptions-transport-ws": "^0.9.18",
"tslib": "^2.1.0", "tslib": "^2.1.0",
"ws": "^7.4.2" "ws": "^7.4.2"
@ -13409,12 +13426,12 @@
} }
}, },
"node_modules/postgraphile-core": { "node_modules/postgraphile-core": {
"version": "4.12.2", "version": "4.13.0",
"resolved": "https://registry.npmjs.org/postgraphile-core/-/postgraphile-core-4.12.2.tgz", "resolved": "https://registry.npmjs.org/postgraphile-core/-/postgraphile-core-4.13.0.tgz",
"integrity": "sha512-+2OWlPVsMAVjYRMBSI/CT4GUB0mkSmPKGopKapfvhW40SCUBiPB/kqTylX2viRRnN8FuZtS3cRaTPiWr1K+DIg==", "integrity": "sha512-8O7xVKZ20K1dTw4KO0jNAfZPNrxNsGG2VrG3Q0IO70ki/OswE6kz/WBZnWFeGxX0sHSEOGWQa4NSrj9EYsSNuw==",
"dependencies": { "dependencies": {
"graphile-build": "4.12.2", "graphile-build": "4.13.0",
"graphile-build-pg": "4.12.2", "graphile-build-pg": "4.13.0",
"tslib": "^2.0.1" "tslib": "^2.0.1"
}, },
"engines": { "engines": {
@ -20742,6 +20759,17 @@
"tslib": "^2.0.1" "tslib": "^2.0.1"
} }
}, },
"@graphile/pg-aggregates": {
"version": "0.1.1",
"resolved": "https://registry.npmjs.org/@graphile/pg-aggregates/-/pg-aggregates-0.1.1.tgz",
"integrity": "sha512-bPfniRw4oN9nNP8tkRlbBslNMA38fhVWNhhaReODhPVEshwquzUmSmSCtSVhS4J+StEFgrP7Z+z1IN0/ror2XA==",
"requires": {
"@types/debug": "^4.1.5",
"@types/graphql": "^14.5.0",
"debug": "^4.3.1",
"graphile-utils": "^4.12.0-alpha.0"
}
},
"@humanwhocodes/config-array": { "@humanwhocodes/config-array": {
"version": "0.6.0", "version": "0.6.0",
"resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.6.0.tgz", "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.6.0.tgz",
@ -20915,6 +20943,14 @@
"integrity": "sha512-C6N5s2ZFtuZRj54k2/zyRhNDjJwwcViAM3Nbm8zjBpbqAdZ00mr0CFxvSKeO8Y/e03WVFLpQMdHYVfUd6SB+Hw==", "integrity": "sha512-C6N5s2ZFtuZRj54k2/zyRhNDjJwwcViAM3Nbm8zjBpbqAdZ00mr0CFxvSKeO8Y/e03WVFLpQMdHYVfUd6SB+Hw==",
"dev": true "dev": true
}, },
"@types/graphql": {
"version": "14.5.0",
"resolved": "https://registry.npmjs.org/@types/graphql/-/graphql-14.5.0.tgz",
"integrity": "sha512-MOkzsEp1Jk5bXuAsHsUi6BVv0zCO+7/2PTiZMXWDSsMXvNU6w/PLMQT2vHn8hy2i0JqojPz1Sz6rsFjHtsU0lA==",
"requires": {
"graphql": "*"
}
},
"@types/json-schema": { "@types/json-schema": {
"version": "7.0.9", "version": "7.0.9",
"resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.9.tgz", "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.9.tgz",
@ -20927,9 +20963,9 @@
"integrity": "sha512-sqm9g7mHlPY/43fcSNrCYfOeX9zkTTK+euO5E6+CVijSMm5tTjkVdwdqRkY3ljjIAf8679vps5jKUoJBCLsMDA==" "integrity": "sha512-sqm9g7mHlPY/43fcSNrCYfOeX9zkTTK+euO5E6+CVijSMm5tTjkVdwdqRkY3ljjIAf8679vps5jKUoJBCLsMDA=="
}, },
"@types/jsonwebtoken": { "@types/jsonwebtoken": {
"version": "8.5.5", "version": "9.0.1",
"resolved": "https://registry.npmjs.org/@types/jsonwebtoken/-/jsonwebtoken-8.5.5.tgz", "resolved": "https://registry.npmjs.org/@types/jsonwebtoken/-/jsonwebtoken-9.0.1.tgz",
"integrity": "sha512-OGqtHQ7N5/Ap/TUwO6IgHDuLiAoTmHhGpNvgkCm/F4N6pKzx/RBSfr2OXZSwC6vkfnsEdb6+7DNZVtiXiwdwFw==", "integrity": "sha512-c5ltxazpWabia/4UzhIoaDcIza4KViOQhdbjRlfcIGVnsE3c3brkz9Z+F/EeJIECOQP7W7US2hNE930cWWkPiw==",
"requires": { "requires": {
"@types/node": "*" "@types/node": "*"
} }
@ -22262,7 +22298,7 @@
"buffer-equal-constant-time": { "buffer-equal-constant-time": {
"version": "1.0.1", "version": "1.0.1",
"resolved": "https://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz", "resolved": "https://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz",
"integrity": "sha1-+OcRMvf/5uAaXJaXpMbz5I1cyBk=" "integrity": "sha512-zRpUiDwd/xk6ADqPMATG8vc9VPrkck7T07OIx0gnjmJAnHnTVXNQG3vfvWNuiZIkwu9KrKdA1iJKfsfTVxE6NA=="
}, },
"buffer-from": { "buffer-from": {
"version": "1.1.2", "version": "1.1.2",
@ -25525,14 +25561,14 @@
"integrity": "sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==" "integrity": "sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ=="
}, },
"graphile-build": { "graphile-build": {
"version": "4.12.2", "version": "4.13.0",
"resolved": "https://registry.npmjs.org/graphile-build/-/graphile-build-4.12.2.tgz", "resolved": "https://registry.npmjs.org/graphile-build/-/graphile-build-4.13.0.tgz",
"integrity": "sha512-UqomiSnWPj4pjO6Q6PzT1YeH96k7e0JzCBI3X8kkELG+PP2BOQCNE5e+xLJvohJmUr0YBTgflPQo7P1ZESPwww==", "integrity": "sha512-KPBrHgRw5fury6l9WEQH6ys1UtnxrRrG+Ehnr68NvfNELp4T+QsekTSVFi5LWoJOaXvdYMqP2L8MFBRQP2vKsw==",
"requires": { "requires": {
"@graphile/lru": "4.11.0", "@graphile/lru": "4.11.0",
"chalk": "^2.4.2", "chalk": "^2.4.2",
"debug": "^4.1.1", "debug": "^4.1.1",
"graphql-parse-resolve-info": "4.12.0", "graphql-parse-resolve-info": "4.13.0",
"iterall": "^1.2.2", "iterall": "^1.2.2",
"lodash": ">=4 <5", "lodash": ">=4 <5",
"lru-cache": "^5.0.0", "lru-cache": "^5.0.0",
@ -25541,18 +25577,18 @@
} }
}, },
"graphile-build-pg": { "graphile-build-pg": {
"version": "4.12.2", "version": "4.13.0",
"resolved": "https://registry.npmjs.org/graphile-build-pg/-/graphile-build-pg-4.12.2.tgz", "resolved": "https://registry.npmjs.org/graphile-build-pg/-/graphile-build-pg-4.13.0.tgz",
"integrity": "sha512-4zWS7yb2L3afNpzADX9iBc2do4UOd3abiHd/WG0ao8lharU4YxEDS5qKlE2/2s+gSNqW2okKXEuI1/ci9DXVbw==", "integrity": "sha512-1FD+3wjCdK1lbICY1QVO26A7s8efSjR522LarL9Bx1M1iBJHNIpCEW2PK+LkulQjY1l5LGQ1A93GQFqi6cZ6bg==",
"requires": { "requires": {
"@graphile/lru": "4.11.0", "@graphile/lru": "4.11.0",
"chalk": "^2.4.2", "chalk": "^2.4.2",
"debug": "^4.1.1", "debug": "^4.1.1",
"graphile-build": "4.12.2", "graphile-build": "4.13.0",
"jsonwebtoken": "^8.5.1", "jsonwebtoken": "^9.0.0",
"lodash": ">=4 <5", "lodash": ">=4 <5",
"lru-cache": ">=4 <5", "lru-cache": ">=4 <5",
"pg-sql2": "4.12.1" "pg-sql2": "4.13.0"
}, },
"dependencies": { "dependencies": {
"lru-cache": { "lru-cache": {
@ -25572,9 +25608,9 @@
} }
}, },
"graphile-utils": { "graphile-utils": {
"version": "4.12.2", "version": "4.13.0",
"resolved": "https://registry.npmjs.org/graphile-utils/-/graphile-utils-4.12.2.tgz", "resolved": "https://registry.npmjs.org/graphile-utils/-/graphile-utils-4.13.0.tgz",
"integrity": "sha512-2UcTWWMFLFkKwbDLqlN0mF5sxLqz9y0p7I3zNOJpXtHVjrHyp7oQZsWComPsit/PWIrIgtDUagP+HPkypBRrqA==", "integrity": "sha512-6nzlCNeJB1qV9AaPyJ/iHU+CDfs8jxpcmQ47Fmrgmp8r5VwKdL/uDt0LW8IuXu2VZrbM1GGyZ8rQtcdVmQYZ+g==",
"requires": { "requires": {
"debug": "^4.1.1", "debug": "^4.1.1",
"graphql": ">=0.9 <0.14 || ^14.0.2 || ^15.4.0", "graphql": ">=0.9 <0.14 || ^14.0.2 || ^15.4.0",
@ -25587,18 +25623,18 @@
"integrity": "sha512-AnnKk7hFQFmU/2I9YSQf3xw44ctnSFCfp3zE0N6W174gqe9fWG/2rKaKxROK7CcI3XtERpjEKFqts8o319Kf7A==" "integrity": "sha512-AnnKk7hFQFmU/2I9YSQf3xw44ctnSFCfp3zE0N6W174gqe9fWG/2rKaKxROK7CcI3XtERpjEKFqts8o319Kf7A=="
}, },
"graphql-parse-resolve-info": { "graphql-parse-resolve-info": {
"version": "4.12.0", "version": "4.13.0",
"resolved": "https://registry.npmjs.org/graphql-parse-resolve-info/-/graphql-parse-resolve-info-4.12.0.tgz", "resolved": "https://registry.npmjs.org/graphql-parse-resolve-info/-/graphql-parse-resolve-info-4.13.0.tgz",
"integrity": "sha512-sQyJeWCzFQwLj8SdgrWeAQG46Nc+VLxof91/AtvEVdbvFCvb+S6OoA4OtIp5OpWBrFo+JzW6LIKifNHXtRKPpA==", "integrity": "sha512-VVJ1DdHYcR7hwOGQKNH+QTzuNgsLA8l/y436HtP9YHoX6nmwXRWq3xWthU3autMysXdm0fQUbhTZCx0W9ICozw==",
"requires": { "requires": {
"debug": "^4.1.1", "debug": "^4.1.1",
"tslib": "^2.0.1" "tslib": "^2.0.1"
} }
}, },
"graphql-ws": { "graphql-ws": {
"version": "5.5.5", "version": "5.12.0",
"resolved": "https://registry.npmjs.org/graphql-ws/-/graphql-ws-5.5.5.tgz", "resolved": "https://registry.npmjs.org/graphql-ws/-/graphql-ws-5.12.0.tgz",
"integrity": "sha512-hvyIS71vs4Tu/yUYHPvGXsTgo0t3arU820+lT5VjZS2go0ewp2LqyCgxEN56CzOG7Iys52eRhHBiD1gGRdiQtw==", "integrity": "sha512-PA3ImUp8utrpEjoxBMhvxsjkStvFEdU0E1gEBREt8HZIWkxOUymwJBhFnBL7t/iHhUq1GVPeZevPinkZFENxTw==",
"requires": {} "requires": {}
}, },
"har-schema": { "har-schema": {
@ -26587,26 +26623,36 @@
} }
}, },
"jsonwebtoken": { "jsonwebtoken": {
"version": "8.5.1", "version": "9.0.0",
"resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-8.5.1.tgz", "resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-9.0.0.tgz",
"integrity": "sha512-XjwVfRS6jTMsqYs0EsuJ4LGxXV14zQybNd4L2r0UvbVnSF9Af8x7p5MzbJ90Ioz/9TI41/hTCvznF/loiSzn8w==", "integrity": "sha512-tuGfYXxkQGDPnLJ7SibiQgVgeDgfbPq2k2ICcbgqW8WxWLBAxKQM/ZCu/IT8SOSwmaYl4dpTFCW5xZv7YbbWUw==",
"requires": { "requires": {
"jws": "^3.2.2", "jws": "^3.2.2",
"lodash.includes": "^4.3.0", "lodash": "^4.17.21",
"lodash.isboolean": "^3.0.3",
"lodash.isinteger": "^4.0.4",
"lodash.isnumber": "^3.0.3",
"lodash.isplainobject": "^4.0.6",
"lodash.isstring": "^4.0.1",
"lodash.once": "^4.0.0",
"ms": "^2.1.1", "ms": "^2.1.1",
"semver": "^5.6.0" "semver": "^7.3.8"
}, },
"dependencies": { "dependencies": {
"lru-cache": {
"version": "6.0.0",
"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
"integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
"requires": {
"yallist": "^4.0.0"
}
},
"semver": { "semver": {
"version": "5.7.1", "version": "7.3.8",
"resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
"integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==" "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
"requires": {
"lru-cache": "^6.0.0"
}
},
"yallist": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
"integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
} }
} }
}, },
@ -26873,11 +26919,6 @@
"resolved": "https://registry.npmjs.org/lodash.includes/-/lodash.includes-4.3.0.tgz", "resolved": "https://registry.npmjs.org/lodash.includes/-/lodash.includes-4.3.0.tgz",
"integrity": "sha1-YLuYqHy5I8aMoeUTJUgzFISfVT8=" "integrity": "sha1-YLuYqHy5I8aMoeUTJUgzFISfVT8="
}, },
"lodash.isboolean": {
"version": "3.0.3",
"resolved": "https://registry.npmjs.org/lodash.isboolean/-/lodash.isboolean-3.0.3.tgz",
"integrity": "sha1-bC4XHbKiV82WgC/UOwGyDV9YcPY="
},
"lodash.isdate": { "lodash.isdate": {
"version": "4.0.1", "version": "4.0.1",
"resolved": "https://registry.npmjs.org/lodash.isdate/-/lodash.isdate-4.0.1.tgz", "resolved": "https://registry.npmjs.org/lodash.isdate/-/lodash.isdate-4.0.1.tgz",
@ -26895,26 +26936,11 @@
"integrity": "sha1-QVxEePK8wwEgwizhDtMib30+GOA=", "integrity": "sha1-QVxEePK8wwEgwizhDtMib30+GOA=",
"dev": true "dev": true
}, },
"lodash.isinteger": {
"version": "4.0.4",
"resolved": "https://registry.npmjs.org/lodash.isinteger/-/lodash.isinteger-4.0.4.tgz",
"integrity": "sha1-YZwK89A/iwTDH1iChAt3sRzWg0M="
},
"lodash.isnumber": {
"version": "3.0.3",
"resolved": "https://registry.npmjs.org/lodash.isnumber/-/lodash.isnumber-3.0.3.tgz",
"integrity": "sha1-POdoEMWSjQM1IwGsKHMX8RwLH/w="
},
"lodash.isplainobject": { "lodash.isplainobject": {
"version": "4.0.6", "version": "4.0.6",
"resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz", "resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz",
"integrity": "sha1-fFJqUtibRcRcxpC4gWO+BJf1UMs=" "integrity": "sha1-fFJqUtibRcRcxpC4gWO+BJf1UMs="
}, },
"lodash.isstring": {
"version": "4.0.1",
"resolved": "https://registry.npmjs.org/lodash.isstring/-/lodash.isstring-4.0.1.tgz",
"integrity": "sha1-1SfftUVuynzJu5XV2ur4i6VKVFE="
},
"lodash.kebabcase": { "lodash.kebabcase": {
"version": "4.1.1", "version": "4.1.1",
"resolved": "https://registry.npmjs.org/lodash.kebabcase/-/lodash.kebabcase-4.1.1.tgz", "resolved": "https://registry.npmjs.org/lodash.kebabcase/-/lodash.kebabcase-4.1.1.tgz",
@ -26926,11 +26952,6 @@
"resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz", "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
"integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==" "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ=="
}, },
"lodash.once": {
"version": "4.1.1",
"resolved": "https://registry.npmjs.org/lodash.once/-/lodash.once-4.1.1.tgz",
"integrity": "sha1-DdOXEhPHxW34gJd9UEyI+0cal6w="
},
"lodash.pad": { "lodash.pad": {
"version": "4.5.1", "version": "4.5.1",
"resolved": "https://registry.npmjs.org/lodash.pad/-/lodash.pad-4.5.1.tgz", "resolved": "https://registry.npmjs.org/lodash.pad/-/lodash.pad-4.5.1.tgz",
@ -28533,9 +28554,9 @@
"integrity": "sha512-muRttij7H8TqRNu/DxrAJQITO4Ac7RmX3Klyr/9mJEOBeIpgnF8f9jAfRz5d3XwQZl5qBjF9gLsUtMPJE0vezQ==" "integrity": "sha512-muRttij7H8TqRNu/DxrAJQITO4Ac7RmX3Klyr/9mJEOBeIpgnF8f9jAfRz5d3XwQZl5qBjF9gLsUtMPJE0vezQ=="
}, },
"pg-sql2": { "pg-sql2": {
"version": "4.12.1", "version": "4.13.0",
"resolved": "https://registry.npmjs.org/pg-sql2/-/pg-sql2-4.12.1.tgz", "resolved": "https://registry.npmjs.org/pg-sql2/-/pg-sql2-4.13.0.tgz",
"integrity": "sha512-3N6i0EIBYc3uKpGGJntZA7HG2cyphC2R3d00kOoc0H7MxeAP+5dN1VfHJjj9vFGlrUy40Ttq8z3UkNtWR6ySAA==", "integrity": "sha512-9sUlAR+FCuOPezS+2cQCSRUEmnyYrT929DiceZIsINk4R54hCGSh1OTWIP4gbAZeUMTYeEXnwTfnnEOupLYTRQ==",
"requires": { "requires": {
"@graphile/lru": "4.11.0", "@graphile/lru": "4.11.0",
"@types/pg": ">=6 <9", "@types/pg": ">=6 <9",
@ -28710,13 +28731,13 @@
"dev": true "dev": true
}, },
"postgraphile": { "postgraphile": {
"version": "4.12.5", "version": "4.13.0",
"resolved": "https://registry.npmjs.org/postgraphile/-/postgraphile-4.12.5.tgz", "resolved": "https://registry.npmjs.org/postgraphile/-/postgraphile-4.13.0.tgz",
"integrity": "sha512-4KLEv4IV8ROhzc6Qb6rpzXuCEs/ifIf9mZlq99sB00T7OWYax7PqfDHXPlpnI0SZNYG2YYFWJu0A0sWQY3Ty/A==", "integrity": "sha512-p2VqUnsECd1XrucylK1iosvKEn96J8CWeMVWzxF7b6G21jmaETvFe2CO2q4+dKY5DFCVEF2O9pEfmUfYCKl5+A==",
"requires": { "requires": {
"@graphile/lru": "4.11.0", "@graphile/lru": "4.11.0",
"@types/json5": "^0.0.30", "@types/json5": "^0.0.30",
"@types/jsonwebtoken": "^8.3.2", "@types/jsonwebtoken": "^9.0.1",
"@types/pg": ">=6 <9", "@types/pg": ">=6 <9",
"@types/ws": "^7.4.0", "@types/ws": "^7.4.0",
"body-parser": "^1.15.2", "body-parser": "^1.15.2",
@ -28724,20 +28745,20 @@
"commander": "^2.19.0", "commander": "^2.19.0",
"debug": "^4.1.1", "debug": "^4.1.1",
"finalhandler": "^1.0.6", "finalhandler": "^1.0.6",
"graphile-build": "4.12.2", "graphile-build": "4.13.0",
"graphile-build-pg": "4.12.2", "graphile-build-pg": "4.13.0",
"graphile-utils": "^4.12.2", "graphile-utils": "^4.13.0",
"graphql": "^0.6.0 || ^0.7.0 || ^0.8.0-b || ^0.9.0 || ^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.2 || ^15.0.0", "graphql": "^0.6.0 || ^0.7.0 || ^0.8.0-b || ^0.9.0 || ^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.2 || ^15.0.0",
"graphql-ws": "^5.1.2", "graphql-ws": "^5.6.2",
"http-errors": "^1.5.1", "http-errors": "^1.5.1",
"iterall": "^1.0.2", "iterall": "^1.0.2",
"json5": "^2.1.1", "json5": "^2.1.1",
"jsonwebtoken": "^8.0.0", "jsonwebtoken": "^9.0.0",
"parseurl": "^1.3.2", "parseurl": "^1.3.2",
"pg": ">=6.1.0 <9", "pg": ">=6.1.0 <9",
"pg-connection-string": "^2.0.0", "pg-connection-string": "^2.0.0",
"pg-sql2": "4.12.1", "pg-sql2": "4.13.0",
"postgraphile-core": "4.12.2", "postgraphile-core": "4.13.0",
"subscriptions-transport-ws": "^0.9.18", "subscriptions-transport-ws": "^0.9.18",
"tslib": "^2.1.0", "tslib": "^2.1.0",
"ws": "^7.4.2" "ws": "^7.4.2"
@ -28757,12 +28778,12 @@
} }
}, },
"postgraphile-core": { "postgraphile-core": {
"version": "4.12.2", "version": "4.13.0",
"resolved": "https://registry.npmjs.org/postgraphile-core/-/postgraphile-core-4.12.2.tgz", "resolved": "https://registry.npmjs.org/postgraphile-core/-/postgraphile-core-4.13.0.tgz",
"integrity": "sha512-+2OWlPVsMAVjYRMBSI/CT4GUB0mkSmPKGopKapfvhW40SCUBiPB/kqTylX2viRRnN8FuZtS3cRaTPiWr1K+DIg==", "integrity": "sha512-8O7xVKZ20K1dTw4KO0jNAfZPNrxNsGG2VrG3Q0IO70ki/OswE6kz/WBZnWFeGxX0sHSEOGWQa4NSrj9EYsSNuw==",
"requires": { "requires": {
"graphile-build": "4.12.2", "graphile-build": "4.13.0",
"graphile-build-pg": "4.12.2", "graphile-build-pg": "4.13.0",
"tslib": "^2.0.1" "tslib": "^2.0.1"
} }
}, },

3
package.json
View File

@ -71,6 +71,7 @@
"@casl/ability": "^5.2.2", "@casl/ability": "^5.2.2",
"@graphile-contrib/pg-order-by-related": "^1.0.0-beta.6", "@graphile-contrib/pg-order-by-related": "^1.0.0-beta.6",
"@graphile-contrib/pg-simplify-inflector": "^6.1.0", "@graphile-contrib/pg-simplify-inflector": "^6.1.0",
"@graphile/pg-aggregates": "^0.1.1",
"acorn": "^8.0.4", "acorn": "^8.0.4",
"array-equal": "^1.0.0", "array-equal": "^1.0.0",
"aws-sdk": "^2.847.0", "aws-sdk": "^2.847.0",
@ -121,7 +122,7 @@
"object.omit": "^3.0.0", "object.omit": "^3.0.0",
"opn": "^6.0.0", "opn": "^6.0.0",
"pg": "^8.5.1", "pg": "^8.5.1",
"postgraphile": "^4.10.0", "postgraphile": "^4.13.0",
"postgraphile-plugin-connection-filter": "^2.2.2", "postgraphile-plugin-connection-filter": "^2.2.2",
"promise-task-queue": "^1.2.0", "promise-task-queue": "^1.2.0",
"prop-types": "^15.7.2", "prop-types": "^15.7.2",

BIN
public/img/logos/mindgeek/lazy/favicon.png Executable file → Normal file
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.8 KiB

After

Width:  |  Height:  |  Size: 2.8 KiB

BIN
public/img/logos/mindgeek/lazy/favicon_dark.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.8 KiB

BIN
public/img/logos/mindgeek/lazy/favicon_light.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.8 KiB

BIN
public/img/logos/mindgeek/lazy/network.png Executable file → Normal file
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.5 KiB

After

Width:  |  Height:  |  Size: 2.6 KiB

BIN
public/img/logos/mindgeek/lazy/pornhub.png Executable file → Normal file
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.4 KiB

After

Width:  |  Height:  |  Size: 2.4 KiB

BIN
public/img/logos/mindgeek/lazy/propertysex.png Executable file → Normal file
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.2 KiB

After

Width:  |  Height:  |  Size: 5.7 KiB

BIN
public/img/logos/mindgeek/lazy/squirted.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 9.4 KiB

BIN
public/img/logos/mindgeek/lazy/transangels.png Executable file → Normal file
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.3 KiB

After

Width:  |  Height:  |  Size: 3.3 KiB

BIN
public/img/logos/mindgeek/lazy/trueamateurs.png Executable file → Normal file
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
public/img/logos/mindgeek/lazy/tube8vip.png Executable file → Normal file
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.9 KiB

After

Width:  |  Height:  |  Size: 3.0 KiB

BIN
public/img/logos/mindgeek/squirted.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 12 KiB

BIN
public/img/logos/mindgeek/thumbs/favicon.png Executable file → Normal file
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.8 KiB

After

Width:  |  Height:  |  Size: 2.8 KiB

BIN
public/img/logos/mindgeek/thumbs/favicon_dark.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.8 KiB

BIN
public/img/logos/mindgeek/thumbs/favicon_light.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.8 KiB

BIN
public/img/logos/mindgeek/thumbs/network.png Executable file → Normal file
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 12 KiB

BIN
public/img/logos/mindgeek/thumbs/pornhub.png Executable file → Normal file
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 8.2 KiB

After

Width:  |  Height:  |  Size: 8.2 KiB

BIN
public/img/logos/mindgeek/thumbs/propertysex.png Executable file → Normal file
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 9.7 KiB

After

Width:  |  Height:  |  Size: 11 KiB

BIN
public/img/logos/mindgeek/thumbs/squirted.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 9.7 KiB

BIN
public/img/logos/mindgeek/thumbs/transangels.png Executable file → Normal file
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 35 KiB

After

Width:  |  Height:  |  Size: 35 KiB

BIN
public/img/logos/mindgeek/thumbs/trueamateurs.png Executable file → Normal file
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 7.8 KiB

After

Width:  |  Height:  |  Size: 7.9 KiB

BIN
public/img/logos/mindgeek/thumbs/tube8vip.png Executable file → Normal file
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 14 KiB

7
seeds/02_sites.js
View File

@ -5686,6 +5686,13 @@ const sites = [
parameters: { native: true }, parameters: { native: true },
parent: 'mindgeek', parent: 'mindgeek',
}, },
{
slug: 'squirted',
name: 'Squirted',
url: 'https://www.squirted.com',
parameters: { native: true },
parent: 'mindgeek',
},
// MIKE ADRIANO // MIKE ADRIANO
{ {
slug: 'trueanal', slug: 'trueanal',

1
src/scrapers/kink.js
View File

@ -2,7 +2,6 @@
const unprint = require('unprint'); const unprint = require('unprint');
const qu = require('../utils/qu');
const http = require('../utils/http'); const http = require('../utils/http');
const slugify = require('../utils/slugify'); const slugify = require('../utils/slugify');

12
src/scrapers/mindgeek.js
View File

@ -185,10 +185,10 @@ function scrapeRelease(data, url, channel, networkName) {
} }
function getUrl(site) { function getUrl(site) {
const { searchParams } = new URL(site.url); const { searchParams, pathname } = new URL(site.url);
// if (search.match(/\?site=\d+/)) { // if (search.match(/\?site=\d+/)) {
if (searchParams.has('site')) { if (searchParams.has('site') || /\/site\/\d+/.test(pathname)) {
return site.url; return site.url;
} }
@ -290,8 +290,12 @@ function scrapeProfile(data, releases = [], networkName) {
async function fetchLatest(site, page = 1, options) { async function fetchLatest(site, page = 1, options) {
const url = getUrl(site); const url = getUrl(site);
const { searchParams } = new URL(url); const { searchParams, pathname } = new URL(url);
const siteId = searchParams.get('site'); const siteId = searchParams.get('site') || Number(pathname.match(/\/site\/(\d+)\//)?.[1]);
if (!siteId && !site.parameters?.native && !site.parameters?.extract) {
return null;
}
const { session, instanceToken } = options.beforeNetwork?.headers?.Instance const { session, instanceToken } = options.beforeNetwork?.headers?.Instance
? options.beforeNetwork ? options.beforeNetwork

2
src/tools/analvids.js
View File

@ -5,9 +5,11 @@ const bhttp = require('bhttp');
const slugify = require('../utils/slugify'); const slugify = require('../utils/slugify');
const { studios: oldStudios } = require('../../seeds/03_studios'); const { studios: oldStudios } = require('../../seeds/03_studios');
/*
const slugMap = { const slugMap = {
thay_ksada: 'thayksada2', thay_ksada: 'thayksada2',
}; };
*/
async function init() { async function init() {
const res = await bhttp.get('https://pornbox.com/studio/list'); const res = await bhttp.get('https://pornbox.com/studio/list');

27
src/web/postgraphile.js
View File

@ -7,6 +7,7 @@ const { postgraphile } = require('postgraphile');
const PgConnectionFilterPlugin = require('postgraphile-plugin-connection-filter'); const PgConnectionFilterPlugin = require('postgraphile-plugin-connection-filter');
const PgSimplifyInflectorPlugin = require('@graphile-contrib/pg-simplify-inflector'); const PgSimplifyInflectorPlugin = require('@graphile-contrib/pg-simplify-inflector');
const PgOrderByRelatedPlugin = require('@graphile-contrib/pg-order-by-related'); const PgOrderByRelatedPlugin = require('@graphile-contrib/pg-order-by-related');
const PgAggregatesPlugin = require('@graphile/pg-aggregates').default;
const { ActorPlugins, SitePlugins, ReleasePlugins, MediaPlugins } = require('./plugins/plugins'); const { ActorPlugins, SitePlugins, ReleasePlugins, MediaPlugins } = require('./plugins/plugins');
@ -18,6 +19,30 @@ async function pgSettings(req) {
}; };
} }
// console.log(PgAggregatesPlugin);
const TagsAggregatePlugin = (builder) => {
builder.hook('build', (build) => {
const pgAggregateSpecs = [
{
id: 'tags',
humanLabel: 'tags',
HumanLabel: 'Tags',
sqlAggregateWrap: (sqlFrag) => {
console.log('sql frag', sqlFrag);
return build.pgSql.fragment`sum(${sqlFrag})`;
},
isSuitableType: (pgType) => {
// console.log('pg type', pgType);
return pgType.category === 'N';
},
},
];
build.pgAggregateSpecs = pgAggregateSpecs; // eslint-disable-line no-param-reassign
});
};
module.exports = postgraphile( module.exports = postgraphile(
connectionString, connectionString,
'public', 'public',
@ -38,11 +63,13 @@ module.exports = postgraphile(
appendPlugins: [ appendPlugins: [
PgSimplifyInflectorPlugin, PgSimplifyInflectorPlugin,
PgConnectionFilterPlugin, PgConnectionFilterPlugin,
PgAggregatesPlugin,
PgOrderByRelatedPlugin, PgOrderByRelatedPlugin,
...ActorPlugins, ...ActorPlugins,
...SitePlugins, ...SitePlugins,
...ReleasePlugins, ...ReleasePlugins,
...MediaPlugins, ...MediaPlugins,
TagsAggregatePlugin,
], ],
pgSettings, pgSettings,
}, },