diff --git a/public/img/locations/alex_jett_house/GNEJikEakAAECG0.jpeg b/public/img/locations/alex_jett_house/GNEJikEakAAECG0.jpeg new file mode 100755 index 00000000..1b7b68d3 Binary files /dev/null and b/public/img/locations/alex_jett_house/GNEJikEakAAECG0.jpeg differ diff --git a/public/img/locations/alex_jett_house/GNEJjIEagAAfsnm.jpeg b/public/img/locations/alex_jett_house/GNEJjIEagAAfsnm.jpeg new file mode 100755 index 00000000..f81ba20a Binary files /dev/null and b/public/img/locations/alex_jett_house/GNEJjIEagAAfsnm.jpeg differ diff --git a/seeds/02_sites.js b/seeds/02_sites.js index 6cd8f81d..4ac2be4f 100755 --- a/seeds/02_sites.js +++ b/seeds/02_sites.js @@ -908,7 +908,7 @@ const sites = [ }, // BANG { - name: 'Trickery', + name: 'Bang! Trickery', slug: 'bangtrickery', url: 'https://www.bang.com/videos?in=BANG%21+Trickery', parameters: { siteId: 4800 }, @@ -930,20 +930,20 @@ const sites = [ parent: 'bang', }, { - name: 'Surprise', + name: 'Bang! Surprise', slug: 'bangsurprise', url: 'https://www.bang.com/videos?in=BANG%21+Surprise', parameters: { siteId: 5000 }, parent: 'bang', }, { - name: 'Adventures', + name: 'Bang! Adventures', slug: 'bangadventures', url: 'https://www.bang.com/videos?in=BANG%21+adventures', parent: 'bang', }, { - name: 'Real Teens', + name: 'Bang! Real Teens', slug: 'bangrealteens', alias: ['brealteens'], url: 'https://www.bang.com/videos?in=BANG%21+Real+Teens', @@ -965,21 +965,21 @@ const sites = [ parent: 'bang', }, { - name: 'Japan', + name: 'Bang! Japan', slug: 'bangjapan', url: 'https://www.bang.com/videos?in=BANG%21+Japan', parameters: { siteId: 3079, ignore: true }, parent: 'bang', }, { - name: 'Rammed', + name: 'Bang! Rammed', slug: 'bangrammed', url: 'https://www.bang.com/videos?in=BANG%21+Rammed', parameters: { siteId: 4836 }, parent: 'bang', }, { - name: 'Glamkore', + name: 'Bang! Glamkore', slug: 'bangglamkore', alias: ['bglamkore'], url: 'https://www.bang.com/videos?in=BANG%21+Glamkore', @@ -994,7 +994,7 @@ const sites = [ parent: 'bang', }, { - name: 'Real MILFs', + name: 'Bang! Real MILFs', slug: 'bangrealmilfs', alias: ['brealmilfs'], url: 'https://www.bang.com/videos?in=BANG%21+Real+Milfs', @@ -1002,7 +1002,7 @@ const sites = [ parent: 'bang', }, { - name: 'Confessions', + name: 'Bang! Confessions', slug: 'bangconfessions', alias: ['bconfessions'], url: 'https://www.bang.com/videos?in=BANG%21+Confessions', @@ -1010,7 +1010,7 @@ const sites = [ parent: 'bang', }, { - name: 'Casting', + name: 'Bang! Casting', slug: 'bangcasting', alias: ['bcasting'], url: 'https://www.bang.com/videos?in=BANG%21+Casting', diff --git a/src/alerts.js b/src/alerts.js index 6fde7944..a44cd5fa 100755 --- a/src/alerts.js +++ b/src/alerts.js @@ -41,7 +41,9 @@ async function addAlert(alert, sessionUser) { alert.matches?.length > 0 && bulkInsert('alerts_matches', alert.matches.map((match) => ({ alert_id: alertId, property: match.property, - expression: match.expression, + expression: /\/.*\//.test(match.expression) + ? match.expression.slice(1, -1) + : escapeRegexp(match.expression), })), false), alert.stashes?.length > 0 && bulkInsert('alerts_stashes', alert.stashes.map((stashId) => ({ alert_id: alertId, @@ -115,9 +117,7 @@ async function notify(scenes) { acc[alertMatch.alert_id].push({ property: alertMatch.property, - expression: /\/.*\//.test(alertMatch.expression) - ? new RegExp(alertMatch.expression.slice(1, -1), 'ui') - : new RegExp(escapeRegexp(alertMatch.expression), 'ui'), + expression: new RegExp(alertMatch.expression, 'ui'), }); return acc;