Skip to content

Commit

Permalink
fixed poe.trade urls (now using https); updated data files
Browse files Browse the repository at this point in the history
  • Loading branch information
Eruyome committed Dec 14, 2019
1 parent 5ea4431 commit 58f6b2d
Show file tree
Hide file tree
Showing 6 changed files with 42 additions and 29 deletions.
45 changes: 29 additions & 16 deletions data_trade/helmet_enchantment_mods.txt
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,10 @@ Arctic Breath's Chilling Area has #% increased Movement Speed
#% increased Arctic Breath Duration
#% increased Arctic Breath Area of Effect
Armageddon Brand deals #% increased Damage
Artillery Ballista Projectiles fall in two perpendicular lines instead
Artillery Ballista fires an additional Arrow
Artillery Ballista fires # additional Arrows
Artillery Ballista Damage Penetrates #% Fire Resistance
#% increased Assassin's Mark Curse Effect
#% increased Assassin's Mark Duration
Ball Lightning fires an additional Projectile
Expand Down Expand Up @@ -57,9 +61,10 @@ Blade Vortex has +#% to Critical Strike Multiplier for each blade
#% increased Blade Vortex Spell Damage
#% increased Blade Vortex Duration
#% increased Blade Vortex Area of Effect
Blast Rain has a #% chance for an additional blast
#% increased Blast Rain Damage
#% increased Blast Rain Area of Effect
Blast Rain has a #% chance to fire an additional Arrow
Blast Rain fires an additional Arrow
Blast Rain deals #% increased Damage
Blast Rain has #% increased Area of Effect
#% increased Blight Damage
#% increased Blight Area of Effect
Blight has #% increased Hinder Duration
Expand All @@ -77,6 +82,7 @@ Unearth Spawns corpses with +# Level
Bone Offering grants an additional +#% Chance to Block Attack Damage
#% increased Bone Offering Duration
#% increased Burning Arrow Damage
Burning Arrow has #% increased Debuff Effect
Burning Arrow has +#% chance to Ignite
#% of Burning Arrow Physical Damage gained as Extra Fire Damage
Summoned Carrion Golems deal #% increased Damage
Expand Down Expand Up @@ -182,14 +188,18 @@ Elemental Hit deals #% increased Damage
#% increased Enduring Cry Buff Effect
#% increased Enfeeble Curse Effect
#% increased Enfeeble Duration
Ensnaring Arrow has #% increased Area of Effect
Ensnaring Arrow has #% increased Debuff Effect
#% increased Essence Drain Damage
#% increased Essence Drain Duration
#% increased Ethereal Knives Damage
Ethereal Knives Pierces an additional Target
#% increased Ethereal Knives Projectile Speed
#% increased Explosive Arrow Attack Speed
#% increased Explosive Arrow Damage
#% increased Explosive Arrow Area of Effect
Explosive Arrow has #% increased Attack Speed
Explosive Arrow deals #% increased Damage
Explosive Arrow has #% increased Duration
Explosive Arrow has #% increased Area of Effect
Explosive Arrow has #% reduced Duration
#% increased Fireball Cast Speed
#% increased Fireball Damage
Fireball has +#% chance to Ignite
Expand Down Expand Up @@ -259,6 +269,7 @@ Winter Orb has +# Maximum Stages
Winter Orb has #% increased Area of Effect per Stage
#% increased Frost Wall Cooldown Recovery Speed
#% increased Frost Wall Duration
Galvanic Arrow has #% increased Projectile Speed
#% increased Glacial Cascade Damage
#% of Glacial Cascade Physical Damage Converted to Cold Damage
#% increased Glacial Cascade Area of Effect
Expand Down Expand Up @@ -296,8 +307,8 @@ Summoned Holy Relics have #% increased Area of Effect
Ice Nova has +#% chance to Freeze
Chills from Ice Nova Hits always reduce Action Speed by at least #%
#% increased Ice Nova Area of Effect
Ice Shot has #% increased Area of Effect angle
#% increased Ice Shot Damage
#% increased Ice Shot Duration
#% increased Ice Shot Area of Effect
Siphoning Trap has #% increased Chill Effect
Siphoning Trap deals #% increased Damage
Expand Down Expand Up @@ -448,16 +459,19 @@ Shock Nova ring deals #% increased Damage
#% increased Shockwave Totem Cast Speed
#% increased Shockwave Totem Damage
#% increased Shockwave Totem Area of Effect
#% increased Shrapnel Shot Damage
#% of Shrapnel Shot Physical Damage gained as extra Lightning Damage
#% increased Shrapnel Shot Area of Effect
Shrapnel Ballista fires an additional Arrow
Shrapnel Ballista Pierces # additional Targets
Shrapnel Ballista has #% increased Projectile Speed
#% increased Galvanic Arrow Damage
#% of Galvanic Arrow Physical Damage gained as extra Lightning Damage
#% increased Galvanic Arrow Area of Effect
Explosive Trap deals #% increased Damage
Explosive Trap has #% increased Area of Effect
Explosive Trap causes an additional smaller explosion
Explosive Trap causes # additional smaller explosions
#% increased Siege Ballista Attack Speed
#% increased Siege Ballista Damage
#% increased Siege Ballista Totem Placement Speed
Siege Ballista has #% increased Attack Speed
Siege Ballista deals #% increased Damage
Siege Ballista has #% increased Totem Placement Speed
#% increased Dark Pact Damage
Smite has a #% chance for lightning to strike another target
Smite has #% increased Aura Effect
Expand Down Expand Up @@ -512,7 +526,6 @@ Lightning Golems deal #% increased Damage
Summoned Raging Spirits deal #% increased Damage
Skeletons deal #% increased Damage
#% chance to Summon an additional Skeleton Warrior with Summon Skeleton
#% chance to Summon an additional Skeleton Warrior with Summon Skeletons
Summoned Skitterbots have #% increased Area of Effect
Summon Skitterbots has #% reduced Mana Reservation
Stone Golems deal #% increased Damage
Expand All @@ -521,7 +534,7 @@ Chaos Golems deal #% increased Damage
#% increased Sunder Damage
#% increased Sunder Area of Effect
#% increased Sweep Damage
+#% Sweep Knockback Chance
Sweep has a #% chance to grant an Endurance Charge on Hit
#% increased Sweep Area of Effect
#% increased Tectonic Slam Area of Effect
Tectonic Slam has #% chance to create a Charged Slam
Expand Down Expand Up @@ -564,7 +577,7 @@ Wave of Conviction has #% increased Duration
#% increased Whirling Blades Attack Speed
#% increased Whirling Blades Damage
#% increased Wild Strike Damage
Wild Strike Chains an additional # times
Wild Strike's Beam Chains an additional # times
#% increased Wild Strike Area of Effect
Winter Orb deals #% increased Damage
Wither has #% increased Duration
Expand Down
2 changes: 1 addition & 1 deletion data_trade/mods.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion data_trade/prophecy_details.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion data_trade/uniques.json

