From 893a3be39378cf5d8f17240d32a32b4ecb3fc8b3 Mon Sep 17 00:00:00 2001 From: DebaucheryLibrarian Date: Thu, 22 Aug 2024 02:00:54 +0200 Subject: [PATCH] Updated Gaywire configuration, moved from Bang Bros to Aylo. --- .../20240822005656_entity_tags_cascade.js | 31 +++ seeds/01_networks.js | 2 +- seeds/02_sites.js | 246 +++++++++++------- src/scrapers/scrapers.js | 4 +- 4 files changed, 183 insertions(+), 100 deletions(-) create mode 100644 migrations/20240822005656_entity_tags_cascade.js diff --git a/migrations/20240822005656_entity_tags_cascade.js b/migrations/20240822005656_entity_tags_cascade.js new file mode 100644 index 00000000..071c1563 --- /dev/null +++ b/migrations/20240822005656_entity_tags_cascade.js @@ -0,0 +1,31 @@ +exports.up = async (knex) => { + await knex.schema.alterTable('entities_tags', (table) => { + table.dropForeign('tag_id'); + table.dropForeign('entity_id'); + + table.foreign('tag_id') + .references('id') + .inTable('tags') + .onDelete('cascade'); + + table.foreign('entity_id') + .references('id') + .inTable('entities') + .onDelete('cascade'); + }); +}; + +exports.down = async (knex) => { + await knex.schema.alterTable('entities_tags', (table) => { + table.dropForeign('tag_id'); + table.dropForeign('entity_id'); + + table.foreign('tag_id') + .references('id') + .inTable('tags'); + + table.foreign('entity_id') + .references('id') + .inTable('entities'); + }); +}; diff --git a/seeds/01_networks.js b/seeds/01_networks.js index 9af86d06..846eabbe 100755 --- a/seeds/01_networks.js +++ b/seeds/01_networks.js @@ -361,7 +361,7 @@ const networks = [ { slug: 'gaywire', name: 'Gaywire', - url: 'https://www.gaywire.com', + url: 'https://gaywire.com', tags: ['gay'], }, { diff --git a/seeds/02_sites.js b/seeds/02_sites.js index 6d29c50d..95c3f160 100755 --- a/seeds/02_sites.js +++ b/seeds/02_sites.js @@ -4173,127 +4173,179 @@ const sites = [ }, // GAYWIRE { - slug: 'outinpublic', - name: 'Out In Public', - url: 'http://www.outinpublic.com', - tags: ['gay'], + name: 'Bait Bus', + slug: 'baitbus', + url: 'https://gaywire.com/websites/baitbus', + tags: [ + 'gay', + ], parent: 'gaywire', parameters: { - latest: 'https://gaywire.com/h1/websites/barebackcasting', + siteId: 115111, + code: 'tbb', }, }, { - slug: 'rubhim', - name: 'Rub Him', - url: 'http://www.rubhim.com', - tags: ['gay'], - parent: 'gaywire', - hasLogo: false, - parameters: { - latest: 'https://gaywire.com/h1/websites/rubhim', - }, - }, - { - slug: 'ungloryhole', - name: 'UngloryHole', - url: 'http://www.ungloryhole.com', - tags: ['gay'], - parent: 'gaywire', - parameters: { - latest: 'https://gaywire.com/h1/websites/ungloryhole', - }, - }, - { - slug: 'barebackcasting', - name: 'Bareback Casting', - url: 'https://gaywire.com/h1/websites/barebackcasting', - tags: ['gay'], - parent: 'gaywire', - hasLogo: false, - }, - { - slug: 'itsgonnahurt', - name: 'It\'s Gonna Hurt', - url: 'http://www.itsgonnahurt.com', - tags: ['gay'], - parent: 'gaywire', - parameters: { - latest: 'https://gaywire.com/h1/websites/itsgonnahurt', - }, - }, - { - slug: 'barebackattack', - name: 'Bareback Attack', - url: 'https://gaywire.com/h1/websites/barebackattack', - tags: ['gay'], - parent: 'gaywire', - hasLogo: false, - }, - { - slug: 'hazehim', - name: 'Haze Him', - url: 'http://www.hazehim.com', - tags: ['gay'], - parent: 'gaywire', - parameters: { - latest: 'https://gaywire.com/h1/websites/hazehim', - }, - }, - { - slug: 'thughunter', - name: 'Thug Hunter', - url: 'http://www.thughunter.com', - tags: ['gay'], - parent: 'gaywire', - parameters: { - latest: 'https://gaywire.com/h1/websites/thughunter', - }, - }, - { - slug: 'poundhisass', name: 'Pound His Ass', - url: 'https://gaywire.com/h1/websites/poundhisass', - tags: ['gay'], - parent: 'gaywire', - hasLogo: false, - }, - { - slug: 'exbf', - name: 'ExBF', - url: 'http://www.exbf.com', - tags: ['gay'], + slug: 'poundhisass', + url: 'https://gaywire.com/websites/poundhisass', + tags: [ + 'gay', + ], parent: 'gaywire', parameters: { - latest: 'https://gaywire.com/h1/websites/exbf', + siteId: 115451, + code: 'pha', + }, + }, + { + name: 'Out In Public', + slug: 'outinpublic', + url: 'https://gaywire.com/websites/outinpublic', + tags: [ + 'gay', + ], + parent: 'gaywire', + parameters: { + siteId: 115381, + code: 'op', + }, + }, + { + name: 'Thug Hunter', + slug: 'thughunter', + url: 'https://gaywire.com/websites/thughunter', + tags: [ + 'gay', + ], + parent: 'gaywire', + parameters: { + siteId: 116021, + code: 'th', + }, + }, + { + name: 'Rub Him', + slug: 'rubhim', + url: 'https://gaywire.com/websites/rubhim', + tags: [ + 'gay', + ], + parent: 'gaywire', + parameters: { + siteId: 115521, + code: 'mh', }, }, { - slug: 'sausageparty', name: 'Sausage Party', - url: 'http://www.sausageparty.com', - tags: ['gay'], + slug: 'sausageparty', + url: 'https://gaywire.com/websites/sausageparty', + tags: [ + 'gay', + ], parent: 'gaywire', parameters: { - latest: 'https://gaywire.com/h1/websites/sausageparty', + siteId: 115931, + code: 'sp', }, }, { - slug: 'projectcitybus', - name: 'Project City Bus', - url: 'http://www.projectcitybus.com', - tags: ['gay'], + name: 'Its Gonna Hurt', + slug: 'itsgonnahurt', + url: 'https://gaywire.com/websites/itsgonnahurt', + tags: [ + 'gay', + ], parent: 'gaywire', parameters: { - latest: 'https://gaywire.com/h1/websites/projectcitybus', + siteId: 116161, + code: 'igh', + }, + }, + { + name: 'Bareback Attack', + slug: 'barebackattack', + url: 'https://gaywire.com/websites/barebackattack', + tags: [ + 'gay', + ], + parent: 'gaywire', + parameters: { + siteId: 115191, + code: 'bba', + }, + }, + { + name: 'Bareback Casting', + slug: 'barebackcasting', + url: 'https://gaywire.com/websites/barebackcasting', + tags: [ + 'gay', + ], + parent: 'gaywire', + parameters: { + siteId: 115201, + code: 'bc', + }, + }, + { + name: 'Haze Him', + slug: 'hazehim', + url: 'https://gaywire.com/websites/hazehim', + tags: [ + 'gay', + ], + parent: 'gaywire', + parameters: { + siteId: 116141, + code: 'hm', + }, + }, + { + name: 'UngloryHole', + slug: 'ungloryhole', + url: 'https://gaywire.com/websites/ungloryhole', + tags: [ + 'gay', + ], + parent: 'gaywire', + parameters: { + siteId: 115591, + code: 'gh', }, }, { - slug: 'urbaninvasion', name: 'Urban Invasion', - url: 'https://gaywire.com/h1/websites/urbaninvasion', - tags: ['gay'], + slug: 'urbaninvasion', + url: 'https://gaywire.com/websites/urbaninvasion', + tags: [ + 'gay', + ], + parent: 'gaywire', + parameters: { + siteId: 115601, + code: 'zc', + }, + }, + { + name: 'ExBF', + slug: 'exbf', + url: 'https://gaywire.com/websites/exbf', + tags: [ + 'gay', + ], + parent: 'gaywire', + parameters: { + siteId: 115881, + code: 'sb', + }, + }, + { + name: 'Project Citybus', + slug: 'projectcitybus', + delete: true, parent: 'gaywire', - hasLogo: false, }, // GIRLSWAY { diff --git a/src/scrapers/scrapers.js b/src/scrapers/scrapers.js index c1e24921..daff2868 100755 --- a/src/scrapers/scrapers.js +++ b/src/scrapers/scrapers.js @@ -111,7 +111,7 @@ const scrapers = { forbondage: porndoe, fullpornnetwork, gamma, - gaywire: bangbros, + gaywire: aylo, girlgirl: julesjordan, hitzefrei, hookuphotshot, @@ -231,7 +231,7 @@ const scrapers = { forbondage: porndoe, freeones, gangbangcreampie: gamma, - gaywire: bangbros, + gaywire: aylo, girlfaction: fullpornnetwork, gloryholesecrets: gamma, gotfilled: radical,