diff --git a/assets/js/entities/actions.js b/assets/js/entities/actions.js index 889e85e0..0aa0a037 100755 --- a/assets/js/entities/actions.js +++ b/assets/js/entities/actions.js @@ -89,18 +89,6 @@ function initEntitiesActions(store, router) { offset: $offset orderBy: $orderBy filter: { - or: [ - { - date: { - isNull: ${entityType !== 'network'} - } - } - { - date: { - isNull: false - } - } - ] effectiveDate: { lessThan: $before, greaterThan: $after diff --git a/package-lock.json b/package-lock.json index a71773aa..71607983 100755 --- a/package-lock.json +++ b/package-lock.json @@ -79,7 +79,7 @@ "tunnel": "0.0.6", "ua-parser-js": "^1.0.32", "undici": "^4.13.0", - "unprint": "^0.8.1", + "unprint": "^0.8.2", "url-pattern": "^1.0.3", "v-tooltip": "^2.0.3", "video.js": "^7.11.4", @@ -17025,9 +17025,9 @@ } }, "node_modules/unprint": { - "version": "0.8.1", - "resolved": "https://registry.npmjs.org/unprint/-/unprint-0.8.1.tgz", - "integrity": "sha512-6cF2LgIpc7JEBBXWs/CmJgFBAPmvM5NuD3tDvmnnmZR+wrEF03TNR5kv08iPTV/GhT8EHPhZM3LSd8eRipkWdA==", + "version": "0.8.2", + "resolved": "https://registry.npmjs.org/unprint/-/unprint-0.8.2.tgz", + "integrity": "sha512-mCKPDPwtuECbXJJLQbDn2FFbydr6fLKytyS3pymbxcTh2dkk7NFypMjR7qjU2Uv9Fl91hSE48SjYMsWHNKpp4w==", "dependencies": { "axios": "^0.27.2", "bottleneck": "^2.19.5", @@ -31483,9 +31483,9 @@ "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=" }, "unprint": { - "version": "0.8.1", - "resolved": "https://registry.npmjs.org/unprint/-/unprint-0.8.1.tgz", - "integrity": "sha512-6cF2LgIpc7JEBBXWs/CmJgFBAPmvM5NuD3tDvmnnmZR+wrEF03TNR5kv08iPTV/GhT8EHPhZM3LSd8eRipkWdA==", + "version": "0.8.2", + "resolved": "https://registry.npmjs.org/unprint/-/unprint-0.8.2.tgz", + "integrity": "sha512-mCKPDPwtuECbXJJLQbDn2FFbydr6fLKytyS3pymbxcTh2dkk7NFypMjR7qjU2Uv9Fl91hSE48SjYMsWHNKpp4w==", "requires": { "axios": "^0.27.2", "bottleneck": "^2.19.5", diff --git a/package.json b/package.json index 29b79198..fdff6a9b 100755 --- a/package.json +++ b/package.json @@ -138,7 +138,7 @@ "tunnel": "0.0.6", "ua-parser-js": "^1.0.32", "undici": "^4.13.0", - "unprint": "^0.8.1", + "unprint": "^0.8.2", "url-pattern": "^1.0.3", "v-tooltip": "^2.0.3", "video.js": "^7.11.4", diff --git a/public/img/logos/fabulouscash/chelcifox.png b/public/img/logos/fabulouscash/chelcifox.png new file mode 100644 index 00000000..2e33a80f Binary files /dev/null and b/public/img/logos/fabulouscash/chelcifox.png differ diff --git a/public/img/logos/fabulouscash/finishesthejob.png b/public/img/logos/fabulouscash/finishesthejob.png new file mode 100644 index 00000000..8f97b63a Binary files /dev/null and b/public/img/logos/fabulouscash/finishesthejob.png differ diff --git a/public/img/logos/fabulouscash/lazy/chelcifox.png b/public/img/logos/fabulouscash/lazy/chelcifox.png new file mode 100644 index 00000000..ade48033 Binary files /dev/null and b/public/img/logos/fabulouscash/lazy/chelcifox.png differ diff --git a/public/img/logos/fabulouscash/lazy/finishesthejob.png b/public/img/logos/fabulouscash/lazy/finishesthejob.png new file mode 100644 index 00000000..b76bd57a Binary files /dev/null and b/public/img/logos/fabulouscash/lazy/finishesthejob.png differ diff --git a/public/img/logos/fabulouscash/lazy/manojob.png b/public/img/logos/fabulouscash/lazy/manojob.png new file mode 100644 index 00000000..67db9509 Binary files /dev/null and b/public/img/logos/fabulouscash/lazy/manojob.png differ diff --git a/public/img/logos/fabulouscash/lazy/mrpov.png b/public/img/logos/fabulouscash/lazy/mrpov.png new file mode 100644 index 00000000..f7495e1a Binary files /dev/null and b/public/img/logos/fabulouscash/lazy/mrpov.png differ diff --git a/public/img/logos/fabulouscash/lazy/nowayamigay.png b/public/img/logos/fabulouscash/lazy/nowayamigay.png new file mode 100644 index 00000000..d2358dd1 Binary files /dev/null and b/public/img/logos/fabulouscash/lazy/nowayamigay.png differ diff --git a/public/img/logos/fabulouscash/lazy/thedicksuckers.png b/public/img/logos/fabulouscash/lazy/thedicksuckers.png new file mode 100644 index 00000000..0511ca29 Binary files /dev/null and b/public/img/logos/fabulouscash/lazy/thedicksuckers.png differ diff --git a/public/img/logos/fabulouscash/manojob.png b/public/img/logos/fabulouscash/manojob.png new file mode 100644 index 00000000..a5a4ed1c Binary files /dev/null and b/public/img/logos/fabulouscash/manojob.png differ diff --git a/public/img/logos/fabulouscash/misc/chelci-fox.png b/public/img/logos/fabulouscash/misc/chelci-fox.png new file mode 100644 index 00000000..7ca6d7ec Binary files /dev/null and b/public/img/logos/fabulouscash/misc/chelci-fox.png differ diff --git a/public/img/logos/fabulouscash/misc/chelci-fox_banner.png b/public/img/logos/fabulouscash/misc/chelci-fox_banner.png new file mode 100644 index 00000000..fa6bcf30 Binary files /dev/null and b/public/img/logos/fabulouscash/misc/chelci-fox_banner.png differ diff --git a/public/img/logos/fabulouscash/misc/chelci-fox_header.png b/public/img/logos/fabulouscash/misc/chelci-fox_header.png new file mode 100644 index 00000000..8bb31433 Binary files /dev/null and b/public/img/logos/fabulouscash/misc/chelci-fox_header.png differ diff --git a/public/img/logos/fabulouscash/misc/chelci-fox_original.png b/public/img/logos/fabulouscash/misc/chelci-fox_original.png new file mode 100644 index 00000000..88aca1a9 Binary files /dev/null and b/public/img/logos/fabulouscash/misc/chelci-fox_original.png differ diff --git a/public/img/logos/fabulouscash/misc/manojob_notld.png b/public/img/logos/fabulouscash/misc/manojob_notld.png new file mode 100644 index 00000000..8522c72d Binary files /dev/null and b/public/img/logos/fabulouscash/misc/manojob_notld.png differ diff --git a/public/img/logos/fabulouscash/misc/manojob_tld.png b/public/img/logos/fabulouscash/misc/manojob_tld.png new file mode 100644 index 00000000..463fa234 Binary files /dev/null and b/public/img/logos/fabulouscash/misc/manojob_tld.png differ diff --git a/public/img/logos/fabulouscash/misc/no-way-am-i-gay_extracted.png b/public/img/logos/fabulouscash/misc/no-way-am-i-gay_extracted.png new file mode 100644 index 00000000..4a51502d Binary files /dev/null and b/public/img/logos/fabulouscash/misc/no-way-am-i-gay_extracted.png differ diff --git a/public/img/logos/fabulouscash/misc/no-way-am-i-gay_extracted_notld.png b/public/img/logos/fabulouscash/misc/no-way-am-i-gay_extracted_notld.png new file mode 100644 index 00000000..0ab62d40 Binary files /dev/null and b/public/img/logos/fabulouscash/misc/no-way-am-i-gay_extracted_notld.png differ diff --git a/public/img/logos/fabulouscash/misc/no-way-am-i-gay_original.png b/public/img/logos/fabulouscash/misc/no-way-am-i-gay_original.png new file mode 100644 index 00000000..60bd7b1d Binary files /dev/null and b/public/img/logos/fabulouscash/misc/no-way-am-i-gay_original.png differ diff --git a/public/img/logos/fabulouscash/mrpov.png b/public/img/logos/fabulouscash/mrpov.png new file mode 100644 index 00000000..8212b34d Binary files /dev/null and b/public/img/logos/fabulouscash/mrpov.png differ diff --git a/public/img/logos/fabulouscash/nowayamigay.png b/public/img/logos/fabulouscash/nowayamigay.png new file mode 100644 index 00000000..e678bc24 Binary files /dev/null and b/public/img/logos/fabulouscash/nowayamigay.png differ diff --git a/public/img/logos/fabulouscash/thedicksuckers.png b/public/img/logos/fabulouscash/thedicksuckers.png new file mode 100644 index 00000000..fbf990ab Binary files /dev/null and b/public/img/logos/fabulouscash/thedicksuckers.png differ diff --git a/public/img/logos/fabulouscash/thumbs/chelcifox.png b/public/img/logos/fabulouscash/thumbs/chelcifox.png new file mode 100644 index 00000000..9eb2b62b Binary files /dev/null and b/public/img/logos/fabulouscash/thumbs/chelcifox.png differ diff --git a/public/img/logos/fabulouscash/thumbs/finishesthejob.png b/public/img/logos/fabulouscash/thumbs/finishesthejob.png new file mode 100644 index 00000000..9a4d73e5 Binary files /dev/null and b/public/img/logos/fabulouscash/thumbs/finishesthejob.png differ diff --git a/public/img/logos/fabulouscash/thumbs/manojob.png b/public/img/logos/fabulouscash/thumbs/manojob.png new file mode 100644 index 00000000..64a4c8d3 Binary files /dev/null and b/public/img/logos/fabulouscash/thumbs/manojob.png differ diff --git a/public/img/logos/fabulouscash/thumbs/mrpov.png b/public/img/logos/fabulouscash/thumbs/mrpov.png new file mode 100644 index 00000000..6fa4c7e6 Binary files /dev/null and b/public/img/logos/fabulouscash/thumbs/mrpov.png differ diff --git a/public/img/logos/fabulouscash/thumbs/nowayamigay.png b/public/img/logos/fabulouscash/thumbs/nowayamigay.png new file mode 100644 index 00000000..7efc3d98 Binary files /dev/null and b/public/img/logos/fabulouscash/thumbs/nowayamigay.png differ diff --git a/public/img/logos/fabulouscash/thumbs/thedicksuckers.png b/public/img/logos/fabulouscash/thumbs/thedicksuckers.png new file mode 100644 index 00000000..117500ab Binary files /dev/null and b/public/img/logos/fabulouscash/thumbs/thedicksuckers.png differ diff --git a/public/img/logos/finishesthejob/favicon.png b/public/img/logos/finishesthejob/favicon.png new file mode 100644 index 00000000..a583208c Binary files /dev/null and b/public/img/logos/finishesthejob/favicon.png differ diff --git a/public/img/logos/finishesthejob/favicon_dark.png b/public/img/logos/finishesthejob/favicon_dark.png new file mode 100644 index 00000000..413e34eb Binary files /dev/null and b/public/img/logos/finishesthejob/favicon_dark.png differ diff --git a/public/img/logos/finishesthejob/favicon_light.png b/public/img/logos/finishesthejob/favicon_light.png new file mode 100644 index 00000000..4840626c Binary files /dev/null and b/public/img/logos/finishesthejob/favicon_light.png differ diff --git a/public/img/logos/finishesthejob/finishesthejob.png b/public/img/logos/finishesthejob/finishesthejob.png new file mode 100644 index 00000000..8f97b63a Binary files /dev/null and b/public/img/logos/finishesthejob/finishesthejob.png differ diff --git a/public/img/logos/finishesthejob/lazy/favicon.png b/public/img/logos/finishesthejob/lazy/favicon.png new file mode 100644 index 00000000..a0e9035f Binary files /dev/null and b/public/img/logos/finishesthejob/lazy/favicon.png differ diff --git a/public/img/logos/finishesthejob/lazy/favicon_dark.png b/public/img/logos/finishesthejob/lazy/favicon_dark.png new file mode 100644 index 00000000..a3da3a62 Binary files /dev/null and b/public/img/logos/finishesthejob/lazy/favicon_dark.png differ diff --git a/public/img/logos/finishesthejob/lazy/favicon_light.png b/public/img/logos/finishesthejob/lazy/favicon_light.png new file mode 100644 index 00000000..2f18e230 Binary files /dev/null and b/public/img/logos/finishesthejob/lazy/favicon_light.png differ diff --git a/public/img/logos/finishesthejob/lazy/finishesthejob.png b/public/img/logos/finishesthejob/lazy/finishesthejob.png new file mode 100644 index 00000000..a02e30b7 Binary files /dev/null and b/public/img/logos/finishesthejob/lazy/finishesthejob.png differ diff --git a/public/img/logos/finishesthejob/lazy/network.png b/public/img/logos/finishesthejob/lazy/network.png new file mode 100644 index 00000000..9e7c8111 Binary files /dev/null and b/public/img/logos/finishesthejob/lazy/network.png differ diff --git a/public/img/logos/finishesthejob/network.png b/public/img/logos/finishesthejob/network.png new file mode 100644 index 00000000..8f97b63a Binary files /dev/null and b/public/img/logos/finishesthejob/network.png differ diff --git a/public/img/logos/finishesthejob/thumbs/favicon.png b/public/img/logos/finishesthejob/thumbs/favicon.png new file mode 100644 index 00000000..a0e9035f Binary files /dev/null and b/public/img/logos/finishesthejob/thumbs/favicon.png differ diff --git a/public/img/logos/finishesthejob/thumbs/favicon_dark.png b/public/img/logos/finishesthejob/thumbs/favicon_dark.png new file mode 100644 index 00000000..a3da3a62 Binary files /dev/null and b/public/img/logos/finishesthejob/thumbs/favicon_dark.png differ diff --git a/public/img/logos/finishesthejob/thumbs/favicon_light.png b/public/img/logos/finishesthejob/thumbs/favicon_light.png new file mode 100644 index 00000000..2f18e230 Binary files /dev/null and b/public/img/logos/finishesthejob/thumbs/favicon_light.png differ diff --git a/public/img/logos/finishesthejob/thumbs/finishesthejob.png b/public/img/logos/finishesthejob/thumbs/finishesthejob.png new file mode 100644 index 00000000..3047763e Binary files /dev/null and b/public/img/logos/finishesthejob/thumbs/finishesthejob.png differ diff --git a/public/img/logos/finishesthejob/thumbs/network.png b/public/img/logos/finishesthejob/thumbs/network.png new file mode 100644 index 00000000..0990d4ad Binary files /dev/null and b/public/img/logos/finishesthejob/thumbs/network.png differ diff --git a/public/img/logos/manojob/favicon.png b/public/img/logos/manojob/favicon.png new file mode 100644 index 00000000..6e3d4b65 Binary files /dev/null and b/public/img/logos/manojob/favicon.png differ diff --git a/public/img/logos/manojob/favicon_dark.png b/public/img/logos/manojob/favicon_dark.png new file mode 100644 index 00000000..c24152e7 Binary files /dev/null and b/public/img/logos/manojob/favicon_dark.png differ diff --git a/public/img/logos/manojob/favicon_light.png b/public/img/logos/manojob/favicon_light.png new file mode 100644 index 00000000..ae1be26d Binary files /dev/null and b/public/img/logos/manojob/favicon_light.png differ diff --git a/public/img/logos/manojob/lazy/favicon.png b/public/img/logos/manojob/lazy/favicon.png new file mode 100644 index 00000000..3f98ec2f Binary files /dev/null and b/public/img/logos/manojob/lazy/favicon.png differ diff --git a/public/img/logos/manojob/lazy/favicon_dark.png b/public/img/logos/manojob/lazy/favicon_dark.png new file mode 100644 index 00000000..939137ae Binary files /dev/null and b/public/img/logos/manojob/lazy/favicon_dark.png differ diff --git a/public/img/logos/manojob/lazy/favicon_light.png b/public/img/logos/manojob/lazy/favicon_light.png new file mode 100644 index 00000000..9b567112 Binary files /dev/null and b/public/img/logos/manojob/lazy/favicon_light.png differ diff --git a/public/img/logos/manojob/lazy/manojob.png b/public/img/logos/manojob/lazy/manojob.png new file mode 100644 index 00000000..c5a2eed1 Binary files /dev/null and b/public/img/logos/manojob/lazy/manojob.png differ diff --git a/public/img/logos/manojob/lazy/network.png b/public/img/logos/manojob/lazy/network.png new file mode 100644 index 00000000..938b4bc7 Binary files /dev/null and b/public/img/logos/manojob/lazy/network.png differ diff --git a/public/img/logos/manojob/manojob.png b/public/img/logos/manojob/manojob.png new file mode 100644 index 00000000..a5a4ed1c Binary files /dev/null and b/public/img/logos/manojob/manojob.png differ diff --git a/public/img/logos/manojob/network.png b/public/img/logos/manojob/network.png new file mode 100644 index 00000000..a5a4ed1c Binary files /dev/null and b/public/img/logos/manojob/network.png differ diff --git a/public/img/logos/manojob/thumbs/favicon.png b/public/img/logos/manojob/thumbs/favicon.png new file mode 100644 index 00000000..3f98ec2f Binary files /dev/null and b/public/img/logos/manojob/thumbs/favicon.png differ diff --git a/public/img/logos/manojob/thumbs/favicon_dark.png b/public/img/logos/manojob/thumbs/favicon_dark.png new file mode 100644 index 00000000..939137ae Binary files /dev/null and b/public/img/logos/manojob/thumbs/favicon_dark.png differ diff --git a/public/img/logos/manojob/thumbs/favicon_light.png b/public/img/logos/manojob/thumbs/favicon_light.png new file mode 100644 index 00000000..9b567112 Binary files /dev/null and b/public/img/logos/manojob/thumbs/favicon_light.png differ diff --git a/public/img/logos/manojob/thumbs/manojob.png b/public/img/logos/manojob/thumbs/manojob.png new file mode 100644 index 00000000..07998286 Binary files /dev/null and b/public/img/logos/manojob/thumbs/manojob.png differ diff --git a/public/img/logos/manojob/thumbs/network.png b/public/img/logos/manojob/thumbs/network.png new file mode 100644 index 00000000..f920beda Binary files /dev/null and b/public/img/logos/manojob/thumbs/network.png differ diff --git a/public/img/logos/mrpov/favicon.png b/public/img/logos/mrpov/favicon.png new file mode 100644 index 00000000..837fef03 Binary files /dev/null and b/public/img/logos/mrpov/favicon.png differ diff --git a/public/img/logos/mrpov/favicon_dark.png b/public/img/logos/mrpov/favicon_dark.png new file mode 100644 index 00000000..35752a26 Binary files /dev/null and b/public/img/logos/mrpov/favicon_dark.png differ diff --git a/public/img/logos/mrpov/favicon_light.png b/public/img/logos/mrpov/favicon_light.png new file mode 100644 index 00000000..eb467072 Binary files /dev/null and b/public/img/logos/mrpov/favicon_light.png differ diff --git a/public/img/logos/mrpov/lazy/favicon.png b/public/img/logos/mrpov/lazy/favicon.png new file mode 100644 index 00000000..53648734 Binary files /dev/null and b/public/img/logos/mrpov/lazy/favicon.png differ diff --git a/public/img/logos/mrpov/lazy/favicon_dark.png b/public/img/logos/mrpov/lazy/favicon_dark.png new file mode 100644 index 00000000..3d099465 Binary files /dev/null and b/public/img/logos/mrpov/lazy/favicon_dark.png differ diff --git a/public/img/logos/mrpov/lazy/favicon_light.png b/public/img/logos/mrpov/lazy/favicon_light.png new file mode 100644 index 00000000..52c11165 Binary files /dev/null and b/public/img/logos/mrpov/lazy/favicon_light.png differ diff --git a/public/img/logos/mrpov/lazy/mrpov.png b/public/img/logos/mrpov/lazy/mrpov.png new file mode 100644 index 00000000..e4c1f353 Binary files /dev/null and b/public/img/logos/mrpov/lazy/mrpov.png differ diff --git a/public/img/logos/mrpov/lazy/network.png b/public/img/logos/mrpov/lazy/network.png new file mode 100644 index 00000000..08a303ef Binary files /dev/null and b/public/img/logos/mrpov/lazy/network.png differ diff --git a/public/img/logos/mrpov/mrpov.png b/public/img/logos/mrpov/mrpov.png new file mode 100644 index 00000000..8212b34d Binary files /dev/null and b/public/img/logos/mrpov/mrpov.png differ diff --git a/public/img/logos/mrpov/network.png b/public/img/logos/mrpov/network.png new file mode 100644 index 00000000..8212b34d Binary files /dev/null and b/public/img/logos/mrpov/network.png differ diff --git a/public/img/logos/mrpov/thumbs/favicon.png b/public/img/logos/mrpov/thumbs/favicon.png new file mode 100644 index 00000000..53648734 Binary files /dev/null and b/public/img/logos/mrpov/thumbs/favicon.png differ diff --git a/public/img/logos/mrpov/thumbs/favicon_dark.png b/public/img/logos/mrpov/thumbs/favicon_dark.png new file mode 100644 index 00000000..3d099465 Binary files /dev/null and b/public/img/logos/mrpov/thumbs/favicon_dark.png differ diff --git a/public/img/logos/mrpov/thumbs/favicon_light.png b/public/img/logos/mrpov/thumbs/favicon_light.png new file mode 100644 index 00000000..52c11165 Binary files /dev/null and b/public/img/logos/mrpov/thumbs/favicon_light.png differ diff --git a/public/img/logos/mrpov/thumbs/mrpov.png b/public/img/logos/mrpov/thumbs/mrpov.png new file mode 100644 index 00000000..276c420d Binary files /dev/null and b/public/img/logos/mrpov/thumbs/mrpov.png differ diff --git a/public/img/logos/mrpov/thumbs/network.png b/public/img/logos/mrpov/thumbs/network.png new file mode 100644 index 00000000..0e161e84 Binary files /dev/null and b/public/img/logos/mrpov/thumbs/network.png differ diff --git a/public/img/logos/thedicksuckers/favicon.png b/public/img/logos/thedicksuckers/favicon.png new file mode 100644 index 00000000..037d9c2f Binary files /dev/null and b/public/img/logos/thedicksuckers/favicon.png differ diff --git a/public/img/logos/thedicksuckers/favicon_dark.png b/public/img/logos/thedicksuckers/favicon_dark.png new file mode 100644 index 00000000..204788d0 Binary files /dev/null and b/public/img/logos/thedicksuckers/favicon_dark.png differ diff --git a/public/img/logos/thedicksuckers/favicon_light.png b/public/img/logos/thedicksuckers/favicon_light.png new file mode 100644 index 00000000..6137cebf Binary files /dev/null and b/public/img/logos/thedicksuckers/favicon_light.png differ diff --git a/public/img/logos/thedicksuckers/lazy/favicon.png b/public/img/logos/thedicksuckers/lazy/favicon.png new file mode 100644 index 00000000..acfe2a56 Binary files /dev/null and b/public/img/logos/thedicksuckers/lazy/favicon.png differ diff --git a/public/img/logos/thedicksuckers/lazy/favicon_dark.png b/public/img/logos/thedicksuckers/lazy/favicon_dark.png new file mode 100644 index 00000000..5ec8eb4b Binary files /dev/null and b/public/img/logos/thedicksuckers/lazy/favicon_dark.png differ diff --git a/public/img/logos/thedicksuckers/lazy/favicon_light.png b/public/img/logos/thedicksuckers/lazy/favicon_light.png new file mode 100644 index 00000000..dccfc2b6 Binary files /dev/null and b/public/img/logos/thedicksuckers/lazy/favicon_light.png differ diff --git a/public/img/logos/thedicksuckers/lazy/network.png b/public/img/logos/thedicksuckers/lazy/network.png new file mode 100644 index 00000000..50f198ad Binary files /dev/null and b/public/img/logos/thedicksuckers/lazy/network.png differ diff --git a/public/img/logos/thedicksuckers/lazy/thedicksuckers.png b/public/img/logos/thedicksuckers/lazy/thedicksuckers.png new file mode 100644 index 00000000..6d00cd67 Binary files /dev/null and b/public/img/logos/thedicksuckers/lazy/thedicksuckers.png differ diff --git a/public/img/logos/thedicksuckers/network.png b/public/img/logos/thedicksuckers/network.png new file mode 100644 index 00000000..fbf990ab Binary files /dev/null and b/public/img/logos/thedicksuckers/network.png differ diff --git a/public/img/logos/thedicksuckers/thedicksuckers.png b/public/img/logos/thedicksuckers/thedicksuckers.png new file mode 100644 index 00000000..fbf990ab Binary files /dev/null and b/public/img/logos/thedicksuckers/thedicksuckers.png differ diff --git a/public/img/logos/thedicksuckers/thumbs/favicon.png b/public/img/logos/thedicksuckers/thumbs/favicon.png new file mode 100644 index 00000000..acfe2a56 Binary files /dev/null and b/public/img/logos/thedicksuckers/thumbs/favicon.png differ diff --git a/public/img/logos/thedicksuckers/thumbs/favicon_dark.png b/public/img/logos/thedicksuckers/thumbs/favicon_dark.png new file mode 100644 index 00000000..5ec8eb4b Binary files /dev/null and b/public/img/logos/thedicksuckers/thumbs/favicon_dark.png differ diff --git a/public/img/logos/thedicksuckers/thumbs/favicon_light.png b/public/img/logos/thedicksuckers/thumbs/favicon_light.png new file mode 100644 index 00000000..dccfc2b6 Binary files /dev/null and b/public/img/logos/thedicksuckers/thumbs/favicon_light.png differ diff --git a/public/img/logos/thedicksuckers/thumbs/network.png b/public/img/logos/thedicksuckers/thumbs/network.png new file mode 100644 index 00000000..b0bf79eb Binary files /dev/null and b/public/img/logos/thedicksuckers/thumbs/network.png differ diff --git a/public/img/logos/thedicksuckers/thumbs/thedicksuckers.png b/public/img/logos/thedicksuckers/thumbs/thedicksuckers.png new file mode 100644 index 00000000..072b76cf Binary files /dev/null and b/public/img/logos/thedicksuckers/thumbs/thedicksuckers.png differ diff --git a/seeds/01_networks.js b/seeds/01_networks.js index 8caab132..77fb3573 100755 --- a/seeds/01_networks.js +++ b/seeds/01_networks.js @@ -250,6 +250,12 @@ const networks = [ url: 'https://dogfartnetwork.com', description: 'The world famous Dogfart Interracial series. Online since 1996, we have the largest collection of Interracial videos, pictures and content on the web.', }, + { + slug: 'fabulouscash', + name: 'Fabulous Cash', + hasLogo: false, + url: 'https://fabulouscash.com', + }, { slug: 'fantasymassage', name: 'Fantasy Massage', @@ -679,6 +685,7 @@ exports.seed = (knex) => Promise.resolve() alias: network.alias, url: network.url, description: network.description, + has_logo: network.hasLogo, parameters: network.parameters, parent_id: grandParentNetworksBySlug[network.parent] || null, })); @@ -693,6 +700,7 @@ exports.seed = (knex) => Promise.resolve() alias: network.alias, url: network.url, description: network.description, + has_logo: network.hasLogo, parameters: network.parameters, parent_id: parentNetworksBySlug[network.parent] || grandParentNetworksBySlug[network.parent] || null, })); diff --git a/seeds/02_sites.js b/seeds/02_sites.js index 74fd9e89..289a6d30 100755 --- a/seeds/02_sites.js +++ b/seeds/02_sites.js @@ -3345,6 +3345,57 @@ const sites = [ scene: 'https://www.evilangel.com/en/video', }, }, + // FABULOUS CASH + { + slug: 'manojob', + name: 'Mano Job', + url: 'https://www.manojob.com', + tags: ['handjob'], + alias: ['maj'], + independent: true, + parent: 'fabulouscash', + }, + { + slug: 'thedicksuckers', + name: 'The Dick Suckers', + url: 'https://www.thedicksuckers.com', + alias: ['tds'], + independent: true, + parent: 'fabulouscash', + }, + { + slug: 'finishesthejob', + name: 'Finishes The Job', + url: 'https://www.finishesthejob.com', + independent: true, + parent: 'fabulouscash', + }, + { + slug: 'mrpov', + name: 'Mr. POV', + url: 'https://www.mrpov.com', + tags: ['pov'], + independent: true, + parent: 'fabulouscash', + }, + { + slug: 'nowayamigay', + name: 'No Way Am I Gay', + url: 'http://www.nowayamigay.com', + parent: 'fabulouscash', + parameters: { + layout: 'legacy', + }, + }, + { + slug: 'chelcifox', + name: 'Chelci Fox', + url: 'http://www.chelcifox.com', + parent: 'fabulouscash', + parameters: { + layout: 'legacy', + }, + }, // FAKE HUB { slug: 'fakeagentuk', diff --git a/src/scrapers/fabulouscash.js b/src/scrapers/fabulouscash.js new file mode 100755 index 00000000..7ad9a62e --- /dev/null +++ b/src/scrapers/fabulouscash.js @@ -0,0 +1,79 @@ +'use strict'; + +const unprint = require('unprint'); + +function scrapeAll(scenes) { + return scenes.map(({ query, element }, channel) => { + const release = {}; + + release.url = query.url('a'); + release.entryId = new URL(release.url).pathname.match(/\/scene\/\w+\/([\w-]+)/)[1]; + + release.title = query.content('.name'); + + release.actors = query.all('.performers a').map((actorEl) => ({ + name: unprint.query.content(actorEl, null).trim(), + url: unprint.query.url(actorEl, null, 'href'), + })); + + const poster = query.img('img[itemprop="thumbnailUrl"]'); + const photo = poster.replace('featured.jpg', 'trailer.jpg'); + + release.poster = [ + poster, + photo, + ]; + + release.photos = [photo]; + release.teaser = unprint.prefixUrl(element.dataset.video, channel.url); + + release.stars = query.number('.rating span'); + + return release; + }); +} + +function scrapeScene({ query }, { url, entity }) { + const release = {}; + + release.entryId = new URL(url).pathname.match(/\/scene\/\w+\/([\w-]+)/)[1]; + + release.title = query.content('.container h1'); + release.description = query.content('//p[contains(text(), "Categories")]/following-sibling::p'); + + release.actors = query.all('//h3[contains(text(), "Starring")]/a').map((actorEl) => ({ + name: unprint.query.content(actorEl, null).trim(), + url: unprint.query.url(actorEl, null, 'href'), + })); + + const photo = query.poster('.container video', { origin: entity.url }); + + release.poster = [ + photo.replace('trailer.jpg', 'featured.jpg'), + photo, + ]; + + release.photos = [photo]; + release.trailer = query.video(); + + release.tags = query.contents('//p[contains(text(), "Categories")]/a'); + + return release; +} + +async function fetchLatest(channel, page = 1) { + const url = `${channel.url}/updates/${page}`; + const res = await unprint.get(url, { selectAll: '.card.scene' }); + + if (res.ok) { + return scrapeAll(res.context, channel); + } + + return res.status; +} + +module.exports = { + fetchLatest, + scrapeScene, + useUnprint: true, +}; diff --git a/src/scrapers/scrapers.js b/src/scrapers/scrapers.js index aa73d783..7a592ab7 100755 --- a/src/scrapers/scrapers.js +++ b/src/scrapers/scrapers.js @@ -17,6 +17,7 @@ const czechav = require('./czechav'); const ddfnetwork = require('./ddfnetwork'); const dogfart = require('./dogfart'); const dorcel = require('./dorcel'); +const fabulouscash = require('./fabulouscash'); const famedigital = require('./famedigital'); const firstanalquest = require('./firstanalquest'); const elevatedx = require('./elevatedx'); @@ -97,6 +98,7 @@ const scrapers = { elegantangel: adultempire, famedigital, exploitedx: elevatedx, + fabulouscash, firstanalquest, forbondage: porndoe, fullpornnetwork, diff --git a/src/web/postgraphile.js b/src/web/postgraphile.js index c5194cd2..67f009c4 100755 --- a/src/web/postgraphile.js +++ b/src/web/postgraphile.js @@ -21,6 +21,7 @@ async function pgSettings(req) { // console.log(PgAggregatesPlugin); +/* const TagsAggregatePlugin = (builder) => { builder.hook('build', (build) => { const pgAggregateSpecs = [ @@ -29,8 +30,8 @@ const TagsAggregatePlugin = (builder) => { humanLabel: 'tags', HumanLabel: 'Tags', sqlAggregateWrap: (sqlFrag) => { - console.log('sql frag', sqlFrag); - return build.pgSql.fragment`sum(${sqlFrag})`; + // console.log('sql frag', sqlFrag); + return build.pgSql.fragment`select tag_id from tags where release_id = ${sqlFrag}`; }, isSuitableType: (pgType) => { // console.log('pg type', pgType); @@ -39,9 +40,12 @@ const TagsAggregatePlugin = (builder) => { }, ]; - build.pgAggregateSpecs = pgAggregateSpecs; // eslint-disable-line no-param-reassign + build.pgAggregateGroupBySpecs = pgAggregateSpecs; // eslint-disable-line no-param-reassign + + return build; }); }; +*/ module.exports = postgraphile( connectionString, @@ -69,7 +73,7 @@ module.exports = postgraphile( ...SitePlugins, ...ReleasePlugins, ...MediaPlugins, - TagsAggregatePlugin, + // TagsAggregatePlugin, ], pgSettings, },