From 94d6fb959e1865cc084120e8f8148c4a40b7eef8 Mon Sep 17 00:00:00 2001
From: rafaelgssa <rafael.gssa@gmail.com>
Date: Thu, 3 Sep 2020 11:37:04 -0300
Subject: [PATCH] Giveaway Extractor: fix bug that extracts all giveaways when
 option to extract onward is enabled (close #1610)

---
 package.json                                |  2 +-
 src/modules/Giveaways/GiveawayExtractor.jsx | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/package.json b/package.json
index 0161d8c7..cedf49b0 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "esgst",
 	"version": "8.7.4",
-	"betaVersion": "8.7.5-beta.3",
+	"betaVersion": "8.7.5-beta.4",
 	"title": "Enhanced SteamGifts & SteamTrades (ESGST)",
 	"description": "A script that adds some cool features to SteamGifts and SteamTrades.",
 	"author": "rafaelgssa",
diff --git a/src/modules/Giveaways/GiveawayExtractor.jsx b/src/modules/Giveaways/GiveawayExtractor.jsx
index bba7eff4..e223a6ad 100644
--- a/src/modules/Giveaways/GiveawayExtractor.jsx
+++ b/src/modules/Giveaways/GiveawayExtractor.jsx
@@ -148,11 +148,6 @@ class GiveawaysGiveawayExtractor extends Module {
 						})
 					).responseText
 				),
-				extractOnward: !!parameters.extractOnward,
-				flushCache: !!parameters.flush,
-				flushCacheHours: parameters.flushHrs,
-				ignoreDiscussionComments: !!parameters.noDiscCmt,
-				ignoreGiveawayComments: !!parameters.noGaCmt,
 			};
 
 			Shared.esgst.customPages.ge = {
@@ -365,6 +360,11 @@ class GiveawaysGiveawayExtractor extends Module {
 			null,
 			Settings.get('ge_ignoreGiveawayComments')
 		);
+		ge.extractOnward = Settings.get('ge_extractOnward');
+		ge.flushCache = Settings.get('ge_flushCache');
+		ge.flushCacheHours = Settings.get('ge_flushCacheHours');
+		ge.ignoreDiscussionComments = Settings.get('ge_ignoreDiscussionComments');
+		ge.ignoreGiveawayComments = Settings.get('ge_ignoreGiveawayComments');
 		ge.cacheWarning = null;
 		const onExtractClick = () => {
 			return new Promise((resolve) => {