Compare commits

..

No commits in common. "e8d081cc6729880050c3152a4f629116959e1d3a" and "c29ecac41c422d74083cd7ba2fb3faf60d390c9a" have entirely different histories.

4 changed files with 5 additions and 5 deletions

4
package-lock.json generated
View File

@ -1,12 +1,12 @@
{ {
"name": "traxxx", "name": "traxxx",
"version": "1.229.1", "version": "1.229.0",
"lockfileVersion": 2, "lockfileVersion": 2,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "traxxx", "name": "traxxx",
"version": "1.229.1", "version": "1.229.0",
"license": "ISC", "license": "ISC",
"dependencies": { "dependencies": {
"@casl/ability": "^5.2.2", "@casl/ability": "^5.2.2",

View File

@ -1,6 +1,6 @@
{ {
"name": "traxxx", "name": "traxxx",
"version": "1.229.1", "version": "1.229.0",
"description": "All the latest porn releases in one place", "description": "All the latest porn releases in one place",
"main": "src/app.js", "main": "src/app.js",
"scripts": { "scripts": {

View File

@ -47,8 +47,6 @@ const hairColors = {
bruin: 'brown', bruin: 'brown',
brunette: 'brown', brunette: 'brown',
fair: 'blonde', fair: 'blonde',
grey: 'gray',
gray: 'gray',
raven: 'black', raven: 'black',
red: 'red', red: 'red',
redhead: 'red', redhead: 'red',

View File

@ -238,6 +238,8 @@ async function fetchEntitiesBySlug(entitySlugs, prefer = 'channel') {
sort: knex.raw(prefer === 'channel' ? 'asc' : 'desc'), sort: knex.raw(prefer === 'channel' ? 'asc' : 'desc'),
}); });
console.log(entities.rows);
// channel entity will overwrite network entity // channel entity will overwrite network entity
const entitiesBySlug = entities.rows.reduce((accEntities, { entity }) => { const entitiesBySlug = entities.rows.reduce((accEntities, { entity }) => {
const host = urlToHostname(entity.url); const host = urlToHostname(entity.url);