Compare commits

..

No commits in common. "6b88cf1040d10b214e1e9bab26c2dded7949b69e" and "0427e1e276b924fc084fa509f1db4caa2190e31a" have entirely different histories.

3 changed files with 3 additions and 5 deletions

2
package-lock.json generated
View File

@ -1,6 +1,6 @@
{
"name": "traxxx",
"version": "1.197.2",
"version": "1.197.1",
"lockfileVersion": 1,
"requires": true,
"dependencies": {

View File

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

View File

@ -1,7 +1,7 @@
'use strict';
const Promise = require('bluebird');
const { mergeAdvanced: merge } = require('object-merge-advanced');
const merge = require('object-merge-advanced');
const argv = require('./argv');
const include = require('./utils/argv-include')(argv);
@ -130,8 +130,6 @@ async function scrapeRelease(baseRelease, entitiesBySlug, type = 'scene') {
}),
}), {});
console.log(merge);
const mergedRelease = {
...merge(baseRelease, curatedScrapedRelease, {
dedupeStringsInArrayValues: true,