Compare commits

...

2 Commits

Author SHA1 Message Date
ThePendulum 5ff916475a 1.74.3 2020-02-01 03:30:14 +01:00
ThePendulum 09ea3125df Fixed release merge order. 2020-02-01 03:30:11 +01:00
4 changed files with 4 additions and 3 deletions

2
package-lock.json generated
View File

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

View File

@ -1,6 +1,6 @@
{ {
"name": "traxxx", "name": "traxxx",
"version": "1.74.2", "version": "1.74.3",
"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

@ -1,5 +1,6 @@
'use strict'; 'use strict';
// const config = require('config');
const Promise = require('bluebird'); const Promise = require('bluebird');
const UrlPattern = require('url-pattern'); const UrlPattern = require('url-pattern');
const moment = require('moment'); const moment = require('moment');

View File

@ -66,8 +66,8 @@ async function scrapeRelease(source, basicRelease = null, type = 'scene') {
return { return {
url, url,
...scrapedRelease,
...release, ...release,
...scrapedRelease,
...(scrapedRelease && release?.tags && { ...(scrapedRelease && release?.tags && {
tags: release.tags.concat(scrapedRelease.tags), tags: release.tags.concat(scrapedRelease.tags),
}), }),