Merge branch 'master' into whalemember

1.236.1
Added filtered titles and secondary tags to manticore database.
2024-02-09 21:31:16 +00:00 · 2024-02-09 22:30:41 +01:00 · 2024-02-09 22:30:38 +01:00 · 2024-01-25 01:59:00 +01:00 · 2024-01-25 01:58:55 +01:00 · 2024-01-25 01:15:42 +01:00
233 changed files with 10451 additions and 23143 deletions
--- a/.eslintrc
+++ b/.eslintrc
@ -11,6 +11,7 @@
        "no-tabs": "off",
        "no-unused-vars": ["error", {"argsIgnorePattern": "^_"}],
        "no-console": 0,
+		"default-param-last": 0,
        "template-curly-spacing": "off",
        "max-len": 0,
        "vue/no-v-html": 0,
@ -18,6 +19,7 @@
        "vue/multiline-html-element-content-newline": 0,
        "vue/singleline-html-element-content-newline": 0,
 		"vue/multi-word-component-names": 0,
+		"vue/no-reserved-component-names": 0,
        "no-param-reassign": ["error", {
            "props": true,
            "ignorePropertyModificationsFor": ["state", "acc"]
--- a/.gitignore
+++ b/.gitignore
@ -3,6 +3,7 @@ dist/
 log/
 media/
 html/
+data/
 tmp/*
 public/js/*
 public/css/*
--- a/.nvmrc
+++ b/.nvmrc
@ -1 +1 @@
-16.18.0
+21.2.0
--- a/assets/components/entities/children.vue
+++ b/assets/components/entities/children.vue
@ -20,13 +20,13 @@ export default {
 	components: {
 		EntityTile,
 	},
-	emits: ['load'],
 	props: {
 		entity: {
 			type: Object,
 			default: null,
 		},
 	},
+	emits: ['load'],
 };
 </script>

--- a/assets/maintenance/index.html
+++ b/assets/maintenance/index.html
@ -0,0 +1,53 @@
+<!DOCTYPE html>
+<html lang="en">
+    <head>
+        <meta charset="UTF-8">
+        <meta name="viewport" content="width=device-width,height=device-height,initial-scale=1,maximum-scale=1,user-scalable=no">
+		<meta name="theme-color" content="#ff2288">
+
+        <title>traxxx | maintenance</title>
+
+		<link rel="icon" href="/img/favicon/favicon-32.ico">
+		<link rel="icon" href="/img/favicon/favicon.svg" type="image/svg+xml">
+		<link rel="apple-touch-icon" href="/img/favicon/favicon-180.png">
+		<link rel="manifest" href="/img/favicon/manifest.webmanifest">
+
+		<meta name="msapplication-TileColor" content="#aa2c66">
+		<meta name="msapplication-config" content="/img/favicon/browserconfig.xml">
+
+		<style>
+			body,
+			html {
+				width: 100%;
+				height: 100%;
+				margin: 0;
+			}
+
+			body {
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				font-family: sans-serif;
+				background: url('/maintenance/maintenance_shay_evans_2.jpeg');
+				background-position: top center;
+				background-size: cover
+			}
+
+			.text {
+				padding: 2rem;
+				margin: 1rem;
+				color: white;
+				text-align: center;
+				text-shadow: 0 0 5px black;
+				font-size: 1.5rem;
+				font-weight: bold;
+				border-radius: 2rem;
+				backdrop-filter: blur(.5rem);
+			}
+		</style>
+    </head>
+
+    <body>
+		<div class="text">Traxxx is currently under maintenance. We will be back shortly!</div>
+    </body>
+</html>
--- a/assets/maintenance/maintenance_ella_reese.jpeg
+++ b/assets/maintenance/maintenance_ella_reese.jpeg
--- a/assets/maintenance/maintenance_shay_evans.jpeg
+++ b/assets/maintenance/maintenance_shay_evans.jpeg
--- a/assets/maintenance/maintenance_shay_evans_2.jpeg
+++ b/assets/maintenance/maintenance_shay_evans_2.jpeg
--- a/assets/maintenance/maintenance_shay_evans_3.jpeg
+++ b/assets/maintenance/maintenance_shay_evans_3.jpeg
--- a/config/default.js
+++ b/config/default.js
@ -12,8 +12,20 @@ module.exports = {
 			password: 'password',
 			database: 'traxxx',
 		},
+		manticore: {
+			host: '127.0.0.1',
+			sqlPort: 9306,
+			httpPort: 9308,
+		},
 		timeout: 5000,
 		graphiql: false,
+		pool: {
+			min: 0,
+			max: 20,
+			acquireTimeoutMillis: 300000,
+			createTimeoutMillis: 300000,
+			destroyTimeoutMillis: 300000,
+		},
 	},
 	web: {
 		host: '0.0.0.0',
@ -56,6 +68,9 @@ module.exports = {
 		usernameLength: [2, 24],
 		usernamePattern: /^[a-zA-Z0-9_-]+$/,
 	},
+	stashes: {
+		viewRefreshCooldown: 60, // minutes
+	},
 	exclude: {
 		channels: [
 			// 21sextreme, no longer updated
--- a/docs/puppeteer.md
+++ b/docs/puppeteer.md
@ -0,0 +1,4 @@
+# Puppeteer
+Puppeteer has several dependencies that may not be available in Debian 12 by default:
+
+`apt install libasound2 libatk-bridge2.0-0 libcairo2 libcups2 libdrm2 libgbm-dev libpango-1.0-0 libxcomposite1 libxdamage1 libxfixes3 libxkbcommon-x11-0 libxrandr2 `
--- a/migrations/20231201040310_tagsplit.js
+++ b/migrations/20231201040310_tagsplit.js
@ -0,0 +1,21 @@
+exports.up = async (knex) => {
+	await knex.schema.alterTable('tags', (table) => {
+		table.specificType('implied_tag_ids', 'integer[]');
+	});
+
+	await knex.schema.alterTable('releases_tags', (table) => {
+		table.enum('source', ['scraper', 'editor', 'implied'])
+			.notNullable()
+			.defaultTo('scraper');
+	});
+};
+
+exports.down = async (knex) => {
+	await knex.schema.alterTable('tags', (table) => {
+		table.dropColumn('implied_tag_ids');
+	});
+
+	await knex.schema.alterTable('releases_tags', (table) => {
+		table.dropColumn('source');
+	});
+};
--- a/migrations/20231216015820_movies_series_photo_count.js
+++ b/migrations/20231216015820_movies_series_photo_count.js
@ -0,0 +1,19 @@
+exports.up = async (knex) => {
+	await knex.schema.alterTable('movies', (table) => {
+		table.integer('photo_count');
+	});
+
+	await knex.schema.alterTable('series', (table) => {
+		table.integer('photo_count');
+	});
+};
+
+exports.down = async (knex) => {
+	await knex.schema.alterTable('movies', (table) => {
+		table.dropColumn('photo_count');
+	});
+
+	await knex.schema.alterTable('series', (table) => {
+		table.dropColumn('photo_count');
+	});
+};
--- a/migrations/20240104234936_actors_metadata.js
+++ b/migrations/20240104234936_actors_metadata.js
@ -0,0 +1,34 @@
+exports.up = async function up(knex) {
+	await knex.raw(`
+		CREATE MATERIALIZED VIEW actors_meta AS (
+			SELECT
+				actors.*,
+				COUNT(DISTINCT stashes_actors) as stashed,
+				COUNT(DISTINCT releases_actors) as scenes,
+				row_to_json(avatars) as avatar
+			FROM actors
+			LEFT JOIN stashes_actors ON stashes_actors.actor_id = actors.id
+			LEFT JOIN releases_actors ON releases_actors.actor_id = actors.id
+			LEFT JOIN media AS avatars ON avatars.id = actors.avatar_media_id
+			GROUP BY
+				actors.id,
+				avatars.id
+		);
+
+		CREATE MATERIALIZED VIEW scenes_meta AS (
+			SELECT
+				releases.*,
+				COUNT(DISTINCT stashes_scenes) as stashed
+			FROM releases
+			LEFT JOIN stashes_scenes ON stashes_scenes.scene_id = releases.id
+			GROUP BY releases.id
+		);
+	`);
+};
+
+exports.down = async function down(knex) {
+	await knex.raw(`
+		DROP MATERIALIZED VIEW IF EXISTS actors_meta;
+		DROP MATERIALIZED VIEW IF EXISTS scenes_meta;
+	`);
+};
--- a/migrations/20240125011700_manticore.js
+++ b/migrations/20240125011700_manticore.js
@ -0,0 +1,36 @@
+const config = require('config');
+const manticore = require('manticoresearch');
+
+const mantiClient = new manticore.ApiClient();
+
+mantiClient.basePath = `http://${config.database.manticore.host}:${config.database.manticore.httpPort}`;
+
+const utilsApi = new manticore.UtilsApi(mantiClient);
+
+exports.up = async () => {
+	await utilsApi.sql(`create table scenes (
+		 id int,
+		 title text,
+		 title_filtered text,
+		 shoot_id text,
+		 channel_id int,
+		 channel_name text,
+		 channel_slug text,
+		 network_id int,
+		 network_name text,
+		 network_slug text,
+		 actor_ids multi,
+		 actors text,
+		 tag_ids multi,
+		 tags text,
+		 meta text,
+		 date timestamp,
+		 created_at timestamp,
+		 effective_date timestamp,
+		 stashed int
+	)`);
+};
+
+exports.down = async () => {
+	await utilsApi.sql('drop table scenes');
+};
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
    "name": "traxxx",
-    "version": "1.233.0",
+    "version": "1.236.1",
    "description": "All the latest porn releases in one place",
    "main": "src/app.js",
    "scripts": {
@ -38,120 +38,126 @@
    "author": "DebaucheryLibrarian",
    "license": "ISC",
    "devDependencies": {
-        "@babel/cli": "^7.12.10",
-        "@babel/core": "^7.8.4",
-        "@babel/eslint-parser": "^7.16.0",
+        "@babel/cli": "^7.23.4",
+        "@babel/core": "^7.23.3",
+        "@babel/eslint-parser": "^7.23.3",
        "@babel/plugin-proposal-optional-chaining": "^7.8.3",
-        "@babel/preset-env": "^7.8.4",
-        "@babel/register": "^7.8.3",
-        "autoprefixer": "^10.4.0",
-        "babel-loader": "^8.0.6",
+        "@babel/preset-env": "^7.23.3",
+        "@babel/register": "^7.22.15",
+        "autoprefixer": "^10.4.16",
+        "babel-loader": "^9.1.3",
        "babel-preset-airbnb": "^5.0.0",
-        "css-loader": "^6.5.0",
-        "eslint": "^8.1.0",
-        "eslint-config-airbnb": "^18.2.1",
-        "eslint-config-airbnb-base": "^14.2.1",
-        "eslint-plugin-import": "^2.20.1",
-        "eslint-plugin-jsx-a11y": "^6.2.3",
-        "eslint-plugin-react": "^7.18.3",
-        "eslint-plugin-vue": "^8.0.3",
-        "eslint-watch": "^7.0.0",
-        "eslint-webpack-plugin": "^3.1.0",
-        "mini-css-extract-plugin": "^2.4.3",
-        "node-sass": "^6.0.1",
-        "postcss-loader": "^6.2.0",
+        "css-loader": "^6.8.1",
+        "eslint": "^8.54.0",
+        "eslint-config-airbnb": "^19.0.4",
+        "eslint-config-airbnb-base": "^15.0.0",
+        "eslint-plugin-import": "^2.29.0",
+        "eslint-plugin-jsx-a11y": "^6.8.0",
+        "eslint-plugin-react": "^7.33.2",
+        "eslint-plugin-vue": "^9.18.1",
+        "eslint-watch": "^8.0.0",
+        "eslint-webpack-plugin": "^4.0.1",
+        "mini-css-extract-plugin": "^2.7.6",
+        "node-sass": "^9.0.0",
+        "postcss-loader": "^7.3.3",
        "raw-loader": "^4.0.2",
-        "sass-loader": "^12.3.0",
-        "style-loader": "^3.3.1",
-        "vue-loader": "^16.8.2",
-        "webpack": "^5.11.0",
-        "webpack-cli": "^4.9.1"
+        "sass-loader": "^13.3.2",
+        "style-loader": "^3.3.3",
+        "vue-loader": "^17.3.1",
+        "webpack": "^5.89.0",
+        "webpack-cli": "^5.1.4"
    },
    "dependencies": {
-        "@casl/ability": "^5.2.2",
-        "@graphile-contrib/pg-order-by-related": "^1.0.0-beta.6",
+        "@aws-sdk/client-s3": "^3.458.0",
+        "@aws-sdk/credential-provider-ini": "^3.458.0",
+        "@aws-sdk/lib-storage": "^3.458.0",
+        "@casl/ability": "^6.5.0",
+        "@faker-js/faker": "^8.3.1",
+        "@graphile-contrib/pg-order-by-related": "^1.0.0",
        "@graphile-contrib/pg-simplify-inflector": "^6.1.0",
        "@graphile/pg-aggregates": "^0.1.1",
-        "acorn": "^8.0.4",
-        "array-equal": "^1.0.0",
-        "aws-sdk": "^2.847.0",
+        "acorn": "^8.11.2",
+        "array-equal": "^1.0.2",
        "babel-polyfill": "^6.26.0",
        "bhttp": "^1.2.8",
-        "blake2": "^4.0.0",
+        "blake2": "^5.0.0",
        "bluebird": "^3.7.2",
-        "body-parser": "^1.19.0",
+        "body-parser": "^1.20.2",
        "bottleneck": "^2.19.5",
-        "canvas": "^2.6.1",
+        "canvas": "^2.11.2",
        "casual": "^1.6.2",
-        "cheerio": "^1.0.0-rc.3",
+        "cheerio": "^1.0.0-rc.12",
        "cli-confirm": "^1.0.1",
        "cloudscraper": "^4.6.0",
-        "config": "^3.2.5",
-        "connect-session-knex": "^2.0.0",
-        "convert": "^4.2.4",
-        "cookie": "^0.4.0",
-        "csv-stringify": "^5.3.6",
+        "config": "^3.3.9",
+        "connect-session-knex": "^4.0.0",
+        "convert": "^4.14.0",
+        "cookie": "^0.6.0",
+        "csv-stringify": "^6.4.4",
        "date-fns": "^2.30.0",
-        "dayjs": "^1.8.21",
-        "dompurify": "^2.0.11",
-        "ejs": "^3.0.1",
+        "dayjs": "^1.11.10",
+        "dompurify": "^3.0.6",
+        "ejs": "^3.1.9",
        "escape-string-regexp": "^4.0.0",
-        "express": "^4.17.1",
-        "express-promise-router": "^4.1.0",
+        "express": "^4.18.2",
+        "express-promise-router": "^4.1.1",
+        "express-query-boolean": "^2.0.0",
        "express-react-views": "^0.11.0",
-        "express-session": "^1.17.1",
+        "express-session": "^1.17.3",
        "face-api.js": "^0.22.2",
-        "faker": "^5.1.0",
-        "file-type": "^16.5.3",
+        "file-type": "^18.7.0",
        "fluent-ffmpeg": "^2.1.2",
-        "fs-extra": "^10.0.0",
-        "graphile-utils": "^4.12.2",
-        "graphql": "^15.4.0",
-        "html-entities": "^2.3.2",
+        "fs-extra": "^11.1.1",
+        "graphile-build": "^4.14.0",
+        "graphile-utils": "^4.14.0",
+        "graphql": "^15.8.0",
+        "html-entities": "^2.4.0",
        "iconv-lite": "^0.6.3",
-        "inquirer": "^8.2.0",
-        "inspector-api": "^1.4.2",
-        "jsdom": "^18.0.0",
-        "knex": "^0.95.12",
+        "inquirer": "^8.2.6",
+        "inspector-api": "^1.4.8",
+        "jsdom": "^23.0.1",
+        "knex": "^3.0.1",
        "knex-migrate": "^1.7.4",
        "longjohn": "^0.2.12",
+        "manticoresearch": "^4.0.0",
        "merge-anything": "^5.1.7",
-        "mime": "^2.4.4",
-        "mitt": "^3.0.0",
-        "moment": "^2.24.0",
-        "nanoid": "^3.1.30",
-        "node-fetch": "^2.6.7",
+        "mime": "^3.0.0",
+        "mitt": "^3.0.1",
+        "moment": "^2.29.4",
+        "mysql": "^2.18.1",
+        "nanoid": "^3.3.7",
+        "node-fetch": "^3.3.2",
        "object-merge-advanced": "^12.1.0",
        "object.omit": "^3.0.0",
-        "pg": "^8.5.1",
-        "postgraphile": "^4.13.0",
-        "postgraphile-plugin-connection-filter": "^2.2.2",
+        "pg": "^8.11.3",
+        "postgraphile": "^4.14.0",
+        "postgraphile-plugin-connection-filter": "^2.3.0",
        "promise-task-queue": "^1.2.0",
-        "prop-types": "^15.7.2",
-        "puppeteer": "^20.5.0",
+        "prop-types": "^15.8.1",
+        "puppeteer": "^21.5.2",
        "puppeteer-extra": "^3.3.6",
        "puppeteer-extra-plugin-stealth": "^2.11.2",
-        "redis": "^4.6.7",
-        "sharp": "^0.29.2",
-        "showdown": "^1.9.1",
-        "source-map-support": "^0.5.16",
+        "redis": "^4.6.11",
+        "sharp": "^0.33.0-rc.2",
+        "showdown": "^2.1.0",
+        "source-map-support": "^0.5.21",
        "template-format": "^1.2.5",
-        "tippy.js": "^6.3.1",
-        "tough-cookie": "^4.0.0",
+        "tippy.js": "^6.3.7",
+        "tough-cookie": "^4.1.3",
        "tunnel": "0.0.6",
-        "ua-parser-js": "^1.0.32",
-        "undici": "^4.13.0",
+        "ua-parser-js": "^1.0.37",
+        "undici": "^5.28.1",
        "unprint": "^0.10.11",
        "url-pattern": "^1.0.3",
-        "v-tooltip": "^2.0.3",
-        "video.js": "^7.11.4",
-        "videojs-vr": "^1.7.1",
-        "vue": "^3.2.20",
-        "vue-router": "^4.0.12",
-        "vuex": "^4.0.2",
-        "why-is-node-running": "^2.2.0",
-        "winston": "^3.2.1",
-        "winston-daily-rotate-file": "^4.4.2",
-        "yargs": "^17.2.1"
+        "v-tooltip": "^2.1.3",
+        "video.js": "^8.6.1",
+        "videojs-vr": "^2.0.0",
+        "vue": "^3.3.9",
+        "vue-router": "^4.2.5",
+        "vuex": "^4.1.0",
+        "why-is-node-running": "^2.2.2",
+        "winston": "^3.11.0",
+        "winston-daily-rotate-file": "^4.7.1",
+        "yargs": "^17.7.2"
    }
 }
--- a/public/banners/mindgeek/mindgeek_300_100.html
+++ b/public/banners/mindgeek/mindgeek_300_100.html
--- a/public/banners/mindgeek/mindgeek_300_250.html
+++ b/public/banners/mindgeek/mindgeek_300_250.html
--- a/public/banners/mindgeek/mindgeek_315_300.html
+++ b/public/banners/mindgeek/mindgeek_315_300.html
--- a/public/banners/mindgeek/mindgeek_728_90.html
+++ b/public/banners/mindgeek/mindgeek_728_90.html
--- a/public/banners/mindgeek/mindgeek_728_90_gay.html
+++ b/public/banners/mindgeek/mindgeek_728_90_gay.html
--- a/public/img/logos/aylo/aylo.png
+++ b/public/img/logos/aylo/aylo.png
--- a/public/img/logos/aylo/favicon.png
+++ b/public/img/logos/aylo/favicon.png
--- a/public/img/logos/aylo/favicon_dark.png
+++ b/public/img/logos/aylo/favicon_dark.png
--- a/public/img/logos/aylo/favicon_light.png
+++ b/public/img/logos/aylo/favicon_light.png
--- a/public/img/logos/aylo/lazy/aylo.png
+++ b/public/img/logos/aylo/lazy/aylo.png
--- a/public/img/logos/aylo/lazy/favicon.png
+++ b/public/img/logos/aylo/lazy/favicon.png
--- a/public/img/logos/aylo/lazy/favicon_dark.png
+++ b/public/img/logos/aylo/lazy/favicon_dark.png
--- a/public/img/logos/aylo/lazy/favicon_light.png
+++ b/public/img/logos/aylo/lazy/favicon_light.png
--- a/public/img/logos/aylo/lazy/network.png
+++ b/public/img/logos/aylo/lazy/network.png
--- a/public/img/logos/mindgeek/lazy/pornhub.png
+++ b/public/img/logos/mindgeek/lazy/pornhub.png
--- a/public/img/logos/mindgeek/lazy/propertysex.png
+++ b/public/img/logos/mindgeek/lazy/propertysex.png
--- a/public/img/logos/mindgeek/lazy/squirted.png
+++ b/public/img/logos/mindgeek/lazy/squirted.png
--- a/public/img/logos/mindgeek/lazy/transangels.png
+++ b/public/img/logos/mindgeek/lazy/transangels.png
--- a/public/img/logos/mindgeek/lazy/trueamateurs.png
+++ b/public/img/logos/mindgeek/lazy/trueamateurs.png
--- a/public/img/logos/mindgeek/lazy/tube8vip.png
+++ b/public/img/logos/mindgeek/lazy/tube8vip.png
--- a/public/img/logos/aylo/misc/aylo_dark.svg
+++ b/public/img/logos/aylo/misc/aylo_dark.svg
@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="98px" height="44px" viewBox="0 0 98 44" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 61.2 (89653) - https://sketch.com -->
+    <title>Logo/aylo</title>
+    <desc>Created with Sketch.</desc>
+    <defs>
+        <polygon id="path-1" points="0.113323369 0.4422 26.2793715 0.4422 26.2793715 35 0.113323369 35"></polygon>
+        <polygon id="path-3" points="0.9119 0.916 8.1979 0.916 8.1979 35.5677 0.9119 35.5677"></polygon>
+        <polygon id="path-5" points="0 0.469921652 8.68486313 0.469921652 8.68486313 11.5682743 0 11.5682743"></polygon>
+        <polygon id="path-7" points="0.1015 0.0685 27.702 0.0685 27.702 25.9425 0.1015 25.9425"></polygon>
+    </defs>
+    <g id="MTLCO" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="01.Home" transform="translate(-676.000000, -6865.000000)">
+            <g id="Footer" transform="translate(5.000000, 6810.000000)">
+                <g id="Logo/aylo" transform="translate(671.000000, 54.000000)">
+                    <g id="Logo">
+                        <g id="Group-3" transform="translate(27.000000, 10.084400)">
+                            <mask id="mask-2" fill="white">
+                                <use xlink:href="#path-1"></use>
+                            </mask>
+                            <g id="Clip-2"></g>
+                            <path d="M26.0193,4.9162 L16.5753,27.1112 C14.1453,33.1812 10.6903,35.0002 6.1583,35.0002 C4.8033,35.0002 3.3823,34.7662 2.1043,34.3322 C0.4063,33.7582 -0.3787,31.8082 0.4383,30.2152 C0.9543,29.2112 1.9763,28.6342 3.0543,28.6342 C3.3753,28.6342 3.7073,28.6852 4.0293,28.7942 C4.6313,28.9962 5.2603,29.1092 5.8733,29.1162 C5.9213,29.1162 5.9683,29.1162 6.0163,29.1122 C6.3263,29.0942 6.6403,29.0252 6.9403,28.8902 L6.9583,28.8782 C9.0033,27.8932 9.9243,25.5152 9.1273,23.4262 C9.0873,23.3162 9.0403,23.2072 8.9893,23.1012 L1.1763,4.9272 C0.2633,2.8052 1.8193,0.4422 4.1273,0.4422 L4.6173,0.4422 C5.9173,0.4422 7.0893,1.2272 7.5863,2.4292 L13.0463,15.6212 C13.3313,16.3112 14.3063,16.3152 14.5953,15.6242 L20.0923,2.4212 C20.5923,1.2242 21.7643,0.4422 23.0613,0.4422 C25.3663,0.4422 26.9213,2.7982 26.0193,4.9162" id="Fill-1" fill="#001437" mask="url(#mask-2)"></path>
+                        </g>
+                        <g id="Group-6" transform="translate(57.000000, 0.084400)">
+                            <mask id="mask-4" fill="white">
+                                <use xlink:href="#path-3"></use>
+                            </mask>
+                            <g id="Clip-5"></g>
+                            <path d="M4.5549,0.9157 L4.5549,0.9157 C6.5669,0.9157 8.1979,2.5467 8.1979,4.5587 L8.1979,31.9257 C8.1979,33.9367 6.5669,35.5677 4.5549,35.5677 C2.5429,35.5677 0.9119,33.9367 0.9119,31.9257 L0.9119,4.5587 C0.9119,2.5467 2.5429,0.9157 4.5549,0.9157" id="Fill-4" fill="#001437" mask="url(#mask-4)"></path>
+                        </g>
+                        <path d="M17.9841,12.5213 L24.7671,30.7323 C25.4721,32.6163 24.5161,34.7153 22.6321,35.4203 C20.7481,36.1253 18.6491,35.1693 17.9431,33.2853 L11.1611,15.0733 C10.4561,13.1893 11.4121,11.0903 13.2961,10.3853 C15.1801,9.6803 17.2791,10.6363 17.9841,12.5213 Z" id="Fill-7" fill="#001437"></path>
+                        <g id="Group-11" transform="translate(0.000000, 24.084400)">
+                            <mask id="mask-6" fill="white">
+                                <use xlink:href="#path-5"></use>
+                            </mask>
+                            <g id="Clip-10"></g>
+                            <path d="M8.4529,5.3903 L7.0559,9.2013 C6.3509,11.0853 4.2519,12.0413 2.3679,11.3363 C0.4829,10.6313 -0.4731,8.5323 0.2319,6.6473 L1.6289,2.8373 C2.3339,0.9533 4.4329,-0.0037 6.3169,0.7023 C8.2019,1.4073 9.1579,3.5063 8.4529,5.3903" id="Fill-9" fill="#71DBD4" mask="url(#mask-6)"></path>
+                        </g>
+                        <g id="Group-14" transform="translate(70.000000, 10.084400)">
+                            <mask id="mask-8" fill="white">
+                                <use xlink:href="#path-7"></use>
+                            </mask>
+                            <g id="Clip-13"></g>
+                            <path d="M20.3235,13.0055 C20.3235,8.6625 17.5685,6.0475 13.9255,6.0475 C10.2825,6.0475 7.4805,8.6625 7.4805,13.0055 C7.4805,17.3485 10.2825,19.9635 13.9255,19.9635 C17.5685,19.9635 20.3235,17.3485 20.3235,13.0055 M0.1015,13.0055 C0.1015,5.4405 5.9395,0.0685 13.9255,0.0685 C21.9115,0.0685 27.7025,5.4405 27.7025,13.0055 C27.7025,20.5705 21.9115,25.9425 13.9255,25.9425 C5.9395,25.9425 0.1015,20.5705 0.1015,13.0055" id="Fill-12" fill="#001437" mask="url(#mask-8)"></path>
+                        </g>
+                    </g>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
--- a/public/img/logos/aylo/misc/aylo_light.svg
+++ b/public/img/logos/aylo/misc/aylo_light.svg
@ -0,0 +1,136 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="98px"
+   height="44px"
+   viewBox="0 0 98 44"
+   version="1.1"
+   id="svg12"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
+  <title
+     id="title1">Logo/Aylo</title>
+  <desc
+     id="desc1">Created with Sketch.</desc>
+  <defs
+     id="defs4">
+    <polygon
+       points="0.113323369 0.4422 26.2793715 0.4422 26.2793715 35 0.113323369 35"
+       id="polygon1" />
+    <polygon
+       points="0.9119 0.916 8.1979 0.916 8.1979 35.5677 0.9119 35.5677"
+       id="polygon2" />
+    <polygon
+       points="0 0.469921652 8.68486313 0.469921652 8.68486313 11.5682743 0 11.5682743"
+       id="polygon3" />
+    <polygon
+       points="0.1015 0.0685 27.702 0.0685 27.702 25.9425 0.1015 25.9425"
+       id="polygon4" />
+  </defs>
+  <g
+     transform="translate(-676.000000, -6865.000000)"
+     id="g12">
+    <g
+       transform="translate(5.000000, 6810.000000)"
+       id="g11">
+      <g
+         transform="translate(671.000000, 54.000000)"
+         id="g10">
+        <g
+           id="g9">
+          <g
+             transform="translate(27.000000, 10.084400)"
+             id="g4"
+             style="fill:#ffffff;fill-opacity:1">
+            <mask
+               fill="white"
+               id="mask4">
+              <use
+                 xlink:href="#path-1"
+                 id="use4" />
+            </mask>
+            <path
+               class="change-color"
+               d="M26.0193,4.9162 L16.5753,27.1112 C14.1453,33.1812 10.6903,35.0002 6.1583,35.0002 C4.8033,35.0002 3.3823,34.7662 2.1043,34.3322 C0.4063,33.7582 -0.3787,31.8082 0.4383,30.2152 C0.9543,29.2112 1.9763,28.6342 3.0543,28.6342 C3.3753,28.6342 3.7073,28.6852 4.0293,28.7942 C4.6313,28.9962 5.2603,29.1092 5.8733,29.1162 C5.9213,29.1162 5.9683,29.1162 6.0163,29.1122 C6.3263,29.0942 6.6403,29.0252 6.9403,28.8902 L6.9583,28.8782 C9.0033,27.8932 9.9243,25.5152 9.1273,23.4262 C9.0873,23.3162 9.0403,23.2072 8.9893,23.1012 L1.1763,4.9272 C0.2633,2.8052 1.8193,0.4422 4.1273,0.4422 L4.6173,0.4422 C5.9173,0.4422 7.0893,1.2272 7.5863,2.4292 L13.0463,15.6212 C13.3313,16.3112 14.3063,16.3152 14.5953,15.6242 L20.0923,2.4212 C20.5923,1.2242 21.7643,0.4422 23.0613,0.4422 C25.3663,0.4422 26.9213,2.7982 26.0193,4.9162"
+               fill="#001437"
+               mask="url(#mask-2)"
+               id="path4"
+               style="fill:#ffffff;fill-opacity:1" />
+          </g>
+          <g
+             transform="translate(57.000000, 0.084400)"
+             id="g5"
+             style="fill:#ffffff;fill-opacity:1">
+            <mask
+               fill="white"
+               id="mask5">
+              <use
+                 xlink:href="#path-3"
+                 id="use5" />
+            </mask>
+            <path
+               class="change-color"
+               d="M4.5549,0.9157 L4.5549,0.9157 C6.5669,0.9157 8.1979,2.5467 8.1979,4.5587 L8.1979,31.9257 C8.1979,33.9367 6.5669,35.5677 4.5549,35.5677 C2.5429,35.5677 0.9119,33.9367 0.9119,31.9257 L0.9119,4.5587 C0.9119,2.5467 2.5429,0.9157 4.5549,0.9157"
+               fill="#001437"
+               mask="url(#mask-4)"
+               id="path5"
+               style="fill:#ffffff;fill-opacity:1" />
+          </g>
+          <path
+             class="change-color"
+             d="M17.9841,12.5213 L24.7671,30.7323 C25.4721,32.6163 24.5161,34.7153 22.6321,35.4203 C20.7481,36.1253 18.6491,35.1693 17.9431,33.2853 L11.1611,15.0733 C10.4561,13.1893 11.4121,11.0903 13.2961,10.3853 C15.1801,9.6803 17.2791,10.6363 17.9841,12.5213 Z"
+             fill="#001437"
+             id="path6"
+             style="fill:#ffffff;fill-opacity:1" />
+          <g
+             transform="translate(0.000000, 24.084400)"
+             id="g7">
+            <mask
+               fill="white"
+               id="mask6">
+              <use
+                 xlink:href="#path-5"
+                 id="use6" />
+            </mask>
+            <path
+               d="M8.4529,5.3903 L7.0559,9.2013 C6.3509,11.0853 4.2519,12.0413 2.3679,11.3363 C0.4829,10.6313 -0.4731,8.5323 0.2319,6.6473 L1.6289,2.8373 C2.3339,0.9533 4.4329,-0.0037 6.3169,0.7023 C8.2019,1.4073 9.1579,3.5063 8.4529,5.3903"
+               fill="#71DBD4"
+               mask="url(#mask-6)"
+               id="path7" />
+          </g>
+          <g
+             transform="translate(70.000000, 10.084400)"
+             id="g8"
+             style="fill:#ffffff;fill-opacity:1">
+            <mask
+               fill="white"
+               id="mask7">
+              <use
+                 xlink:href="#path-7"
+                 id="use7" />
+            </mask>
+            <path
+               class="change-color"
+               d="M20.3235,13.0055 C20.3235,8.6625 17.5685,6.0475 13.9255,6.0475 C10.2825,6.0475 7.4805,8.6625 7.4805,13.0055 C7.4805,17.3485 10.2825,19.9635 13.9255,19.9635 C17.5685,19.9635 20.3235,17.3485 20.3235,13.0055 M0.1015,13.0055 C0.1015,5.4405 5.9395,0.0685 13.9255,0.0685 C21.9115,0.0685 27.7025,5.4405 27.7025,13.0055 C27.7025,20.5705 21.9115,25.9425 13.9255,25.9425 C5.9395,25.9425 0.1015,20.5705 0.1015,13.0055"
+               fill="#001437"
+               mask="url(#mask-8)"
+               id="path8"
+               style="fill:#ffffff;fill-opacity:1" />
+          </g>
+        </g>
+      </g>
+    </g>
+  </g>
+  <metadata
+     id="metadata12">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:title>Logo/Aylo</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+</svg>
--- a/public/img/logos/aylo/misc/favicon.png
+++ b/public/img/logos/aylo/misc/favicon.png
--- a/public/img/logos/mindgeek/misc/favicon.xcf
+++ b/public/img/logos/mindgeek/misc/favicon.xcf
--- a/public/img/logos/mindgeek/misc/favicon_white.xcf
+++ b/public/img/logos/mindgeek/misc/favicon_white.xcf
--- a/public/img/logos/aylo/misc/mind-geek_light.png
+++ b/public/img/logos/aylo/misc/mind-geek_light.png
--- a/public/img/logos/mindgeek/misc/mind-geek_original.png
+++ b/public/img/logos/mindgeek/misc/mind-geek_original.png
--- a/public/img/logos/mindgeek/misc/porn-hub-gay.png
+++ b/public/img/logos/mindgeek/misc/porn-hub-gay.png
--- a/public/img/logos/mindgeek/misc/property-sex.png
+++ b/public/img/logos/mindgeek/misc/property-sex.png
--- a/public/img/logos/mindgeek/misc/trans-angels_light.png
+++ b/public/img/logos/mindgeek/misc/trans-angels_light.png
--- a/public/img/logos/mindgeek/misc/trans-angels_original.png
+++ b/public/img/logos/mindgeek/misc/trans-angels_original.png
--- a/public/img/logos/mindgeek/misc/tube-8-vip_original.png
+++ b/public/img/logos/mindgeek/misc/tube-8-vip_original.png
--- a/public/img/logos/aylo/network.png
+++ b/public/img/logos/aylo/network.png
--- a/public/img/logos/mindgeek/pornhub.png
+++ b/public/img/logos/mindgeek/pornhub.png
--- a/public/img/logos/mindgeek/propertysex.png
+++ b/public/img/logos/mindgeek/propertysex.png
--- a/public/img/logos/mindgeek/squirted.png
+++ b/public/img/logos/mindgeek/squirted.png
--- a/public/img/logos/aylo/thumbs/aylo.png
+++ b/public/img/logos/aylo/thumbs/aylo.png
--- a/public/img/logos/aylo/thumbs/favicon.png
+++ b/public/img/logos/aylo/thumbs/favicon.png
--- a/public/img/logos/aylo/thumbs/favicon_dark.png
+++ b/public/img/logos/aylo/thumbs/favicon_dark.png
--- a/public/img/logos/aylo/thumbs/favicon_light.png
+++ b/public/img/logos/aylo/thumbs/favicon_light.png
--- a/public/img/logos/aylo/thumbs/network.png
+++ b/public/img/logos/aylo/thumbs/network.png
--- a/public/img/logos/mindgeek/thumbs/pornhub.png
+++ b/public/img/logos/mindgeek/thumbs/pornhub.png
--- a/public/img/logos/mindgeek/thumbs/propertysex.png
+++ b/public/img/logos/mindgeek/thumbs/propertysex.png
--- a/public/img/logos/mindgeek/thumbs/squirted.png
+++ b/public/img/logos/mindgeek/thumbs/squirted.png
--- a/public/img/logos/mindgeek/thumbs/transangels.png
+++ b/public/img/logos/mindgeek/thumbs/transangels.png
--- a/public/img/logos/mindgeek/thumbs/trueamateurs.png
+++ b/public/img/logos/mindgeek/thumbs/trueamateurs.png
--- a/public/img/logos/mindgeek/thumbs/tube8vip.png
+++ b/public/img/logos/mindgeek/thumbs/tube8vip.png
--- a/public/img/logos/mindgeek/transangels.png
+++ b/public/img/logos/mindgeek/transangels.png
--- a/public/img/logos/mindgeek/trueamateurs.png
+++ b/public/img/logos/mindgeek/trueamateurs.png
--- a/public/img/logos/mindgeek/tube8vip.png
+++ b/public/img/logos/mindgeek/tube8vip.png
--- a/public/img/logos/dfxtra/dfextra.png
+++ b/public/img/logos/dfxtra/dfextra.png
--- a/public/img/logos/dfxtra/dfxtraoriginals.png
+++ b/public/img/logos/dfxtra/dfxtraoriginals.png
--- a/public/img/logos/dfxtra/lazy/dfextra.png
+++ b/public/img/logos/dfxtra/lazy/dfextra.png
--- a/public/img/logos/dfxtra/lazy/dfxtra.png
+++ b/public/img/logos/dfxtra/lazy/dfxtra.png
--- a/public/img/logos/dfxtra/lazy/dfxtraoriginals.png
+++ b/public/img/logos/dfxtra/lazy/dfxtraoriginals.png
--- a/public/img/logos/dfxtra/lazy/favicon.png
+++ b/public/img/logos/dfxtra/lazy/favicon.png
--- a/public/img/logos/dfxtra/lazy/favicon_dark.png
+++ b/public/img/logos/dfxtra/lazy/favicon_dark.png
--- a/public/img/logos/dfxtra/lazy/favicon_light.png
+++ b/public/img/logos/dfxtra/lazy/favicon_light.png
--- a/public/img/logos/dfxtra/lazy/network.png
+++ b/public/img/logos/dfxtra/lazy/network.png
--- a/public/img/logos/dfxtra/thumbs/dfextra.png
+++ b/public/img/logos/dfxtra/thumbs/dfextra.png
--- a/public/img/logos/dfxtra/thumbs/dfxtra.png
+++ b/public/img/logos/dfxtra/thumbs/dfxtra.png
--- a/public/img/logos/dfxtra/thumbs/dfxtraoriginals.png
+++ b/public/img/logos/dfxtra/thumbs/dfxtraoriginals.png
--- a/public/img/logos/dfxtra/thumbs/favicon.png
+++ b/public/img/logos/dfxtra/thumbs/favicon.png
--- a/public/img/logos/dfxtra/thumbs/favicon_dark.png
+++ b/public/img/logos/dfxtra/thumbs/favicon_dark.png
--- a/public/img/logos/dfxtra/thumbs/favicon_light.png
+++ b/public/img/logos/dfxtra/thumbs/favicon_light.png
--- a/public/img/logos/dfxtra/thumbs/network.png
+++ b/public/img/logos/dfxtra/thumbs/network.png
--- a/public/img/logos/innofsin/adreenawinters.png
+++ b/public/img/logos/innofsin/adreenawinters.png
--- a/public/img/logos/innofsin/bbctitans.png
+++ b/public/img/logos/innofsin/bbctitans.png
--- a/public/img/logos/innofsin/dannyoceansadventures.png
+++ b/public/img/logos/innofsin/dannyoceansadventures.png
--- a/public/img/logos/innofsin/favicon.png
+++ b/public/img/logos/innofsin/favicon.png
--- a/public/img/logos/innofsin/favicon_dark.png
+++ b/public/img/logos/innofsin/favicon_dark.png
--- a/public/img/logos/innofsin/favicon_light.png
+++ b/public/img/logos/innofsin/favicon_light.png
--- a/public/img/logos/innofsin/innofsin.png
+++ b/public/img/logos/innofsin/innofsin.png
--- a/public/img/logos/innofsin/lazy/adreenawinters.png
+++ b/public/img/logos/innofsin/lazy/adreenawinters.png
--- a/public/img/logos/innofsin/lazy/bbctitans.png
+++ b/public/img/logos/innofsin/lazy/bbctitans.png
--- a/public/img/logos/innofsin/lazy/dannyoceansadventures.png
+++ b/public/img/logos/innofsin/lazy/dannyoceansadventures.png
--- a/public/img/logos/innofsin/lazy/innofsin.png
+++ b/public/img/logos/innofsin/lazy/innofsin.png
--- a/public/img/logos/innofsin/lazy/mydeepdarksecret.png
+++ b/public/img/logos/innofsin/lazy/mydeepdarksecret.png
--- a/public/img/logos/innofsin/lazy/network.png
+++ b/public/img/logos/innofsin/lazy/network.png
--- a/public/img/logos/innofsin/lazy/puertorock.png
+++ b/public/img/logos/innofsin/lazy/puertorock.png
--- a/public/img/logos/innofsin/lazy/rebelrhyder.png
+++ b/public/img/logos/innofsin/lazy/rebelrhyder.png
--- a/public/img/logos/innofsin/lazy/richardmannevents.png
+++ b/public/img/logos/innofsin/lazy/richardmannevents.png
--- a/public/img/logos/innofsin/lazy/richardmannsworld.png
+++ b/public/img/logos/innofsin/lazy/richardmannsworld.png
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
DebaucheryLibrarian	ded7c64907	Merge branch 'master' into whalemember	2024-02-09 21:31:16 +00:00
DebaucheryLibrarian	b96d996947	1.236.1	2024-02-09 22:30:41 +01:00
DebaucheryLibrarian	fc0661804f	Added filtered titles and secondary tags to manticore database.	2024-02-09 22:30:38 +01:00
DebaucheryLibrarian	31e884359e	1.236.0	2024-01-25 01:59:00 +01:00
DebaucheryLibrarian	d9d585d51a	Added Manticore migration and meta text field.	2024-01-25 01:58:55 +01:00
DebaucheryLibrarian	86ffcc3316	Updating Manticore scenes database on scene store.	2024-01-25 01:15:42 +01:00
DebaucheryLibrarian	ae2d3591ee	1.235.5	2024-01-03 23:03:32 +01:00
DebaucheryLibrarian	a6fb572a21	Added Freaky Fembots to Team Skeet.	2024-01-03 23:03:30 +01:00
DebaucheryLibrarian	7e80cc628c	1.235.4	2023-12-16 01:59:39 +01:00
DebaucheryLibrarian	e09795534c	Added photo_count column to movies and series table.	2023-12-16 01:59:37 +01:00
DebaucheryLibrarian	3379e9e517	Added more Shay Evans maintenance background.	2023-12-09 03:00:39 +01:00
DebaucheryLibrarian	a2006c2370	1.235.3	2023-12-09 02:55:34 +01:00
DebaucheryLibrarian	47f7c01c73	Added Shay Evans maintenance background.	2023-12-09 02:55:32 +01:00
DebaucheryLibrarian	5c6f172b6b	Fixed maintenance page background location.	2023-12-09 01:27:34 +01:00
DebaucheryLibrarian	c0f4e888d7	1.235.2	2023-12-07 02:19:05 +01:00
DebaucheryLibrarian	d082f4f90d	Moved maintenance page to assets.	2023-12-07 02:19:02 +01:00
DebaucheryLibrarian	007b541028	1.235.1	2023-12-07 01:27:46 +01:00
DebaucheryLibrarian	b872d7a0ec	Moved maintenance page to public directory to be served by webserver.	2023-12-07 01:27:44 +01:00
DebaucheryLibrarian	214409a591	1.235.0	2023-12-06 01:51:36 +01:00
DebaucheryLibrarian	2a3f21976a	Added maintenance mode.	2023-12-06 01:51:34 +01:00
DebaucheryLibrarian	a3c064be55	Added Inn of Sinn, added Lil Sis to Nubiles.	2023-12-06 00:15:55 +01:00
DebaucheryLibrarian	655cbf50f3	1.234.2	2023-12-01 02:19:55 +01:00
DebaucheryLibrarian	1e707ccefa	Added database pool settings.	2023-12-01 02:19:53 +01:00
DebaucheryLibrarian	1d38ba1141	1.234.1	2023-12-01 02:09:26 +01:00
DebaucheryLibrarian	9ea317939b	Fixed session reuse in Aylo scraper.	2023-12-01 02:09:24 +01:00
DebaucheryLibrarian	353fe6d6f8	1.234.0	2023-11-30 03:12:50 +01:00
DebaucheryLibrarian	98bf7ea9dd	Updated all dependencies. Updated MindGeek to Aylo.	2023-11-30 03:12:47 +01:00
 @ -1 +1 @@
 .18.0
 .2.0