Large diffs are not rendered by default.

14 changes: 7 additions & 7 deletions resources/ahk/TradeMacro.ahk
Original file line number Diff line number Diff line change
Expand Up @@ -1523,7 +1523,7 @@ TradeFunc_Main(openSearchInBrowser = false, isAdvancedPriceCheck = false, isAdva
}
Else {
; using GET request instead of preventing the POST request redirect and parsing the url
parsedUrl1 := "http://poe.trade/search?" Payload
parsedUrl1 := "https://poe.trade/search?" Payload
; redirect was prevented to get the url and open the search on poe.trade instead
;RegExMatch(Html, "i)href=""(https?:\/\/.*?)""", ParsedUrl)
}
Expand Down Expand Up @@ -2163,19 +2163,19 @@ TradeFunc_DoPostRequest(payload, openSearchInBrowser = false) {

postData := payload
payLength := StrLen(postData)
url := "http://poe.trade/search"
url := "https://poe.trade/search"
options := ""
options .= "`n" "ReturnHeaders: append"
options .= "`n" "TimeOut: " TradeOpts.CurlTimeout

reqHeaders := []
reqHeaders.push("Connection: keep-alive")
reqHeaders.push("Cache-Control: max-age=0")
reqHeaders.push("Origin: http://poe.trade")
reqHeaders.push("Origin: https://poe.trade")
reqHeaders.push("Upgrade-Insecure-Requests: 1")
reqHeaders.push("Content-type: application/x-www-form-urlencoded; charset=UTF-8")
reqHeaders.push("Accept: text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,*/*;q=0.8")
reqHeaders.push("Referer: http://poe.trade/")
reqHeaders.push("Referer: https://poe.trade/")

If (StrLen(UserAgent)) {
reqHeaders.push("User-Agent: " UserAgent)
Expand Down Expand Up @@ -2445,7 +2445,7 @@ TradeFunc_DoCurrencyRequest(currencyName = "", openSearchInBrowser = false, init
reqHeaders.push("Accept-Encoding:gzip, deflate")
reqHeaders.push("Accept-Language:de-DE,de;q=0.8,en-US;q=0.6,en;q=0.4")
reqHeaders.push("Connection:keep-alive")
reqHeaders.push("Referer:http://poe.trade/")
reqHeaders.push("Referer:https://poe.trade/")
reqHeaders.push("Upgrade-Insecure-Requests:1")

html := PoEScripts_Download(url, postData, reqHeaders, options, false)
Expand Down Expand Up @@ -5960,7 +5960,7 @@ Return

OpenPageInInternetExplorer:
RegRead, iexplore, HKLM, SOFTWARE\Microsoft\Windows\CurrentVersion\App Paths\iexplore.exe
Run, %iexplore% http://poe.trade
Run, %iexplore% https://poe.trade
Return

ReloadScriptAtCookieError:
Expand Down Expand Up @@ -6100,7 +6100,7 @@ TradeFunc_HandleCustomSearchSubmit(openInBrowser = false) {
ShowToolTip("")
Html := TradeFunc_DoPostRequest(Payload, true)
RegExMatch(Html, "i)href=""\/(search\/.*?)\/live", ParsedUrl)
TradeFunc_OpenUrlInBrowser("http://poe.trade/" ParsedUrl1)
TradeFunc_OpenUrlInBrowser("https://poe.trade/" ParsedUrl1)
}
Else {
ShowToolTip("Requesting search results... ")
Expand Down
6 changes: 3 additions & 3 deletions resources/ahk/TradeMacroInit.ahk
Original file line number Diff line number Diff line change
Expand Up @@ -1130,7 +1130,7 @@ TradeFunc_CheckIfCloudFlareBypassNeeded() {
SplashUI.SetSubMessage("Testing connection to poe.trade...")
; call this function without parameters to access poe.trade without cookies
; if it succeeds we don't need any cookies
If (!TradeFunc_TestCloudflareBypass("http://poe.trade", "", "", "", false, "PreventErrorMsg")) {
If (!TradeFunc_TestCloudflareBypass("https://poe.trade", "", "", "", false, "PreventErrorMsg")) {
TradeFunc_ReadCookieData()
}
}
Expand Down Expand Up @@ -1253,7 +1253,7 @@ TradeFunc_ReadCookieData() {
; test connection to poe.trade
If (!CookieErrorLevel) {
accessForbidden := ""
If (!TradeFunc_TestCloudflareBypass("http://poe.trade", TradeGlobals.Get("UserAgent"), TradeGlobals.Get("cfduid"), TradeGlobals.Get("cfClearance"), true, "", accessForbidden)) {
If (!TradeFunc_TestCloudflareBypass("https://poe.trade", TradeGlobals.Get("UserAgent"), TradeGlobals.Get("cfduid"), TradeGlobals.Get("cfClearance"), true, "", accessForbidden)) {
BypassFailed := 1
}
}
Expand Down Expand Up @@ -1657,4 +1657,4 @@ TradeFunc_FinishTMInit(argumentMergeScriptPath) {
GoSub, TrackUserCount

SetTimer, CheckForUpdatesTimer, 7200000
}
}

0 comments on commit 58f6b2d

Please sign in to comment.